Deuxfleurs/garage
32
59
Fork 80
Code Issues 100 Pull requests 18 Releases 30 Wiki Activity

remove git_version in flake, always call it "dev"
All checks were successful
ci/woodpecker/push/debug Pipeline was successful
Details
ci/woodpecker/pr/debug Pipeline was successful
Details

Browse source
This commit is contained in:
Alex 2025-02-02 20:41:55 +01:00
parent 6294e69c2b
commit 55cd2b4051
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -17,17 +17,16 @@
outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, ... }: outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, ... }:
let let
git_version = self.lastModifiedDate;
compile = import ./nix/compile.nix; compile = import ./nix/compile.nix;
in in
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
packageFor = target: release: (compile { packageFor = target: release: (compile {
inherit system git_version target nixpkgs crane rust-overlay release; inherit system target nixpkgs crane rust-overlay release;
}).garage; }).garage;
testWith = extraTestEnv: (compile { testWith = extraTestEnv: (compile {
inherit system git_version nixpkgs crane rust-overlay extraTestEnv; inherit system nixpkgs crane rust-overlay extraTestEnv;
release = false; release = false;
}).garage-test; }).garage-test;
in in
@ -59,7 +58,7 @@
devShells = devShells =
let let
targets = compile { targets = compile {
inherit system git_version nixpkgs crane rust-overlay; inherit system nixpkgs crane rust-overlay;
}; };
in in
{ {

12
nix/compile.nix
View file

@ -6,7 +6,7 @@
/* parameters */ /* parameters */
system, system,
git_version ? "unknown", git_version ? null,
target ? null, target ? null,
release ? false, release ? false,
features ? null, features ? null,
@ -110,7 +110,7 @@ let
{ {
inherit src; inherit src;
pname = "garage"; pname = "garage";
version = "none"; version = "dev";
strictDeps = true; strictDeps = true;
cargoExtraArgs = "--locked --features ${featuresStr}"; cargoExtraArgs = "--locked --features ${featuresStr}";
@ -167,9 +167,11 @@ in rec {
cargoArtifacts = garage-deps; cargoArtifacts = garage-deps;
doCheck = false; doCheck = false;
version = git_version; } //
GIT_VERSION = git_version; (if git_version != null then {
}); version = git_version;
GIT_VERSION = git_version;
} else {}));
garage-test-deps = craneLib.buildDepsOnly (testArgs // { garage-test-deps = craneLib.buildDepsOnly (testArgs // {
cargoArtifacts = garage; cargoArtifacts = garage;