haskellPackages.hercules-ci-cnix-store: don't use overrideAttrs
overrideAttrs can have counter intuitive effects when used in conjunction with the tools offered by haskell.lib.
This commit is contained in:
parent
69b514d249
commit
0b5334887f
|
@ -1089,9 +1089,15 @@ self: super: builtins.intersectAttrs super {
|
|||
|
||||
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
|
||||
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
|
||||
hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: {
|
||||
passthru.nixPackage = pkgs.nixVersions.nix_2_16;
|
||||
});
|
||||
hercules-ci-cnix-store = overrideCabal
|
||||
(old: {
|
||||
passthru = old.passthru or { } // {
|
||||
nixPackage = pkgs.nixVersions.nix_2_16;
|
||||
};
|
||||
})
|
||||
(super.hercules-ci-cnix-store.override {
|
||||
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
|
||||
});
|
||||
|
||||
# the testsuite fails because of not finding tsc without some help
|
||||
aeson-typescript = overrideCabal (drv: {
|
||||
|
|
Loading…
Reference in a new issue