Unverified Commit 39327e4c authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #288812 from hercules-ci/lib-flake-version 

`lib/` flake: fix `lib.version`
parents 62e16907 324a7aa9

.editorconfig

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ end_of_line = unset 
insert_final_newline = unset

trim_trailing_whitespace = unset



# We want readFile .version to return the version without a newline.

[.version]

insert_final_newline = false



# see https://nixos.org/nixpkgs/manual/#chap-conventions



# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces

.version

deleted100644 → 0
+1 −1
Original line number Diff line number Diff line 
24.05
 
 No newline at end of file

.version

0 → 120000
+1 −1
Original line number Diff line number Diff line 
lib/.version
 
 No newline at end of file

lib/.version

0 → 100644
+1 −0
Original line number Diff line number Diff line 
24.05
 
 No newline at end of file

lib/tests/test-with-nix.nix

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { 
  echo "Running lib/tests/modules.sh"

  bash lib/tests/modules.sh



  echo "Checking lib.version"

  nix-instantiate lib -A version --eval || {

    echo "lib.version does not evaluate when lib is isolated from the rest of the nixpkgs tree"

    exit 1

  }



  echo "Running lib/tests/filesystem.sh"

  TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh