From 5fc89adf6c6a0a47d054b339d737006f4b2de197 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Feb 2025 21:26:31 +0100 Subject: [PATCH] Use Determinate version in store path name --- packaging/components.nix | 2 +- packaging/dev-shell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/components.nix b/packaging/components.nix index 9da864887..386346194 100644 --- a/packaging/components.nix +++ b/packaging/components.nix @@ -26,7 +26,7 @@ let pkg-config ; - baseVersion = lib.fileContents ../.version; + baseVersion = lib.fileContents ../.version-determinate; versionSuffix = lib.optionalString (!officialRelease) "pre"; diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix index 1651a86be..a5a2426a4 100644 --- a/packaging/dev-shell.nix +++ b/packaging/dev-shell.nix @@ -23,7 +23,7 @@ pkgs.nixComponents.nix-util.overrideAttrs ( pname = "shell-for-" + attrs.pname; # Remove the version suffix to avoid unnecessary attempts to substitute in nix develop - version = lib.fileContents ../.version; + version = lib.fileContents ../.version-determinate; name = attrs.pname; installFlags = "sysconfdir=$(out)/etc";