From 216f2754c5fc561d429342edbcb0ade6c56b010e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 02:01:33 +0200 Subject: [PATCH] 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. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c9f7499ce33..2d46a8eff49a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 = diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7100aeeb7fde..a9cbdfe035e0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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;