BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskellPackages.update-nix-fetchgit: Remove eval error

Browse source
This commit is contained in:
Malte Brandy 2020-11-22 14:31:47 +01:00 committed by Peter Simons
parent 6c5f5cdb0f
commit 8bf26dad96
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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"; url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; 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 # Fix test trying to access /home directory
shell-conduit = overrideCabal super.shell-conduit (drv: { shell-conduit = overrideCabal super.shell-conduit (drv: {
@ -1378,7 +1373,7 @@ self: super: {
in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
(addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: { (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: {
optparse-generic = self.optparse-generic_1_4_4; 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: { })) deps) (drv: {
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
postInstall = drv.postInstall or "" + '' 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 # Our quickcheck-instances is too old for the newer binary-instances, but
# quickcheck-instances is only used in the tests of binary-instances. # quickcheck-instances is only used in the tests of binary-instances.
binary-instances = dontCheck super.binary-instances; binary-instances = dontCheck super.binary-instances;