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/development/tools/database | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
Diffstat (limited to 'pkgs/development/tools/database')
8 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 7eb34aa29ba4..11b84648632d 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dbmate-${version}"; + pname = "dbmate"; version = "1.4.1"; goPackagePath = "github.com/amacneil/dbmate"; diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index e136b180d78c..8feca8c62ca8 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "ephemeralpg-${version}"; + pname = "ephemeralpg"; version = "2.5"; src = fetchurl { - url = "http://ephemeralpg.org/code/${name}.tar.gz"; + url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 4589e6ff4e5b..637519bcf3fb 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -21,12 +21,11 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liquibase"; version = "3.6.2"; src = fetchurl { - url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; + url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz"; sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx"; }; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { cp ${logback-core} ${logback-classic} ${slf4j} $out/lib # Clean up documentation. - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} mv $out/LICENSE.txt \ $out/README.txt \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} # Remove silly files. rm $out/liquibase.bat $out/liquibase.spec diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 128921a67d7a..d4e57adc140c 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.0.0-rc2"; - name = "schemaspy-${version}"; + pname = "schemaspy"; src = fetchurl { - url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar"; + url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; }; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D ${src} "$out/share/java/${name}.jar" + install -D ${src} "$out/share/java/${pname}-${version}.jar" makeWrapper ${jre}/bin/java $out/bin/schemaspy \ - --add-flags "-jar $out/share/java/${name}.jar" \ + --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ --prefix PATH : "$wrappedPath" ''; diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index f65347889382..2ba38905af9c 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "shmig-${version}"; + pname = "shmig"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 867aa0b98eca..33b2abce277b 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/pkgs/development/tools/database/sqlcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "sqlcheck-${version}"; + pname = "sqlcheck"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix index adb22f45c8e1..ca87395b9179 100644 --- a/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sqldeveloper-${version}"; + pname = "sqldeveloper"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 45e8ba4f7c02..461acacf4e99 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sqldeveloper-${version}"; + pname = "sqldeveloper"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; |