cachix: move dontCheck to configuration-darwin.nix (#469600)
This commit is contained in:
@@ -3904,25 +3904,21 @@ with haskellLib;
|
||||
src = src + "/cachix-api";
|
||||
} super.cachix-api;
|
||||
|
||||
cachix = lib.pipe super.cachix (
|
||||
[
|
||||
(overrideSrc {
|
||||
inherit version;
|
||||
src = src + "/cachix";
|
||||
})
|
||||
(addBuildDepends [
|
||||
self.pqueue
|
||||
])
|
||||
(
|
||||
drv:
|
||||
drv.override {
|
||||
nix = self.hercules-ci-cnix-store.nixPackage;
|
||||
hnix-store-core = self.hnix-store-core_0_8_0_0;
|
||||
}
|
||||
)
|
||||
]
|
||||
# https://github.com/NixOS/nixpkgs/issues/461651
|
||||
++ lib.optional pkgs.stdenv.isDarwin dontCheck
|
||||
);
|
||||
cachix = lib.pipe super.cachix [
|
||||
(overrideSrc {
|
||||
inherit version;
|
||||
src = src + "/cachix";
|
||||
})
|
||||
(addBuildDepends [
|
||||
self.pqueue
|
||||
])
|
||||
(
|
||||
drv:
|
||||
drv.override {
|
||||
nix = self.hercules-ci-cnix-store.nixPackage;
|
||||
hnix-store-core = self.hnix-store-core_0_8_0_0;
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
)
|
||||
|
||||
@@ -335,6 +335,9 @@ self: super:
|
||||
+ (old.preBuild or "");
|
||||
}) super.hercules-ci-agent;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/461651
|
||||
cachix = dontCheck super.cachix;
|
||||
|
||||
# Require /usr/bin/security which breaks sandbox
|
||||
http-reverse-proxy = dontCheck super.http-reverse-proxy;
|
||||
servant-auth-server = dontCheck super.servant-auth-server;
|
||||
|
||||
Reference in New Issue
Block a user