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
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
  pname = "arpa2cm";
  version = "0.5";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lua5_3, python }:

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

  src = fetchFromGitHub {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    broken = true; # 2018-08-07
  };

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

  src = fetchurl {
    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:

 buildGoPackage rec {
-  name = "bazel-buildtools-${version}";
+  pname = "bazel-buildtools";
  version = "0.28.0";
  rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python }:

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

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

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

  src = fetchurl {
-    url    = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
+    url    = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
    sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
  };

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

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

  src = fetchurl {
    url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, perl}:

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

  buildInputs = [perl];
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:

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

  enableParallelBuilding = true;
@@ -17,7 +17,7 @@ let

 in
 stdenv.mkDerivation rec {
-  name = "gn-${version}";
+  pname = "gn";
  version = "20190403";

  src = fetchgit {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    rev = "version-0.7.0";
    sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
  };
-  name = "gup-${version}";
+  pname = "gup";
  buildInputs = lib.remove null [ python which pychecker ];
  SKIP_PYCHECKER = pychecker == null;
  buildPhase = "make python";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:

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

  src = fetchFromGitLab {
@@ -1,7 +1,7 @@
 { fetchgit, stdenv }:

 stdenv.mkDerivation rec {
-  name = "kati-unstable-${version}";
+  pname = "kati-unstable";
  version = "2017-05-23";
  rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f";

@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
  pname = "leiningen";
  version = "2.9.1";
-  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
@@ -13,11 +12,11 @@ stdenv.mkDerivation rec {

  jarsrc = fetchurl {
    # NOTE: This is actually a .jar, Github has issues
-    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
+    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip";
    sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a";
  };

-  JARNAME = "${name}-standalone.jar";
+  JARNAME = "${pname}-${version}-standalone.jar";

  dontUnpack = true;

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

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

  src = fetchurl {
@@ -3,7 +3,7 @@
 with stdenv.lib;

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

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:

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

  version = "1.13.1";

@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, python2, which}:
 stdenv.mkDerivation rec {
-  name = "redo-apenwarr-${version}";
+  pname = "redo-apenwarr";

  version = "unstable-2019-06-21";

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

 stdenv.mkDerivation rec {
  version = "2.0.3";
-  name = "redo-sh-${version}";
+  pname = "redo-sh";

  src = fetchurl {
    url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline }:

 stdenv.mkDerivation rec {
-  name = "remake-${version}";
+  pname = "remake";
  remakeVersion = "4.1";
  dbgVersion = "1.1";
  version = "${remakeVersion}+dbg-${dbgVersion}";
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre }:

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

  src = fetchurl {
    urls = [
-      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
+      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz"
      "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
      "https://cocl.us/sbt-${version}.tgz"
    ];
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:

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

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:

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

  src = fetchFromGitHub {
@@ -7,13 +7,13 @@ let
    optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
 in
 stdenv.mkDerivation rec {
-  name = "waf-${version}";
+  pname = "waf";
  version = "2.0.15";

  src = fetchFromGitLab {
    owner = "ita1024";
    repo = "waf";
-    rev = name;
+    rev = "${pname}-${version}";
    sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz";
  };