git.iko.soy/typeable/nixpkgs
on master help sign in
haskell-hackage-security: update default version to 0.6.x
commitf660d6ec3dea443982f27152be672659ca3c7d1f authorPeter Simons <simons@cryp.to> dateFri 3 Apr 2020, 21:30 (7 years ago) parent11d2806
3 files changed+1−12
pkgs/development/haskell-modules/configuration-common.nix−3 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+1−7 pkgs/development/haskell-modules/configuration-hackage2nix.yaml−2
pkgs/development/haskell-modules/configuration-common.nix−3
@@ -37,9 +37,6 @@ self: super: {
3737 # compiled on Linux. We provide the name to avoid evaluation errors.
3838 unbuildable = throw "package depends on meta package 'unbuildable'";
3939
40− # The test suite depends on old versions of tasty and QuickCheck.
41− hackage-security = dontCheck super.hackage-security;
42−
4340 # enable using a local hoogle with extra packagages in the database
4441 # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
4542 # $ hoogle server
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+1−7
@@ -43,7 +43,7 @@ self: super: {
4343
4444 # These builds need Cabal 3.2.x.
4545 cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
46− cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; hackage-security = self.hackage-security_0_6_0_0; });
46+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
4747
4848 # Ignore overly restrictive upper version bounds.
4949 aeson-diff = doJailbreak super.aeson-diff;
@@ -75,12 +75,6 @@ self: super: {
7575 time-compat = doJailbreak super.time-compat;
7676 http-media = doJailbreak super.http-media;
7777 servant-server = doJailbreak super.servant-server;
78−
79− # These packages don't work and need patching and/or an update.
80− hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
81− url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
82− sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
83− });
8478 foundation = dontCheck super.foundation;
8579 vault = dontHaddock super.vault;
8680
pkgs/development/haskell-modules/configuration-hackage2nix.yaml−2
@@ -69,8 +69,6 @@ core-packages:
6969default-package-overrides:
7070 # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
7171 - MissingH ==1.4.2.0
72− # for cabal-install-3.0.0.0
73− - hackage-security >=0.5.2.2 && <0.6
7472 # pandoc-2.9 does not accept the 0.3 version yet
7573 - doclayout < 0.3
7674 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and