diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
| commit | ebc20a879812dda6ab240a134a67b4675e24c435 (patch) | |
| tree | 62cff73a1d92b5ab3c7d0526bdd854e6b403ea6d /default.nix | |
| parent | 16f6a1a65d4b973ea13cd00bbfdd7e225041e447 (diff) | |
| parent | 532eca7ff94e4710283fb38951a349a83654de59 (diff) | |
| download | garage-ebc20a879812dda6ab240a134a67b4675e24c435.tar.gz garage-ebc20a879812dda6ab240a134a67b4675e24c435.zip | |
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 8 |
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"; } ; }; } |