haskell.compiler.ghc*: use pname instead of name
This also means the -binary suffix is moved *before* the version which prevents builtins.parseDrvName from interpreting it as part of the version.
This commit is contained in:
parent
14d020bf06
commit
3bdb476804
8 changed files with 8 additions and 11 deletions
|
@ -138,8 +138,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
name = "ghc-${version}-binary";
|
||||
pname = "ghc-binary";
|
||||
|
||||
src = fetchurl binDistUsed.src;
|
||||
|
||||
|
|
|
@ -152,8 +152,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
name = "ghc-${version}-binary";
|
||||
pname = "ghc-binary";
|
||||
|
||||
src = fetchurl binDistUsed.src;
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.10.7";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
pname = "${targetPrefix}ghc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
|
|
|
@ -34,8 +34,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.6.5";
|
||||
|
||||
name = "ghc-${version}-binary";
|
||||
pname = "ghc-binary";
|
||||
|
||||
# https://downloads.haskell.org/~ghc/8.6.5/
|
||||
src = fetchurl ({
|
||||
|
|
|
@ -152,7 +152,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.8.4";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
pname = "${targetPrefix}ghc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
|
|
|
@ -138,7 +138,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "9.0.1";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
pname = "${targetPrefix}ghc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
|
|
|
@ -137,7 +137,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "9.2.0.20210821";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
pname = "${targetPrefix}ghc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz";
|
||||
|
|
|
@ -149,7 +149,7 @@ in
|
|||
stdenv.mkDerivation (rec {
|
||||
inherit version;
|
||||
inherit (src) rev;
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
pname = "${targetPrefix}ghc";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc.git/";
|
||||
|
|
Loading…
Reference in a new issue