treewide: name -> pname (easy cases) (#66585)

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 13:41:18 +01:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, ant, jre, jdk}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "abcl";
  version = "1.5.0";
  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
@@ -7,11 +7,11 @@ let
    sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f";
  };
 in stdenv.mkDerivation rec {
-  name = "apache-flex-sdk-${version}";
+  pname = "apache-flex-sdk";
  version = "4.16.1";

  src = fetchurl {
-    url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz";
+    url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
    sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
  };

@@ -3,7 +3,7 @@
 with builtins;

 stdenv.mkDerivation rec {
-  name = "arachne-pnr-${version}";
+  pname = "arachne-pnr";
  version = "2018.09.09";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:

 stdenv.mkDerivation rec {
-  name = "asn1c-${version}";
+  pname = "asn1c";
  version = "0.9.28";

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gmp }:

 stdenv.mkDerivation rec {
-  name    = "ats-${version}";
+  pname = "ats";
  version = "0.2.12";

  src = fetchurl {
@@ -26,7 +26,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name    = "ats2-${version}";
+  pname = "ats2";
  version = versionPkg;

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:

 stdenv.mkDerivation rec {
-  name = "avian-${version}";
+  pname = "avian";
  version = "1.2.0";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, gmp }:

 stdenv.mkDerivation rec {
-  name = "bigloo-${version}";
+  pname = "bigloo";
  version = "4.1a-2";

  src = fetchurl {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  rev = if emscriptenRev == null
        then "version_${version}"
        else emscriptenRev;
-  name = "binaryen-${version}";
+  pname = "binaryen";

  src = fetchFromGitHub {
    owner = "WebAssembly";
@@ -33,7 +33,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name     = "ccl-${version}";
+  pname = "ccl";
  version  = "1.11.5";

  src = fetchurl {
@@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name    = "chez-scheme-${version}";
+  pname = "chez-scheme";
  version = "9.5.2";

  src = fetchFromGitHub {
@@ -56,7 +56,6 @@ let
  };
 in
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "clasp";
  version = "0.8.99.20181128";

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "closure-compiler-${version}";
+  pname = "closure-compiler";
  version = "20190215";

  src = fetchurl {
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:

 stdenv.mkDerivation rec {
-  name = "colm-${version}";
+  pname = "colm";
  version = "0.13.0.7";

  src = fetchurl {
-    url = "https://www.colm.net/files/colm/${name}.tar.gz";
+    url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz";
    sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
  };

@@ -11,7 +11,7 @@ let
  ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
 in
 stdenv.mkDerivation rec {
-  name    = "compcert-${version}";
+  pname = "compcert";
  version = "3.5";

  src = fetchFromGitHub {
@@ -18,7 +18,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "coreclr-${version}";
+  pname = "coreclr";
  version = "2.0.7";

  src = fetchFromGitHub {
@@ -16,7 +16,7 @@ let
    }:

    stdenv.mkDerivation rec {
-      name = "cudatoolkit-${version}";
+      pname = "cudatoolkit";
      inherit version runPatches;

      dontPatchELF = true;
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "dev86-${version}";
+  pname = "dev86";
  version = "0.16.21";

  src = fetchurl {
@@ -22,7 +22,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "dmd-${version}";
+  pname = "dmd";
  inherit version;

  enableParallelBuilding = true;
@@ -28,11 +28,11 @@ let
  };
 in
 stdenv.mkDerivation rec {
-  name = "eli-${version}";
+  pname = "eli";
  version = "4.8.1";

  src = fetchurl {
-    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2";
    sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
  };

@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = src.rev;
-  name = "eql-git-${version}";
+  pname = "eql-git";
  src = fetchgit {
    rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
    url = "https://gitlab.com/eql/eql.git";
@@ -4,7 +4,7 @@
  mesa, xorg, openssl, unzip }:

 stdenv.mkDerivation rec {
-  name = "factor-lang-${version}";
+  pname = "factor-lang";
  version = "0.98";
  rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";

@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
  inherit (fasm-bin) version src meta;

-  name = "fasm-${version}";
+  pname = "fasm";

  nativeBuildInputs = [ fasm-bin ];

@@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in

 stdenv.mkDerivation rec {
  version = "3.0.0";
-  name = "fpc-${version}";
+  pname = "fpc";

  src = fetchurl {
    url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
@@ -3,7 +3,7 @@
 , libXi, xorgproto, libX11, libXext
 }:
 stdenv.mkDerivation rec {
-  name = "lazarus-${version}";
+  pname = "lazarus";
  version = "1.8.4";

  src = fetchurl {
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:

 stdenv.mkDerivation rec {
-  name = "fsharp-${version}";
+  pname = "fsharp";
  version = "4.0.1.1";

  src = fetchurl {
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }:

 stdenv.mkDerivation rec {
-  name = "fsharp-${version}";
+  pname = "fsharp";
  version = "4.1.7";

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "fstar-${version}";
+  pname = "fstar";
  version = "0.9.6.0";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoconf, ... }:

 stdenv.mkDerivation rec {
-  name    = "gambit-bootstrap-${version}";
+  pname = "gambit-bootstrap";
  version = "4.9.3";

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses5, python27 }:

 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
  version = "6-2017-q2-update";
  subdir = "6-2017q2";

@@ -3,7 +3,7 @@
 with lib;

 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
  version = "7-2018-q2-update";
  subdir = "7-2018q2";

@@ -3,7 +3,7 @@
 with lib;

 stdenv.mkDerivation rec {
-  name = "gcc-arm-embedded-${version}";
+  pname = "gcc-arm-embedded";
  version = "8-2018-q4-major";
  subdir = "8-2018q4";

@@ -8,7 +8,7 @@ assert stdenv.cc ? libc ;
 assert stdenv.cc.libc != null ;

 stdenv.mkDerivation rec {
-  name = "gcl-${version}";
+  pname = "gcl";
  version = "2.6.13pre50";

  src = fetchgit {
@@ -8,12 +8,12 @@ assert stdenv.cc ? libc ;
 assert stdenv.cc.libc != null ;

 stdenv.mkDerivation rec {
-  name = "gcl-${version}";
+  pname = "gcl";
  version = "2.6.12";

  src = fetchurl {
    sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
-    url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
+    url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz";
  };

  patches = [(fetchurl {
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
 stdenv.mkDerivation rec {
-  name = "glslang-${version}";
+  pname = "glslang";
  version = "7.11.3113";

  src = fetchFromGitHub {
@@ -6,7 +6,7 @@ let
  lib = stdenv.lib;
 in
 stdenv.mkDerivation rec {
-  name = "gnu-cobol-${version}";
+  pname = "gnu-cobol";
  inherit version;

  src = fetchurl {
@@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library.
 in stdenv.mkDerivation rec {

  version = "3.2.5";
-  name = "gnu-smalltalk-${version}";
+  pname = "gnu-smalltalk";

  src = fetchurl {
    url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz";
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
-  name = "go-jsonnet-${version}";
+  pname = "go-jsonnet";
  version = "0.13.0";

  goPackagePath = "github.com/google/go-jsonnet";
@@ -23,7 +23,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "go-${version}";
+  pname = "go";
  version = "1.10.8";

  src = fetchFromGitHub {
@@ -8,7 +8,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "go-${version}";
+  pname = "go";
  version = "1.4-bootstrap-20161024";
  revision = "79d85a4965ea7c46db483314c3981751909d7883";

@@ -214,7 +214,7 @@ in rec {

  jvmci8 = stdenv.mkDerivation rec {
    version = "19.2-b01";
-    name = "jvmci-${version}";
+    pname = "jvmci";
    src = fetchFromGitHub {
      owner  = "graalvm";
      repo   = "graal-jvmci-8";
@@ -280,7 +280,7 @@ in rec {

  graalvm8 = stdenv.mkDerivation rec {
    inherit version;
-    name = "graal-${version}";
+    pname = "graal";
    src = fetchFromGitHub {
      owner  = "oracle";
      repo   = "graal";
@@ -7,7 +7,7 @@
 }:

 stdenv.mkDerivation rec {
-  name    = "hhvm-${version}";
+  pname = "hhvm";
  version = "3.23.2";

  # use git version since we need submodules
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, bison, flex}:

 stdenv.mkDerivation rec {
-  name = "iasl-${version}";
+  pname = "iasl";
  version = "20181213";

  src = fetchurl {
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:

 stdenv.mkDerivation rec {
-  name = "icedtea-web-${version}";
+  pname = "icedtea-web";

  version = "1.8.3";

  src = fetchFromGitHub {
    owner = "AdoptOpenJDK";
    repo = "IcedTea-Web";
-    rev = name;
+    rev = "${pname}-${version}";
    sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
  };

@@ -6,11 +6,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {

-  name = "intercal-${version}";
+  pname = "intercal";
  version = "0.30";

  src = fetchurl {
-    url = "http://catb.org/esr/intercal/${name}.tar.gz";
+    url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz";
    sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
  };

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

  inherit testedTargets;

-  name = "ispc-${version}";
+  pname = "ispc";

  src = fetchFromGitHub {
    owner = "ispc";
@@ -3,7 +3,6 @@
 }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "javacard-devkit";
  version = "2.2.2";
  uscoreVersion = builtins.replaceStrings ["."] ["_"] version;
@@ -8,7 +8,6 @@
 let drv = stdenv.mkDerivation rec {
  pname = "jetbrainsjdk";
  version = "164";
-  name = pname + "-" + version;

  src = if stdenv.hostPlatform.system == "x86_64-linux" then
    fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "jsonnet-${version}";
+  pname = "jsonnet";
  version = "0.13.0";

  src = fetchFromGitHub {
@@ -77,10 +77,9 @@ in
 stdenv.mkDerivation rec {
  pname = "julia";
  inherit version;
-  name = "${pname}-${version}";

  src = fetchzip {
-    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
+    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
    sha256 = src_sha256;
  };
  prePatch = ''
@@ -3,7 +3,7 @@

 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "jwasm-${version}";
+  pname = "jwasm";
  version = "git-2017-11-22";

  src = fetchFromGitHub {
@@ -4,7 +4,7 @@ let
  version = "1.3.41";
 in stdenv.mkDerivation rec {
  inherit version;
-  name = "kotlin-${version}";
+  pname = "kotlin";

  src = fetchurl {
    url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
@@ -1,7 +1,7 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
  inherit version;
  src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";

@@ -1,7 +1,7 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
  inherit version;
  src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";

@@ -1,6 +1,6 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
  inherit version;
  src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";

@@ -1,6 +1,6 @@
 { stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 stdenv.mkDerivation rec {
-  name = "compiler-rt-${version}";
+  pname = "compiler-rt";
  inherit version;
  src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";

@@ -3,7 +3,7 @@
 let
  rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
 in stdenv.mkDerivation rec {
-  name = "manticore-${version}";
+  pname = "manticore";
  version = "2018.09.29";
 
  src = fetchFromGitHub {
@@ -2,7 +2,7 @@
 , readline }:

 stdenv.mkDerivation rec {
-  name    = "mercury-${version}";
+  pname = "mercury";
  version = "14.01.1";

  src = fetchurl {
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, vim, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "microscheme-${version}";
+  pname = "microscheme";
  version = "0.9.3";

  src = fetchzip {
-    name = "${name}-src";
+    name = "${pname}-${version}-src";
    url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz";
    sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
  };
@@ -34,7 +34,7 @@ let
 in
 stdenv.mkDerivation rec {
  version = "0.5.0";
-  name = "mint-${version}";
+  pname = "mint";
  src = fetchFromGitHub {
    owner = "mint-lang";
    repo = "mint";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:

 with stdenv.lib; stdenv.mkDerivation rec {
-  name = "mkcl-${version}";
+  pname = "mkcl";
  version = "1.1.11";

  src = fetchFromGitHub {
@@ -3,15 +3,15 @@ let
  dynamic-linker = stdenv.cc.bintools.dynamicLinker;
 in
 stdenv.mkDerivation rec {
-  name = "mlton-${version}";
+  pname = "mlton";
  version = "20180207";

  src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz";
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz";
    sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
    })
  else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
-    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz";
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz";
      sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
    })
  else
@@ -14,7 +14,7 @@
 }:

 stdenv.mkDerivation rec {
-  name    = "llvm-${version}";
+  pname = "llvm";
  version = "3.6-mono-2017-02-15";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gmp, perl }:

 stdenv.mkDerivation rec {
-  name = "mosml-${version}";
+  pname = "mosml";
  version = "2.10.1";

  buildInputs = [ gmp perl ];
@@ -1,12 +1,12 @@
 { stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:

 stdenv.mkDerivation rec {
-  name = "nasm-${version}";
+  pname = "nasm";
  version = "2.14.02";

  src = fetchFromRepoOrCz {
    repo = "nasm";
-    rev = name;
+    rev = "${pname}-${version}";
    sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
  };

@@ -3,7 +3,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "neko-${version}";
+  pname = "neko";
  version = "2.2.0";

  src = fetchurl {
@@ -26,7 +26,7 @@ let
  });
 in
 stdenv.mkDerivation rec {
-  name = "nextpnr-${version}";
+  pname = "nextpnr";
  version = "2019.04.19";

  src = fetchFromGitHub {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {

  date = "April2012";

-  name = "nvidia-cg-toolkit-${version}";
+  pname = "nvidia-cg-toolkit";

  src =
    if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -1,6 +1,6 @@
 { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
-  name = "obliv-c-${version}";
+  pname = "obliv-c";
  version = "0.0pre20180624";
  buildInputs = [ perl ]
  ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
@@ -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 {
@@ -7,7 +7,6 @@
 stdenv.mkDerivation rec {
  pname = "opa";
  version = "4310";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "MLstate";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "openspin-${version}";
+  pname = "openspin";
  version = "unstable-2018-10-02";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coreutils, which }:

 stdenv.mkDerivation rec {
-  name    = "owl-lisp-${version}";
+  pname = "owl-lisp";
  version = "0.1.16";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:

 stdenv.mkDerivation rec {
-  name = "polyml-${version}";
+  pname = "polyml";
  version = "5.7.1";

  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:

 stdenv.mkDerivation rec {
-  name = "polyml-${version}";
+  pname = "polyml";
  version = "5.8";

  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, ponyc }:

 stdenv.mkDerivation rec {
-  name = "pony-stable-${version}";
+  pname = "pony-stable";
  version = "0.2.1";

  src = fetchFromGitHub {
@@ -5,7 +5,7 @@
 # in a published version.

 stdenv.mkDerivation rec {
-  name = "rgbds-${version}";
+  pname = "rgbds";
  version = "0.3.8";
  src = fetchFromGitHub {
    owner = "rednex";
@@ -43,7 +43,7 @@ let
 in
 assert builtins.hasAttr stdenv.hostPlatform.system options;
 stdenv.mkDerivation rec {
-  name    = "sbcl-bootstrap-${version}";
+  pname = "sbcl-bootstrap";
  version = cfg.version;

  src = fetchurl {
@@ -9,11 +9,11 @@
 }:

 stdenv.mkDerivation rec {
-  name    = "sbcl-${version}";
+  pname = "sbcl";
  version = "1.5.3";

  src = fetchurl {
-    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
    sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
  };

@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "0.14.0-RC1";
-  name = "dotty-bare-${version}";
+  pname = "dotty-bare";

  src = fetchurl {
    url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
@@ -9,7 +9,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "sdcc-${version}";
+  pname = "sdcc";
  version = "3.9.0";

  src = fetchurl {
@@ -3,7 +3,7 @@ bison, flex, libGLU, pythonPackages
 }:

 stdenv.mkDerivation rec {
-  name = "seexpr-${version}";
+  pname = "seexpr";
  version = "2.11";
  src = fetchFromGitHub {
    owner  = "wdas";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ... }:

 stdenv.mkDerivation rec {
-  name = "serpent-${version}";
+  pname = "serpent";

  # I can't find any version numbers, so we're just using the date
  # of the last commit.
@@ -24,7 +24,7 @@ let
    sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
  };
 in stdenv.mkDerivation rec {
-  name = "shaderc-${version}";
+  pname = "shaderc";
  version = "2019.0";

  outputs = [ "out" "lib" "bin" "dev" "static" ];
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "smlnj-bootstrap-${version}";
+  pname = "smlnj-bootstrap";

  version = "110.91";

@@ -15,7 +15,7 @@ let
 in
 stdenv.mkDerivation rec {

-  name = "solc-${version}";
+  pname = "solc";
  version = "0.5.10";

  # upstream suggests avoid using archive generated by github
@@ -9,7 +9,7 @@ let
  toolsPath = stdenv.lib.makeBinPath [ mcpp ];
 in
 stdenv.mkDerivation rec {
-  name    = "souffle-${version}";
+  pname = "souffle";
  version = "1.6.1";

  src = fetchFromGitHub {
@@ -2,7 +2,7 @@
 , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:

 stdenv.mkDerivation rec {
-  name = "squeak-${version}";
+  pname = "squeak";
  version = "4.10.2.2614";

  src = fetchurl {
@@ -9,7 +9,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "terra-git-${version}";
+  pname = "terra-git";
  version = "1.0.0-beta1";

  src = fetchFromGitHub {
@@ -2,7 +2,7 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "tcc-${version}";
+  pname = "tcc";
  version = "0.9.27";

  src = fetchFromRepoOrCz {
@@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "urweb-${version}";
+  pname = "urweb";
  version = "20190217";

  src = fetchurl {
-    url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
+    url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz";
    sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
  };

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:

 stdenv.mkDerivation rec {
-  name = "wcc-unstable-${version}";
+  pname = "wcc-unstable";
  version = "2018-04-05";

  src = fetchFromGitHub {
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
  pname = "X11basic";
  version = "1.26";
-  name = pname + "-" + version;

  src = fetchFromGitHub {
    owner = "kollokollo";
@@ -2,10 +2,10 @@

 stdenv.mkDerivation rec {
  version = "6.3.3";
-  name = "yap-${version}";
+  pname = "yap";

  src = fetchurl {
-    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
+    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz";
    sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
  };

--- a/Show More
+++ b/Show More