diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/servers/sql | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
download | nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2 nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/cockroachdb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/sql/oracle-xe/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/sql/percona/5.6.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/pgbouncer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/pgpool/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_hll.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_repack.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_topn.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgtap.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/postgis.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/timescaledb.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/tsearch_extras.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/sqlite/jdbc/default.nix | 3 |
17 files changed, 24 insertions, 26 deletions
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 22ec301bced..a34b7f03be8 100644 --- 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"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7d34dd8d63b..ac14015c4cf 100644 --- 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" diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index a50d623acbc..062de0c2368 100644 --- 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") ''; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index c77330bd2ac..7f8f0786e03 100644 --- 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 { diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 3b4a0543e18..ccf8ac264e9 100644 --- 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"; }; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 3db62aa491c..6a9423bc4e4 100644 --- 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"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 711ad35bcc1..ca3c3af74f2 100644 --- 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; }; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index f2e814543db..71fe9a72b56 100644 --- 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 ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index bccec1107b9..c7978aa6860 100644 --- 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 ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 381a174838e..7b64de381f3 100644 --- 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 ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 1a5aa91ae6e..e25a6d0d54f 100644 --- 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 ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index c68ba9b1728..ac79c1b3b38 100644 --- 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 { diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 7dd6a5882b2..804356e9f6b 100644 --- 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 { diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 63b8a39b0e2..33d050497da 100644 --- 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" ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 77da47b00e0..5f995995820 100644 --- 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 ]; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 7be23003b58..9e3fe74aa6c 100644 --- 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 { diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 4e40d876152..f5444bb0683 100644 --- 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; { |