Merge remote-tracking branch 'origin/master' into haskell-updates

This commit is contained in:
sternenseemann
2021-10-05 14:10:47 +02:00
153 changed files with 1408 additions and 454 deletions

View File

@@ -1477,7 +1477,11 @@ self: super: {
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
# See hercules-ci-optparse-applicative in non-hackage-packages.nix.
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
addBuildDepend
(overrideCabal
(unmarkBroken super.hercules-ci-cli)
(drv: { hydraPlatforms = [ super.hercules-ci-cli.meta.platforms ]; }))
super.hercules-ci-optparse-applicative
);
# Readline uses Distribution.Simple from Cabal 2, in a way that is not