summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-08-02 20:18:26 +0000
committerGitHub <noreply@github.com>2021-08-02 20:18:26 +0000
commit3adb10d897fc2c979e8c8014aa6f3a227232f2c5 (patch)
treee247bf2b6a7db2f01a7e9a398de98eede74f170c /pkgs
parent48ea8eb813131a9fb3b0ebf37816b3a94dbf2a6f (diff)
parent22239a1c266c18527bf0d86aa834beb93b7d7a50 (diff)
downloadnixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.tar
nixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.tar.gz
nixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.tar.bz2
nixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.tar.lz
nixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.tar.xz
nixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.tar.zst
nixpkgs-3adb10d897fc2c979e8c8014aa6f3a227232f2c5.zip
Merge pull request #131529 from SuperSandro2000/jdbc
mysql_jdbc: modernize
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/sql/mysql/jdbc/builder.sh9
-rw-r--r--pkgs/servers/sql/mysql/jdbc/default.nix23
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/servers/sql/mysql/jdbc/builder.sh b/pkgs/servers/sql/mysql/jdbc/builder.sh
deleted file mode 100644
index 56336e04135..00000000000
--- a/pkgs/servers/sql/mysql/jdbc/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-set -e
-
-unzip $src
-cd mysql-connector-java-*
-
-mkdir -p $out/share/java
-cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 7e6422a6f53..612d103876b 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,19 +1,28 @@
-{lib, stdenv, fetchurl, ant, unzip}:
+{ lib, stdenv, fetchurl, ant, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "mysql-connector-java";
-  version = "5.1.46";
-  builder = ./builder.sh;
+  version = "5.1.49";
 
   src = fetchurl {
-    url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip";
-    sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
+    url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-${version}.zip";
+    sha256 = "1bm4mm4xka4pq2rwxx3k8xlcpa1vjcglr3pf4ls2i4hamww047yk";
   };
 
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar
+  '';
+
   nativeBuildInputs = [ unzip ];
+
   buildInputs = [ ant ];
 
-  meta = {
-    platforms = lib.platforms.unix;
+  meta = with lib; {
+    description = "MySQL Connector/J";
+    homepage = "https://dev.mysql.com/doc/connector-j/8.0/en/";
+    maintainers = with maintainers; [ ];
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }