wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Disable packaging-overriding

Browse source 
Fixes #12690.
This commit is contained in:
Eelco Dolstra 2025-03-31 16:37:36 +02:00
parent 3f13cc0f87
commit a4be66828a
1 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.nix
View file

@ -230,24 +230,28 @@
This shouldn't build anything significant; just check that things This shouldn't build anything significant; just check that things
(including derivations) are _set up_ correctly. (including derivations) are _set up_ correctly.
*/ */
packaging-overriding = # Disabled due to a bug in `testEqualContents` (see
let # https://github.com/NixOS/nix/issues/12690).
pkgs = nixpkgsFor.${system}.native; /*
nix = self.packages.${system}.nix; packaging-overriding =
in let
assert (nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src.patches == [ pkgs.emptyFile ]; pkgs = nixpkgsFor.${system}.native;
if pkgs.stdenv.buildPlatform.isDarwin then nix = self.packages.${system}.nix;
lib.warn "packaging-overriding check currently disabled because of a permissions issue on macOS" pkgs.emptyFile in
else assert (nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src.patches == [ pkgs.emptyFile ];
# If this fails, something might be wrong with how we've wired the scope, if pkgs.stdenv.buildPlatform.isDarwin then
# or something could be broken in Nixpkgs. lib.warn "packaging-overriding check currently disabled because of a permissions issue on macOS" pkgs.emptyFile
pkgs.testers.testEqualContents { else
assertion = "trivial patch does not change source contents"; # If this fails, something might be wrong with how we've wired the scope,
expected = "${./.}"; # or something could be broken in Nixpkgs.
actual = pkgs.testers.testEqualContents {
# Same for all components; nix-util is an arbitrary pick assertion = "trivial patch does not change source contents";
(nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src; expected = "${./.}";
}; actual =
# Same for all components; nix-util is an arbitrary pick
(nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src;
};
*/
} }
// (lib.optionalAttrs (builtins.elem system linux64BitSystems)) { // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
dockerImage = self.hydraJobs.dockerImage.${system}; dockerImage = self.hydraJobs.dockerImage.${system};