summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2020-03-07 10:28:06 -0500
committerBenjamin Hipple <bhipple@protonmail.com>2020-03-07 10:28:06 -0500
commit072a3bda788dafd1d80d3a69e832627de1e45969 (patch)
tree1dc4e24d3a5345cb03e030063b86fcef50d1dacf /pkgs/development/compilers/ghc
parent39fe57fea312c650e1425b6d34b806fff79b0133 (diff)
downloadnixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.tar
nixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.tar.gz
nixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.tar.bz2
nixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.tar.lz
nixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.tar.xz
nixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.tar.zst
nixpkgs-072a3bda788dafd1d80d3a69e832627de1e45969.zip
ghc: consistent downloads.haskell.org src URLs
Consistency is good in general and these seem to work just as well as the
others, but it also helps with blacklisting package updates, as in:
https://github.com/ryantm/nixpkgs-update/pull/160
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/8.4.4.nix2
-rw-r--r--pkgs/development/compilers/ghc/8.6.5.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index d1665574de3..4bebd63956e 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (rec {
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
     sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
   };
 
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index ead28a3076a..e276d9b12b9 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation (rec {
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
     sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd";
   };
 
@@ -187,7 +187,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx