treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, xlibsWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-${version}";
|
||||
pname = "ocaml";
|
||||
version = "3.08.0";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/${name}.tar.gz";
|
||||
url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
|
||||
};
|
||||
configureScript = ./configure-3.08.0;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "ocaml-${version}";
|
||||
pname = "ocaml";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
|
||||
};
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml-${version}";
|
||||
pname = "ocaml";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
|
||||
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
|
||||
};
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml-${version}";
|
||||
pname = "ocaml";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
|
||||
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
|
||||
};
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-${version}";
|
||||
pname = "ocaml";
|
||||
version = "4.00.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
|
||||
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
|
||||
};
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ber-metaocaml-${version}";
|
||||
pname = "ber-metaocaml";
|
||||
version = metaocamlPatch;
|
||||
|
||||
src = fetchurl {
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postConfigure = ''
|
||||
tar -xvzf $metaocaml
|
||||
cd ${name}
|
||||
cd ${pname}-${version}
|
||||
make patch
|
||||
cd ..
|
||||
'';
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
make installopt
|
||||
mkdir -p $out/include
|
||||
ln -sv $out/lib/ocaml/caml $out/include/caml
|
||||
cd ${name}
|
||||
cd ${pname}-${version}
|
||||
make all
|
||||
'';
|
||||
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
cd ${name}
|
||||
cd ${pname}-${version}
|
||||
make test
|
||||
make test-compile
|
||||
make test-native
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "metaocaml-${version}";
|
||||
pname = "metaocaml";
|
||||
version = "3.09-alpha-30";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
Reference in New Issue
Block a user