aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorMalte Brandy <malte.brandy@maralorn.de>2020-11-22 14:31:47 +0100
committerPeter Simons <simons@cryp.to>2020-11-27 20:59:59 +0100
commit8bf26dad96c1d9906b334f9314c7a31013e38153 (patch)
tree8404fd73631381f8e9123568d001e9a1d755cbf2 /pkgs/development/haskell-modules
parent6c5f5cdb0fe53280adc41a9522b32634acef688f (diff)
haskellPackages.update-nix-fetchgit: Remove eval error
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix11
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3ed5eac616f6..878240229bac 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;