Skip to content

Commit

Permalink
haskellPackages.hercules-ci-*: fix eval with haskell.lib.compose
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@sternenseemann
sternenseemann committed Nov 14, 2021
1 parent 439f14a commit bdaf941
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
13 changes: 6 additions & 7 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

3 comments on commit bdaf941

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sternenseemann, you pushed a commit directly to master/release branch
instead of going through a Pull Request.

That's highly discouraged beyond the few exceptions listed
on #118661

@domenkozar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@nixos-discourse
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/improving-the-commit-access-system-for-nixpkgs/16135/2

Please sign in to comment.