Skip to content

Commit 7d78f14

Browse files
authored
chore: fix and add a check for the nix devshell (#1656)
* chore: fix nix devshell (`nix develop`) * chore: add a `nix flake check` for the devShell
1 parent 2b07c9c commit 7d78f14

File tree

2 files changed

+88
-6
lines changed

2 files changed

+88
-6
lines changed

flake.lock

Lines changed: 84 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
nix2container.url = "github:nlewo/nix2container";
88
nix-editor.url = "github:snowfallorg/nix-editor";
99
rust-overlay.url = "github:oxalica/rust-overlay";
10+
nix-fast-build.url = "github:Mic92/nix-fast-build";
1011
};
1112

12-
outputs = { self, nixpkgs, flake-utils, nix-editor, rust-overlay, nix2container, ... }:
13+
outputs = { self, nixpkgs, flake-utils, nix-editor, rust-overlay, nix2container, ... }@inputs:
1314
let
1415
gitRev = "vcs=${self.shortRev or "dirty"}+${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}";
1516

@@ -1380,6 +1381,7 @@
13801381
psql_17 = makeCheckHarness basePackages.psql_17.bin;
13811382
psql_orioledb-17 = makeCheckHarness basePackages.psql_orioledb-17.bin;
13821383
inherit (basePackages) wal-g-2 wal-g-3 dbmate-tool pg_regress;
1384+
devShell = devShells.default;
13831385
} // pkgs.lib.optionalAttrs (system == "aarch64-linux") {
13841386
inherit (basePackages) postgresql_15_debug postgresql_15_src postgresql_orioledb-17_debug postgresql_orioledb-17_src postgresql_17_debug postgresql_17_src;
13851387
};
@@ -1429,6 +1431,7 @@
14291431
export HISTFILE=.history
14301432
'';
14311433
};
1434+
nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
14321435
in
14331436
{
14341437
default = pkgs.mkShell {

0 commit comments

Comments
 (0)