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

flake: Restore packaging-overriding check

Browse source 
The underlying bug seems to have been fixed in diffoscope 293 [1] [2].
Our nixpkgs input has 295.

[1]: https://github.com/NixOS/nixpkgs/pull/393381#issuecomment-2766703347
[2]: https://diffoscope.org/news/diffoscope-292-released/
This commit is contained in:
Sergei Zimmerman 2025-05-29 22:35:50 +00:00
parent ba96067535
commit 4fa991a680
No known key found for this signature in database
GPG key ID: A9B0B557CA632325
1 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.nix
View file

@ -233,28 +233,24 @@
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 packaging-overriding =
# https://github.com/NixOS/nix/issues/12690). let
/* pkgs = nixpkgsFor.${system}.native;
packaging-overriding = nix = self.packages.${system}.nix;
let in
pkgs = nixpkgsFor.${system}.native; assert (nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src.patches == [ pkgs.emptyFile ];
nix = self.packages.${system}.nix; if pkgs.stdenv.buildPlatform.isDarwin then
in lib.warn "packaging-overriding check currently disabled because of a permissions issue on macOS" pkgs.emptyFile
assert (nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src.patches == [ pkgs.emptyFile ]; else
if pkgs.stdenv.buildPlatform.isDarwin then # If this fails, something might be wrong with how we've wired the scope,
lib.warn "packaging-overriding check currently disabled because of a permissions issue on macOS" pkgs.emptyFile # or something could be broken in Nixpkgs.
else pkgs.testers.testEqualContents {
# If this fails, something might be wrong with how we've wired the scope, assertion = "trivial patch does not change source contents";
# or something could be broken in Nixpkgs. expected = "${./.}";
pkgs.testers.testEqualContents { actual =
assertion = "trivial patch does not change source contents"; # Same for all components; nix-util is an arbitrary pick
expected = "${./.}"; (nix.appendPatches [ pkgs.emptyFile ]).libs.nix-util.src;
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};