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

Merge pull request #59024 from matthewbauer/hackage-mirrors

Browse Source 
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
commit 4aca600624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs-modes/hsc3/default.nix
View File

@ -8,9 +8,9 @@ let version = "0.15";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "hsc3-mode-${version}"; name = "hsc3-mode-${version}";
src = fetchurl { src = fetchurl {
url = http://hackage.haskell.org/package/hsc3-0.15/hsc3-0.15.tar.gz; url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz;
sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
}; };
buildInputs = [ emacs ]; buildInputs = [ emacs ];

2
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -308,6 +308,8 @@ rec {
hackage = [ hackage = [
http://hackage.haskell.org/package/ http://hackage.haskell.org/package/
http://hdiff.luite.com/packages/archive/package/ http://hdiff.luite.com/packages/archive/package/
http://hackage.fpcomplete.com/package/
http://objects-us-east-1.dream.io/hackage-mirror/package/
]; ];
# Roy marples mirrors # Roy marples mirrors

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -118,7 +118,7 @@ let
binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin"; 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 { newCabalFile = fetchurl {
url = newCabalFileUrl; url = newCabalFileUrl;
sha256 = editedCabalFile; sha256 = editedCabalFile;

2
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -183,7 +183,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callHackageDirect = {pkg, ver, sha256}@args: callHackageDirect = {pkg, ver, sha256}@args:
let pkgver = "${pkg}-${ver}"; let pkgver = "${pkg}-${ver}";
in self.callCabal2nix pkg (pkgs.fetchzip { 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; inherit sha256;
}); });