aboutsummaryrefslogtreecommitdiff
path: root/default.nix
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-08-29 16:45:05 +0200
committerAlex Auvolat <alex@adnab.me>2022-08-29 16:45:05 +0200
commit1921f4f7e65516e04b86f54a298d94259bbd85be (patch)
tree298acee7b6c1143ea70e36cbdcbc94b0ff51af98 /default.nix
parente935861854deed5d1ca66767fc51d9849201a4dd (diff)
parentebc20a879812dda6ab240a134a67b4675e24c435 (diff)
downloadgarage-1921f4f7e65516e04b86f54a298d94259bbd85be.tar.gz
garage-1921f4f7e65516e04b86f54a298d94259bbd85be.zip
Merge branch 'lx-perf-improvements' into netapp-stream-body
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/default.nix b/default.nix
index 4d7558c5..7e44096c 100644
--- a/default.nix
+++ b/default.nix
@@ -9,8 +9,8 @@ let
pkgs = import pkgsSrc { };
compile = import ./nix/compile.nix;
build_debug_and_release = (target: {
- debug = (compile { inherit target; release = false; }).workspace.garage { compileMode = "build"; };
- release = (compile { inherit target; release = true; }).workspace.garage { compileMode = "build"; };
+ debug = (compile { inherit target git_version; release = false; }).workspace.garage { compileMode = "build"; };
+ release = (compile { inherit target git_version; release = true; }).workspace.garage { compileMode = "build"; };
});
test = (rustPkgs: pkgs.symlinkJoin {
name ="garage-tests";
@@ -25,9 +25,9 @@ in {
arm = build_debug_and_release "armv6l-unknown-linux-musleabihf";
};
test = {
- amd64 = test (compile { target = "x86_64-unknown-linux-musl"; });
+ amd64 = test (compile { inherit git_version; target = "x86_64-unknown-linux-musl"; });
};
clippy = {
- amd64 = (compile { compiler = "clippy"; }).workspace.garage { compileMode = "build"; } ;
+ amd64 = (compile { inherit git_version; compiler = "clippy"; }).workspace.garage { compileMode = "build"; } ;
};
}