JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-hackage-security: update default version to 0.6.x

Browse Source
This commit is contained in:
Peter Simons 2020-04-03 21:30:37 +02:00
parent 11d28064b7
commit f660d6ec3d
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -37,9 +37,6 @@ self: super: {
# compiled on Linux. We provide the name to avoid evaluation errors. # compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'"; 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 # enable using a local hoogle with extra packagages in the database
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
# $ hoogle server # $ hoogle server

8
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -43,7 +43,7 @@ self: super: {
# These builds need Cabal 3.2.x. # These builds need Cabal 3.2.x.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; 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. # Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff; aeson-diff = doJailbreak super.aeson-diff;
@ -75,12 +75,6 @@ self: super: {
time-compat = doJailbreak super.time-compat; time-compat = doJailbreak super.time-compat;
http-media = doJailbreak super.http-media; http-media = doJailbreak super.http-media;
servant-server = doJailbreak super.servant-server; 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; foundation = dontCheck super.foundation;
vault = dontHaddock super.vault; vault = dontHaddock super.vault;

2
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -69,8 +69,6 @@ core-packages:
default-package-overrides: default-package-overrides:
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
- MissingH ==1.4.2.0 - 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 # pandoc-2.9 does not accept the 0.3 version yet
- doclayout < 0.3 - doclayout < 0.3
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and # gi-gdkx11-4.x requires gtk-4.x, which is still under development and