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

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 12:41:18 +00:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -12,7 +12,7 @@ let

 in
 buildGoPackage rec {
-  name = "cockroach-${version}";
+  pname = "cockroach";
  version = "19.1.1";

  goPackagePath = "github.com/cockroachdb/cockroach";
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -218,7 +218,7 @@ server = stdenv.mkDerivation (common // {
 });

 connector-c = stdenv.mkDerivation rec {
-  name = "mariadb-connector-c-${version}";
+  pname = "mariadb-connector-c";
  version = "2.3.7";

  src = fetchurl {
@@ -259,7 +259,7 @@ connector-c = stdenv.mkDerivation rec {
 };

 galera = stdenv.mkDerivation rec {
-  name = "mariadb-galera-${version}";
+  pname = "mariadb-galera";
  version = "25.3.26";

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

  installPhase = ''
    # copied with modifications from scripts/packages/freebsd.sh
-    GALERA_LICENSE_DIR="$share/licenses/${name}"
+    GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
    install -m 555 "garb/garbd"                       "$out/bin/garbd"
    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "oracle-xe-${version}";
+  pname = "oracle-xe";
  version = "11.2.0";

  src = requireFile {
-    name = "${name}-1.0.x86_64.rpm";
+    name = "${pname}-${version}-1.0.x86_64.rpm";
    sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6";

    url = "http://www.oracle.com/technetwork/"
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ makeWrapper ];

  unpackCmd = ''
-    (mkdir -p "${name}" && cd "${name}" &&
+    (mkdir -p "${pname}-${version}" && cd "${pname}-${version}" &&
      ${rpmextract}/bin/rpmextract "$curSrc")
  '';

--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:

 stdenv.mkDerivation rec {
-  name = "percona-server-${version}";
+  pname = "percona-server";
  version = "5.6.43-84.3";

  src = fetchurl {
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, libevent }:

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

  src = fetchurl {
-    url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
+    url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
    sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q";
  };

--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -3,11 +3,10 @@
 stdenv.mkDerivation rec {
  pname = "pgpool-II";
  version = "4.0.5";
-  name = "${pname}-${version}";

  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
    sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4";
  };

--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -20,11 +20,11 @@ let
    icuEnabled = atLeast "10";

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

    src = fetchurl {
-      url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+      url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";
      inherit sha256;
    };

--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, protobufc }:

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

  nativeBuildInputs = [ protobufc ];
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql }:

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

  buildInputs = [ postgresql ];
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:

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

  buildInputs = [ postgresql openssl zlib readline ];
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql }:

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

  buildInputs = [ postgresql ];
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name    = "pgjwt-${version}";
+  pname = "pgjwt";
  version = "unstable-2017-04-24";

  src = fetchFromGitHub {
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }:

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

  src = fetchFromGitHub {
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -13,7 +13,7 @@
 , libiconv
 }:
 stdenv.mkDerivation rec {
-  name = "postgis-${version}";
+  pname = "postgis";
  version = "2.5.2";

  outputs = [ "out" "doc" ];
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -7,7 +7,7 @@
 # }

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

  nativeBuildInputs = [ cmake ];
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, postgresql }:

 stdenv.mkDerivation rec {
-  name = "tsearch-extras-${version}";
+  pname = "tsearch-extras";
  version = "0.4";

  src = fetchFromGitHub {
--- a/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -2,7 +2,6 @@

 stdenv.mkDerivation rec {
  pname = "sqlite-jdbc";
-  name = "${pname}-${version}";
  version = "3.25.2";

  src = fetchMavenArtifact {
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
  phases = [ "installPhase" ];

  installPhase = ''
-    install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar"
+    install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar"
  '';

  meta = with stdenv.lib; {