Merge pull request #59024 from matthewbauer/hackage-mirrors

haskell: add fpcomplete mirror, use hackage mirrors in more places
This commit is contained in:
Matthew Bauer
2019-04-10 01:45:04 -04:00
committed by GitHub
4 changed files with 6 additions and 4 deletions
@@ -118,7 +118,7 @@ let
binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin";
newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
newCabalFileUrl = "mirror://hackage/${pname}-${version}/revision/${revision}.cabal";
newCabalFile = fetchurl {
url = newCabalFileUrl;
sha256 = editedCabalFile;
@@ -183,7 +183,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callHackageDirect = {pkg, ver, sha256}@args:
let pkgver = "${pkg}-${ver}";
in self.callCabal2nix pkg (pkgs.fetchzip {
url = "http://hackage.haskell.org/package/${pkgver}/${pkgver}.tar.gz";
url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz";
inherit sha256;
});