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

Merge pull request #13299 from xokdvium/restore-packaging-overriding

Browse source 
flake: Restore `packaging-overriding` check
This commit is contained in:
John Ericson 2025-05-29 22:31:15 -04:00 • committed by GitHub
commit 81f5d6763d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -220,9 +220,6 @@
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.
*/ */
# Disabled due to a bug in `testEqualContents` (see
# https://github.com/NixOS/nix/issues/12690).
/*
packaging-overriding = packaging-overriding =
let let
pkgs = nixpkgsFor.${system}.native; pkgs = nixpkgsFor.${system}.native;
@ -241,7 +238,6 @@
# Same for all components; nix-util is an arbitrary pick # Same for all components; nix-util is an arbitrary pick
(nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src; (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};