haskellPackages.hercules-ci-*: fix eval with haskell.lib.compose
PR was merged after the switch to haskell.lib.compose by default, but originally created before that day, so the argument order used was completely wrong, but CI didn't show it, because its state was stale.
This commit is contained in:
parent
439f14aa7e
commit
bdaf941e39
|
@ -1497,14 +1497,13 @@ self: super: {
|
|||
|
||||
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
|
||||
|
||||
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
|
||||
hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [
|
||||
unmarkBroken
|
||||
(overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; }))
|
||||
# See hercules-ci-optparse-applicative in non-hackage-packages.nix.
|
||||
addBuildDepend
|
||||
super.hercules-ci-optparse-applicative
|
||||
(overrideCabal
|
||||
(drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })
|
||||
(unmarkBroken super.hercules-ci-cli))
|
||||
);
|
||||
(addBuildDepend super.hercules-ci-optparse-applicative)
|
||||
(generateOptparseApplicativeCompletion "hci")
|
||||
];
|
||||
|
||||
# Readline uses Distribution.Simple from Cabal 2, in a way that is not
|
||||
# compatible with Cabal 3. No upstream repository found so far
|
||||
|
|
|
@ -938,9 +938,9 @@ self: super: builtins.intersectAttrs super {
|
|||
|
||||
cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; });
|
||||
|
||||
hercules-ci-agent = appendConfigureFlag (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
|
||||
hercules-ci-cnix-expr = appendConfigureFlag (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
|
||||
hercules-ci-cnix-store = appendConfigureFlag (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
|
||||
hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; });
|
||||
hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; });
|
||||
hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; });
|
||||
|
||||
# Enable extra optimisations which increase build time, but also
|
||||
# later compiler performance, so we should do this for user's benefit.
|
||||
|
|
Loading…
Reference in a new issue