diff --git a/overlays/default.nix b/overlays/default.nix index 9bf8b1b..5d92b59 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,6 +16,4 @@ }; patches = import ./patches; - test-exclusions = import ./test-exclusions.nix; - x86-64-v3-workarounds = import ./x86-64-v3-workarounds.nix; } diff --git a/overlays/x86-64-v3-workarounds.nix b/overlays/x86-64-v3-workarounds.nix deleted file mode 100644 index 1796d20..0000000 --- a/overlays/x86-64-v3-workarounds.nix +++ /dev/null @@ -1,20 +0,0 @@ -# Output-validation workarounds for packages rebuilt with x86-64-v3. -_final: prev: -let - removeSiblingOutputChecks = - package: - package.overrideAttrs (old: { - # Nix 2.34 can validate a partial multi-output rebuild against only the - # outputs still being realised. PostgreSQL's checks then reject valid - # sibling names such as "out" and "lib". Keep the test suite and - # disallowed-requisite checks; accept the loss of cross-output checks. - outputChecks = builtins.mapAttrs ( - _output: checks: builtins.removeAttrs checks [ "disallowedReferences" ] - ) (old.outputChecks or { }); - }); - -in -prev.lib.optionalAttrs ((prev.stdenv.hostPlatform.gcc.arch or null) == "x86-64-v3") { - postgresql = removeSiblingOutputChecks prev.postgresql; - postgresql_18 = removeSiblingOutputChecks prev.postgresql_18; -}