diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
tree | 3e70796a291acc704ef5382f5af4866cab64e537 /pkgs/build-support/cabal | |
parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
download | nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'pkgs/build-support/cabal')
-rw-r--r-- | pkgs/build-support/cabal/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 67934ed0c29..6f454dc2b58 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -82,9 +82,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; # the default download location for Cabal packages is Hackage, # you still have to specify the checksum src = fetchurl { - # cannot use mirrors system because of subtly different directory structures - urls = ["http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz" - "http://hdiff.luite.com/packages/archive/${self.pname}/${self.fname}.tar.gz"]; + url = "mirror://hackage/${self.pname}/${self.fname}.tar.gz"; inherit (self) sha256; }; |