Skip to content

Commit

Permalink
haskell.packages.*.cabal-install: remove random, hashable overrides
Browse files Browse the repository at this point in the history
These are not necessary anymore as stackage naturally contains random
1.2.0 and we apply the hashable fix globally as well.
  • Loading branch information
sternenseemann committed May 19, 2021
1 parent 7617de1 commit 5110223
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
Expand Up @@ -47,8 +47,6 @@ self: super: {
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_4_0_0;
base16-bytestring = self.base16-bytestring_0_1_1_7;
random = dontCheck super.random_1_2_0; # break infinite recursion
hashable = doJailbreak super.hashable; # allow random 1.2.x
});

# cabal-install-parsers is written for Cabal 3.4
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
Expand Up @@ -60,8 +60,6 @@ self: super: {
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_4_0_0;
base16-bytestring = self.base16-bytestring_0_1_1_7;
random = dontCheck super.random_1_2_0; # break infinite recursion
hashable = doJailbreak super.hashable; # allow random 1.2.x
});

# Ignore overly restrictive upper version bounds.
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
Expand Up @@ -48,8 +48,6 @@ self: super: {
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = null;
base16-bytestring = self.base16-bytestring_0_1_1_7;
random = dontCheck super.random_1_2_0; # break infinite recursion
hashable = doJailbreak super.hashable; # allow random 1.2.x
});

# Jailbreaks & Version Updates
Expand Down

0 comments on commit 5110223

Please sign in to comment.