b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages: Move permanent overrides to configuration.nix

Browse source
This commit is contained in:
maralorn 2022-09-20 02:11:26 +02:00
parent 2d4bd8892f
commit 6f241f7cec
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1010,11 +1010,6 @@ self: super: {
# https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack =
generateOptparseApplicativeCompletion "stack"
(doJailbreak # for Cabal constraint added on hackage

5
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -96,8 +96,11 @@ self: super: builtins.intersectAttrs super {
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
ormolu = enableSeparateBinOutput super.ormolu;
ghcid = enableSeparateBinOutput super.ghcid;
ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu);
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
arbtt = overrideCabal (drv: {
# The test suite needs the packages's executables in $PATH to succeed.