removing postgresql was no longer able to reproduse the error
treefmt / nix fmt (pull_request) Successful in 3s
build_systems / prebuild-common-x86-64-v3 (pull_request) Successful in 22s
build_systems / build-portal-1 (pull_request) Successful in 17s
build_systems / build-brain (pull_request) Successful in 46s
build_systems / build-jeeves (pull_request) Successful in 1m22s
build_systems / build-rhapsody-in-green (pull_request) Failing after 1h12m38s
test ebook search / test-ebook-search (pull_request) Successful in 2h58m24s
build_systems / build-bob (pull_request) Successful in 9h7m51s
treefmt / nix fmt (pull_request) Successful in 3s
build_systems / prebuild-common-x86-64-v3 (pull_request) Successful in 22s
build_systems / build-portal-1 (pull_request) Successful in 17s
build_systems / build-brain (pull_request) Successful in 46s
build_systems / build-jeeves (pull_request) Successful in 1m22s
build_systems / build-rhapsody-in-green (pull_request) Failing after 1h12m38s
test ebook search / test-ebook-search (pull_request) Successful in 2h58m24s
build_systems / build-bob (pull_request) Successful in 9h7m51s
This commit is contained in:
@@ -16,6 +16,4 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
patches = import ./patches;
|
patches = import ./patches;
|
||||||
test-exclusions = import ./test-exclusions.nix;
|
|
||||||
x86-64-v3-workarounds = import ./x86-64-v3-workarounds.nix;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user