diff options
| author | Peter Simons <simons@cryp.to> | 2020-04-03 21:30:37 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-04-03 22:00:29 +0200 |
| commit | f660d6ec3dea443982f27152be672659ca3c7d1f (patch) | |
| tree | 8124a7dcdd5822b63133fd5e70c1eaed7f0ba57b /pkgs/development | |
| parent | 11d28064b78bafff02b56b390d659e14e655e3de (diff) | |
| download | nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.tar nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.tar.gz nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.tar.bz2 nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.tar.lz nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.tar.xz nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.tar.zst nixlib-f660d6ec3dea443982f27152be672659ca3c7d1f.zip | |
haskell-hackage-security: update default version to 0.6.x
Diffstat (limited to 'pkgs/development')
3 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7d9db5dd6cbe..23853787b9c8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,9 +37,6 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # The test suite depends on old versions of tasty and QuickCheck. - hackage-security = dontCheck super.hackage-security; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 70de06efd5f9..8b38f8cef74c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -43,7 +43,7 @@ self: super: { # These builds need Cabal 3.2.x. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; hackage-security = self.hackage-security_0_6_0_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; @@ -75,12 +75,6 @@ self: super: { time-compat = doJailbreak super.time-compat; http-media = doJailbreak super.http-media; servant-server = doJailbreak super.servant-server; - - # These packages don't work and need patching and/or an update. - hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; - sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; - }); foundation = dontCheck super.foundation; vault = dontHaddock super.vault; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1cef47e0faa7..5b98cdb2dad7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -69,8 +69,6 @@ core-packages: default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - MissingH ==1.4.2.0 - # for cabal-install-3.0.0.0 - - hackage-security >=0.5.2.2 && <0.6 # pandoc-2.9 does not accept the 0.3 version yet - doclayout < 0.3 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and |