From 2fda23dac126f11d28af15f269e8cdccd0f7f7cd Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Fri, 10 Nov 2023 18:58:34 +0000 Subject: [PATCH] Switch to devenv so developers can easily spin up a Postgres --- .envrc | 2 +- .gitignore | 5 +- flake.lock | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 82 +++++++++++++--------- 4 files changed, 247 insertions(+), 40 deletions(-) diff --git a/.envrc b/.envrc index a5dbbcb..cffc922 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use flake . +use flake . --impure diff --git a/.gitignore b/.gitignore index 4d21fbd..2a3d702 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /target -.direnv -book \ No newline at end of file +/.direnv +/.devenv +/book diff --git a/flake.lock b/flake.lock index 3994863..79435c3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "devenv": { + "inputs": { + "flake-compat": "flake-compat", + "nix": "nix", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1688058187, + "narHash": "sha256-ipDcc7qrucpJ0+0eYNlwnE+ISTcq4m03qW+CWUshRXI=", + "owner": "cachix", + "repo": "devenv", + "rev": "c8778e3dc30eb9043e218aaa3861d42d4992de77", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "v0.6.3", + "repo": "devenv", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -21,9 +43,78 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "devenv", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1690373729, @@ -39,7 +130,79 @@ "type": "github" } }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1676545802, + "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", + "owner": "domenkozar", + "repo": "nix", + "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "relaxed-flakes", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1678872516, + "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1685865905, "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", @@ -52,7 +215,7 @@ "type": "indirect" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1690927903, "narHash": "sha256-D5gCaCROnjEKDOel//8TO/pOP87pAEtT0uT8X+0Bj/U=", @@ -67,11 +230,40 @@ "type": "indirect" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "flake-utils": "flake-utils", + "gitignore": "gitignore", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1686050334, + "narHash": "sha256-R0mczWjDzBpIvM3XXhO908X5e2CQqjyh/gFbwZk/7/Q=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "6881eb2ae5d8a3516e34714e7a90d9d95914c4dc", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { + "devenv": "devenv", "fenix": "fenix", "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" } }, diff --git a/flake.nix b/flake.nix index ac09722..4be0946 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "nixpkgs/nixos-23.05"; + + devenv.url = "github:cachix/devenv/v0.6.3"; }; - outputs = { self, nixpkgs, utils, naersk, fenix }: + outputs = inputs @ { self, nixpkgs, utils, naersk, fenix, devenv }: utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages."${system}"; @@ -50,43 +52,55 @@ defaultApp = apps.idcoop; # `nix develop` - devShell = pkgs.mkShell { - buildInputs = [ - fenixRustToolchain + devShell = devenv.lib.mkShell { + inherit inputs pkgs; + modules = [ + { + services.postgres.enable = true; - pkgs.grass-sass - pkgs.entr + # Configure packages to install. + # Search for package names at https://search.nixos.org/packages?channel=unstable + packages = [ + fenixRustToolchain + pkgs.gcc - pkgs.mdbook + # Useful for adding migrations, running them and generating offline + # support metadata + pkgs.sqlx-cli - pkgs.sqlx-cli + pkgs.grass-sass + pkgs.entr + + pkgs.mdbook + + # Useful for poking at the Postgres database + pkgs.postgresql + ]; + + env = { + # Needed for bindgen when binding to avahi + LIBCLANG_PATH="${pkgs.llvmPackages_latest.libclang.lib}/lib"; + + # Sometimes useful for reference. + RUST_SRC_PATH = "${fenixRustToolchain}/lib/rustlib/src/rust/library"; + + # Cargo culted: + # Add to rustc search path + #RUSTFLAGS = (builtins.map (a: ''-L ${a}/lib'') [ + #]); + # Add to bindgen search path + BINDGEN_EXTRA_CLANG_ARGS = + # Includes with normal include path + (builtins.map (a: ''-I"${a}/include"'') [ + pkgs.glibc.dev + ]) + # Includes with special directory paths + ++ [ + ''-I"${pkgs.llvmPackages_latest.libclang.lib}/lib/clang/${pkgs.llvmPackages_latest.libclang.version}/include"'' + ]; + }; + } ]; - - nativeBuildInputs = [ - pkgs.openssl - ]; - - # Needed for bindgen when binding to avahi - LIBCLANG_PATH="${pkgs.llvmPackages_latest.libclang.lib}/lib"; - - # Sometimes useful for reference. - RUST_SRC_PATH = "${fenixRustToolchain}/lib/rustlib/src/rust/library"; - - # Cargo culted: - # Add to rustc search path - #RUSTFLAGS = (builtins.map (a: ''-L ${a}/lib'') [ - #]); - # Add to bindgen search path - BINDGEN_EXTRA_CLANG_ARGS = - # Includes with normal include path - (builtins.map (a: ''-I"${a}/include"'') [ - pkgs.glibc.dev - ]) - # Includes with special directory paths - ++ [ - ''-I"${pkgs.llvmPackages_latest.libclang.lib}/lib/clang/${pkgs.llvmPackages_latest.libclang.version}/include"'' - ]; - #nativeBuildInputs = with pkgs; [ rustc cargo ]; }; }); }