From 17117cf5658c107df9f7ffdda1999c668ea67ecc Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 14 Feb 2024 16:42:03 +0100
Subject: [PATCH] lib flake: Fix version

Manually tested with

nix-repl> :lf path:lib
nix-repl> lib.version
---
 lib/.version                | 1 +
 lib/tests/test-with-nix.nix | 9 +++++++++
 lib/trivial.nix             | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 lib/.version

diff --git a/lib/.version b/lib/.version
new file mode 100644
index 000000000000..420f61e8c7f6
--- /dev/null
+++ b/lib/.version
@@ -0,0 +1 @@
+24.05
\ No newline at end of file
diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index fd2e7532e697..9bc160a4682a 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -49,6 +49,15 @@ 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 '<nixpkgs/.version> and <nixpkgs/lib/.version> must match.'
+    exit 1
+  }
+
   cp -r ${../.} lib
   echo "Running lib/tests/modules.sh"
   bash lib/tests/modules.sh
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 58620006de15..d88f41f4123a 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -174,7 +174,7 @@ in {
   version = release + versionSuffix;
 
   /* Returns the current nixpkgs release number as string. */
-  release = lib.strings.fileContents ../.version;
+  release = lib.strings.fileContents ./.version;
 
   /* The latest release that is supported, at the time of release branch-off,
      if applicable.