diff options
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/mysql/jdbc/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/sql/virtuoso/6.x.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/sql/virtuoso/7.x.nix | 7 |
4 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 6b22185cd80..7e6422a6f53 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,11 +1,12 @@ {lib, stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { - name = "mysql-connector-java-5.1.46"; + pname = "mysql-connector-java"; + version = "5.1.46"; builder = ./builder.sh; src = fetchurl { - url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; + url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip"; sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index e424120a390..a4a8e6b0fe3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation { - name = "pg_similarity-1.0"; + pname = "pg_similarity"; + version = "1.0"; src = fetchFromGitHub { owner = "eulerto"; repo = "pg_similarity"; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 4737c0a3894..c811a162412 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.6"; + pname = "virtuoso-opensource"; + version = "6.1.6"; src = fetchurl { - url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; + url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz"; sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' echo Moving documentation mkdir -pv $out/share/doc - mv -v $out/share/virtuoso/doc $out/share/doc/${name} + mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version} echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index a27cd249f1c..173124596a0 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-7.2.4.2"; + pname = "virtuoso-opensource"; + version = "7.2.4.2"; src = fetchurl { - url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; + url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz"; sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"; }; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { postInstall='' echo Moving documentation mkdir -pv $out/share/doc - mv -v $out/share/virtuoso/doc $out/share/doc/${name} + mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version} echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete ''; |