From 0df29e125997bf862335ebdafacbaa609e312adf Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 3 Jan 2018 16:42:32 -0500 Subject: ghc: Noramlized source URLs --- pkgs/development/compilers/ghc/6.10.4.nix | 2 +- pkgs/development/compilers/ghc/6.12.3.nix | 2 +- pkgs/development/compilers/ghc/7.0.4.nix | 2 +- pkgs/development/compilers/ghc/7.2.2.nix | 2 +- pkgs/development/compilers/ghc/7.4.2.nix | 2 +- pkgs/development/compilers/ghc/7.6.3.nix | 2 +- pkgs/development/compilers/ghc/7.8.4.nix | 2 +- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 18b4385834dd..0308edbd56c0 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index a9779ab49fb4..16d6d39e95f4 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://darcs.haskell.org/download/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0s2y1sv2nq1cgliv735q2w3gg4ykv1c0g1adbv8wgwhia10vxgbc"; }; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index a1931411d94b..0f560313007f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed"; }; diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 15f860dd2114..cb8470bcff12 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; }; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index d28980a01d33..6f30b03efb91 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/7.4.2/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj"; }; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 7549b43bce17..78202297686e 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx"; }; diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 7cea395efc99..b5e2ac256a7a 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; }; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 924f927b0bc4..f1f61acd7687 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2/ghc-${version}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f39edff5ef3d..357768549c87 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.2.2/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; }; -- cgit 1.4.1 From 3fb5fd0060d51b0a7c52921dc1c66cee6fe622ed Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 3 Jan 2018 16:29:18 -0500 Subject: ghc: Normalize derivations in hash-preserving ways --- pkgs/development/compilers/ghc/7.10.3.nix | 2 +- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 7 ++----- pkgs/development/compilers/ghc/head.nix | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 373172540db4..1d9e2814a1f6 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index f1f61acd7687..762fe547ca9c 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 357768549c87..bffc7c3fc6c7 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -17,7 +17,6 @@ assert !enableIntegerSimple -> gmp != null; let inherit (bootPkgs) ghc; - version = "8.2.2"; # TODO(@Ericson2314) Make unconditional targetPrefix = stdenv.lib.optionalString @@ -25,8 +24,8 @@ let "${targetPlatform.config}-"; in stdenv.mkDerivation (rec { - inherit version; - name = "ghc-${version}"; + version = "8.2.2"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; @@ -100,8 +99,6 @@ stdenv.mkDerivation (rec { }; } // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - configureFlags = [ "CC=${stdenv.cc}/bin/${cross.config}-cc" "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c5be301baf68..9b4c932eb115 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation (rec { inherit version rev; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; @@ -107,8 +107,6 @@ stdenv.mkDerivation (rec { }; } // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - configureFlags = [ "CC=${stdenv.cc}/bin/${cross.config}-cc" "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" -- cgit 1.4.1