From 25c6048fa6a658a9be6efb106f57a3049fd4272d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Feb 2025 22:55:44 +0100 Subject: [PATCH 1/4] Bump Determinate Nix version to 3.0.0 --- .version-determinate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version-determinate b/.version-determinate index 8570a3aeb..4a36342fc 100644 --- a/.version-determinate +++ b/.version-determinate @@ -1 +1 @@ -0.37.2 +3.0.0 From 5fc89adf6c6a0a47d054b339d737006f4b2de197 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Feb 2025 21:26:31 +0100 Subject: [PATCH 2/4] 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"; From e71a498e2571392d18a3107ed235844130f7d462 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Feb 2025 21:58:29 +0100 Subject: [PATCH 3/4] Disable setVersionLayer This sets .version to finalAttrs.version, so we would end up with `nix --version` showing `nix (Determinate Nix 0.37.2) 0.37.2`. --- packaging/components.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/components.nix b/packaging/components.nix index 386346194..a3f816c4d 100644 --- a/packaging/components.nix +++ b/packaging/components.nix @@ -50,6 +50,7 @@ let exts: userFn: stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); setVersionLayer = finalAttrs: prevAttrs: { + /* preConfigure = prevAttrs.prevAttrs or "" + @@ -59,6 +60,7 @@ let chmod u+w ./.version echo ${finalAttrs.version} > ./.version ''; + */ }; localSourceLayer = From 94347f4622f54c4ad08ce8c3e35bb230cce08893 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Feb 2025 23:28:09 +0100 Subject: [PATCH 4/4] nix -> determinate-nix --- doc/manual/package.nix | 2 +- packaging/everything.nix | 4 ++-- src/external-api-docs/package.nix | 2 +- src/internal-api-docs/package.nix | 2 +- src/libcmd/package.nix | 2 +- src/libexpr-c/package.nix | 2 +- src/libexpr-test-support/package.nix | 2 +- src/libexpr/package.nix | 2 +- src/libfetchers/package.nix | 2 +- src/libflake-c/package.nix | 2 +- src/libflake/package.nix | 2 +- src/libmain-c/package.nix | 2 +- src/libmain/package.nix | 2 +- src/libstore-c/package.nix | 2 +- src/libstore-test-support/package.nix | 2 +- src/libstore/package.nix | 2 +- src/libutil-c/package.nix | 2 +- src/libutil-test-support/package.nix | 2 +- src/libutil/package.nix | 2 +- src/perl/package.nix | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/manual/package.nix b/doc/manual/package.nix index 6d93e6f1a..778440ac2 100644 --- a/doc/manual/package.nix +++ b/doc/manual/package.nix @@ -22,7 +22,7 @@ let in mkMesonDerivation (finalAttrs: { - pname = "nix-manual"; + pname = "determinate-nix-manual"; inherit version; workDir = ./.; diff --git a/packaging/everything.nix b/packaging/everything.nix index 0974a34df..3637c4d07 100644 --- a/packaging/everything.nix +++ b/packaging/everything.nix @@ -69,7 +69,7 @@ let }; dev = stdenv.mkDerivation (finalAttrs: { - name = "nix-${nix-cli.version}-dev"; + name = "determinate-nix-${nix-cli.version}-dev"; pname = "nix"; version = nix-cli.version; dontUnpack = true; @@ -120,7 +120,7 @@ let in (buildEnv { - name = "nix-${nix-cli.version}"; + name = "determinate-nix-${nix-cli.version}"; paths = [ nix-cli nix-manual.man diff --git a/src/external-api-docs/package.nix b/src/external-api-docs/package.nix index b194e16d4..28cde8c09 100644 --- a/src/external-api-docs/package.nix +++ b/src/external-api-docs/package.nix @@ -14,7 +14,7 @@ let in mkMesonDerivation (finalAttrs: { - pname = "nix-external-api-docs"; + pname = "determinate-nix-external-api-docs"; inherit version; workDir = ./.; diff --git a/src/internal-api-docs/package.nix b/src/internal-api-docs/package.nix index 6c4f354ae..636c19653 100644 --- a/src/internal-api-docs/package.nix +++ b/src/internal-api-docs/package.nix @@ -14,7 +14,7 @@ let in mkMesonDerivation (finalAttrs: { - pname = "nix-internal-api-docs"; + pname = "determinate-nix-internal-api-docs"; inherit version; workDir = ./.; diff --git a/src/libcmd/package.nix b/src/libcmd/package.nix index d459d1c20..5150de249 100644 --- a/src/libcmd/package.nix +++ b/src/libcmd/package.nix @@ -35,7 +35,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-cmd"; + pname = "determinate-nix-cmd"; inherit version; workDir = ./.; diff --git a/src/libexpr-c/package.nix b/src/libexpr-c/package.nix index 694fbc1fe..ec92ecce1 100644 --- a/src/libexpr-c/package.nix +++ b/src/libexpr-c/package.nix @@ -15,7 +15,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-expr-c"; + pname = "determinate-nix-expr-c"; inherit version; workDir = ./.; diff --git a/src/libexpr-test-support/package.nix b/src/libexpr-test-support/package.nix index 44b0ff386..dbf515370 100644 --- a/src/libexpr-test-support/package.nix +++ b/src/libexpr-test-support/package.nix @@ -18,7 +18,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-util-test-support"; + pname = "determinate-nix-util-test-support"; inherit version; workDir = ./.; diff --git a/src/libexpr/package.nix b/src/libexpr/package.nix index 533dae9f2..309d57f9b 100644 --- a/src/libexpr/package.nix +++ b/src/libexpr/package.nix @@ -36,7 +36,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-expr"; + pname = "determinate-nix-expr"; inherit version; workDir = ./.; diff --git a/src/libfetchers/package.nix b/src/libfetchers/package.nix index 3f52e9878..5aa096082 100644 --- a/src/libfetchers/package.nix +++ b/src/libfetchers/package.nix @@ -17,7 +17,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-fetchers"; + pname = "determinate-nix-fetchers"; inherit version; workDir = ./.; diff --git a/src/libflake-c/package.nix b/src/libflake-c/package.nix index 114950852..958cf233e 100644 --- a/src/libflake-c/package.nix +++ b/src/libflake-c/package.nix @@ -16,7 +16,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-flake-c"; + pname = "determinate-nix-flake-c"; inherit version; workDir = ./.; diff --git a/src/libflake/package.nix b/src/libflake/package.nix index 5240ce5e3..2c28235f1 100644 --- a/src/libflake/package.nix +++ b/src/libflake/package.nix @@ -18,7 +18,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-flake"; + pname = "determinate-nix-flake"; inherit version; workDir = ./.; diff --git a/src/libmain-c/package.nix b/src/libmain-c/package.nix index f019a917d..17858d56f 100644 --- a/src/libmain-c/package.nix +++ b/src/libmain-c/package.nix @@ -17,7 +17,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-main-c"; + pname = "determinate-nix-main-c"; inherit version; workDir = ./.; diff --git a/src/libmain/package.nix b/src/libmain/package.nix index c03697c48..5ee2e61e4 100644 --- a/src/libmain/package.nix +++ b/src/libmain/package.nix @@ -17,7 +17,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-main"; + pname = "determinate-nix-main"; inherit version; workDir = ./.; diff --git a/src/libstore-c/package.nix b/src/libstore-c/package.nix index fde17c78e..0ce37e44c 100644 --- a/src/libstore-c/package.nix +++ b/src/libstore-c/package.nix @@ -15,7 +15,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-store-c"; + pname = "determinate-nix-store-c"; inherit version; workDir = ./.; diff --git a/src/libstore-test-support/package.nix b/src/libstore-test-support/package.nix index ccac25ee1..8a4658ae7 100644 --- a/src/libstore-test-support/package.nix +++ b/src/libstore-test-support/package.nix @@ -18,7 +18,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-store-test-support"; + pname = "determinate-nix-store-test-support"; inherit version; workDir = ./.; diff --git a/src/libstore/package.nix b/src/libstore/package.nix index a7d9a0ca1..847e61d09 100644 --- a/src/libstore/package.nix +++ b/src/libstore/package.nix @@ -28,7 +28,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-store"; + pname = "determinate-nix-store"; inherit version; workDir = ./.; diff --git a/src/libutil-c/package.nix b/src/libutil-c/package.nix index f26f57775..a1605bf5b 100644 --- a/src/libutil-c/package.nix +++ b/src/libutil-c/package.nix @@ -14,7 +14,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-util-c"; + pname = "determinate-nix-util-c"; inherit version; workDir = ./.; diff --git a/src/libutil-test-support/package.nix b/src/libutil-test-support/package.nix index fafd47c86..3b094ac29 100644 --- a/src/libutil-test-support/package.nix +++ b/src/libutil-test-support/package.nix @@ -17,7 +17,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-util-test-support"; + pname = "determinate-nix-util-test-support"; inherit version; workDir = ./.; diff --git a/src/libutil/package.nix b/src/libutil/package.nix index 47dcb54a2..fcc74c247 100644 --- a/src/libutil/package.nix +++ b/src/libutil/package.nix @@ -21,7 +21,7 @@ let in mkMesonLibrary (finalAttrs: { - pname = "nix-util"; + pname = "determinate-nix-util"; inherit version; workDir = ./.; diff --git a/src/perl/package.nix b/src/perl/package.nix index d95d13aa9..d948cbcdc 100644 --- a/src/perl/package.nix +++ b/src/perl/package.nix @@ -18,7 +18,7 @@ in perl.pkgs.toPerlModule ( mkMesonDerivation (finalAttrs: { - pname = "nix-perl"; + pname = "determinate-nix-perl"; inherit version; workDir = ./.;