From 8bf26dad96c1d9906b334f9314c7a31013e38153 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 22 Nov 2020 14:31:47 +0100 Subject: [PATCH] haskellPackages.update-nix-fetchgit: Remove eval error --- .../haskell-modules/configuration-common.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3ed5eac616f..878240229ba 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,11 +85,6 @@ self: super: { url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; }); - optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch { - name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; - url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; - sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; - }); # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { @@ -1378,7 +1373,7 @@ self: super: { in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: { optparse-generic = self.optparse-generic_1_4_4; - optparse-applicative = self.optparse-applicative_0_16_0_0; + optparse-applicative = self.optparse-applicative_0_16_1_0; })) deps) (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' @@ -1388,10 +1383,6 @@ self: super: { ''; })); - optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override { - optparse-applicative = self.optparse-applicative_0_16_0_0; - }; - # Our quickcheck-instances is too old for the newer binary-instances, but # quickcheck-instances is only used in the tests of binary-instances. binary-instances = dontCheck super.binary-instances;