From f45844cb558bc261a3a4d91054fba81f5d6fedee Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 14 Feb 2024 16:43:08 +0100 Subject: [PATCH] .version: Make lib/.version source of truth This way we don't have to make sure they're in sync, and we remove a small step from the release process. --- .version | 2 +- lib/tests/test-with-nix.nix | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) mode change 100644 => 120000 .version diff --git a/.version b/.version deleted file mode 100644 index 420f61e8c7f6..000000000000 --- a/.version +++ /dev/null @@ -1 +0,0 @@ -24.05 \ No newline at end of file diff --git a/.version b/.version new file mode 120000 index 000000000000..a408b4d1748c --- /dev/null +++ b/.version @@ -0,0 +1 @@ +lib/.version \ No newline at end of file diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix index 9bc160a4682a..fd2e7532e697 100644 --- a/lib/tests/test-with-nix.nix +++ b/lib/tests/test-with-nix.nix @@ -49,15 +49,6 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { nix-store --init - # nixpkgs/lib/.version is a copy of nixpkgs/.version, so that the lib - # subtree is valid in isolation (except for the tests, but that's ok) - cp ${../../.version} nixpkgs-.version - cp ${../.version} nixpkgs-lib-.version - diff -U3 nixpkgs-.version nixpkgs-lib-.version || { - echo ' and must match.' - exit 1 - } - cp -r ${../.} lib echo "Running lib/tests/modules.sh" bash lib/tests/modules.sh