niv: build using up to date dependencies

Upstream finally cut a new release with some adjustments allowing niv to
be built using the Stackage LTS solver.
This commit is contained in:
sternenseemann 2022-04-07 02:01:33 +02:00
parent d317a29a60
commit 216f2754c5
2 changed files with 1 additions and 7 deletions

View File

@ -1045,12 +1045,6 @@ self: super: {
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
# 2022-03-20: niv is unmaintained we pin stuff to keep it running
niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: {
optparse-applicative = self.optparse-applicative_0_15_1_0;
aeson = self.aeson_1_5_6_0;
}));
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack =

View File

@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super {
sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio;
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput super.niv;
niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
ormolu = enableSeparateBinOutput super.ormolu;
ghcid = enableSeparateBinOutput super.ghcid;