guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable nixpkgsLibTests again

Browse Source 
The required nixpkgs bumps have now been performed.

Change-Id: I6a6a6964316f8434c355405c52b0a7b7f70b4332
This commit is contained in:
Alois Wohlschlager
2025-09-08 20:26:44 +02:00
parent 88412da7a9
commit 528a66807d
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+22 -24
View File
@@ -359,29 +359,27 @@
mkdir $out mkdir $out
''; '';
/* nixpkgsLibTests = forAllSystems (
nixpkgsLibTests = forAllSystems ( system:
system: let
let inherit (self.packages.${system}) nix;
inherit (self.packages.${system}) nix; pkgs = nixpkgsFor.${system}.native;
pkgs = nixpkgsFor.${system}.native; testWithNix = import (nixpkgs + "/lib/tests/test-with-nix.nix") { inherit pkgs lib nix; };
testWithNix = import (nixpkgs + "/lib/tests/test-with-nix.nix") { inherit pkgs lib nix; }; in
in pkgs.symlinkJoin {
pkgs.symlinkJoin { name = "nixpkgs-lib-tests";
name = "nixpkgs-lib-tests"; paths = [
paths = [ testWithNix
testWithNix ]
] # NOTE: nixpkgs 25.05 is being ... *creative*, and requires this dance to override
# NOTE: nixpkgs 25.05 is being ... *creative*, and requires this dance to override # the evaluator used for the test. it will break again in the future, don't worry.
# the evaluator used for the test. it will break again in the future, don't worry. ++ lib.optionals pkgs.stdenv.isLinux [
++ lib.optionals pkgs.stdenv.isLinux [ ((pkgs.callPackage "${nixpkgs}/ci/eval" { inherit nix; }).attrpathsSuperset {
((pkgs.callPackage "${nixpkgs}/ci/eval" { inherit nix; }).attrpathsSuperset { evalSystem = system;
evalSystem = system; })
}) ];
]; }
} );
);
*/
}; };
pre-commit = forAvailableSystems ( pre-commit = forAvailableSystems (
@@ -430,7 +428,7 @@
binaryTarball = self.hydraJobs.binaryTarball.${system}; binaryTarball = self.hydraJobs.binaryTarball.${system};
perlBindings = self.hydraJobs.perlBindings.${system}; perlBindings = self.hydraJobs.perlBindings.${system};
# nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system}; nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
rl-next = self.hydraJobs.rl-next.${system}.user; rl-next = self.hydraJobs.rl-next.${system}.user;
# Will be empty attr set on i686-linux, and filtered out by forAvailableSystems. # Will be empty attr set on i686-linux, and filtered out by forAvailableSystems.
pre-commit = self.hydraJobs.pre-commit.${system}; pre-commit = self.hydraJobs.pre-commit.${system};