qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib flake: Fix version

Browse Source 
Manually tested with

nix-repl> :lf path:lib
nix-repl> lib.version
This commit is contained in:
Robert Hensing 2024-02-14 16:42:03 +01:00
parent 31c53f104b
commit 17117cf565
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/.version Normal file
View File

@ -0,0 +1 @@
24.05

9
lib/tests/test-with-nix.nix
View File

@ -49,6 +49,15 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" {
nix-store --init 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 cp -r ${../.} lib
echo "Running lib/tests/modules.sh" echo "Running lib/tests/modules.sh"
bash lib/tests/modules.sh bash lib/tests/modules.sh

2
lib/trivial.nix
View File

@ -174,7 +174,7 @@ in {
version = release + versionSuffix; version = release + versionSuffix;
/* Returns the current nixpkgs release number as string. */ /* 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, /* The latest release that is supported, at the time of release branch-off,
if applicable. if applicable.