From 31cf973dc7a766f5f329e02cd9c723ecca9cd407 Mon Sep 17 00:00:00 2001 From: cresh Date: Sun, 5 May 2019 02:22:15 +0200 Subject: [PATCH] squirrel-sql: Add MSSQL driver. (#55626) --- .../tools/database/squirrel-sql/default.nix | 2 ++ pkgs/servers/sql/mssql/jdbc/builder.sh | 6 ++++++ pkgs/servers/sql/mssql/jdbc/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/sql/mssql/jdbc/builder.sh create mode 100644 pkgs/servers/sql/mssql/jdbc/default.nix diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index eab4c855e1c..5eb7651f199 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -47,6 +47,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \ --set CLASSPATH "$cp" \ --set JAVA_HOME "${jre}" + # Make sure above `CLASSPATH` gets picked up + substituteInPlace $out/share/squirrel-sql/squirrel-sql.sh --replace "-cp \"\$CP\"" "-cp \"\$CLASSPATH:\$CP\"" mkdir -p $out/share/icons/hicolor/32x32/apps ln -s $out/share/squirrel-sql/icons/acorn.png \ diff --git a/pkgs/servers/sql/mssql/jdbc/builder.sh b/pkgs/servers/sql/mssql/jdbc/builder.sh new file mode 100644 index 00000000000..a5ba86cb080 --- /dev/null +++ b/pkgs/servers/sql/mssql/jdbc/builder.sh @@ -0,0 +1,6 @@ +source $stdenv/setup + +set -e + +mkdir -p $out/share/java +cp $src $out/share/java/mssql-jdbc.jar diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix new file mode 100644 index 00000000000..f6edfe388ac --- /dev/null +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "mssql-jdbc"; + version = "7.2.2"; + builder = ./builder.sh; + + src = fetchurl { + url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/${pname}-${version}.jre8.jar"; + sha256 = "09psxjy1v3khq8lcq6h9mbgyijsgawf0z2qryk1l91ypnwl8s3pg"; + }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54bfa04090e..77e706b7161 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7902,7 +7902,7 @@ in squeak = callPackage ../development/compilers/squeak { }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { - drivers = [ mysql_jdbc postgresql_jdbc ]; + drivers = [ mssql_jdbc mysql_jdbc postgresql_jdbc ]; }; stalin = callPackage ../development/compilers/stalin { }; @@ -14276,6 +14276,8 @@ in mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; + mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; + miniflux = callPackage ../servers/miniflux { }; nagios = callPackage ../servers/monitoring/nagios { };