diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-08-27 20:54:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-27 20:54:06 -0400 |
commit | af71811487509fbb6c04cb4484575cc6c0ca8701 (patch) | |
tree | 54f3aa31c5daa3b075caff68c789f010a608e5c4 /pkgs | |
parent | 2b17b326417f64b2fa30f33d4cccc48645bf9290 (diff) | |
parent | 6e672974ccb6ba12e80ca4c589a11dad85d19f95 (diff) | |
download | nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.tar nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.tar.gz nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.tar.bz2 nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.tar.lz nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.tar.xz nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.tar.zst nixlib-af71811487509fbb6c04cb4484575cc6c0ca8701.zip |
Merge pull request #67594 from spencerjanssen/unixodbc-17.4.1.1
unixODBCDrivers.msodbcsql17: 17.2.0.1 -> 17.4.1.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/unixODBCDrivers/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7b72e12a66b2..99535ec395ea 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -125,16 +125,16 @@ version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; - versionMinor = "2"; - versionAdditional = "0.1"; + versionMinor = "4"; + versionAdditional = "1.1"; src = fetchurl { url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; - sha256 = "1966ymbbk0jsacqwzi3dmhxv2n8hfgnpjsx3hr3n7s9d88chgpx5"; + sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ unixODBC dpkg openssl kerberos curl libuuid stdenv.cc.cc ]; + buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ]; unpackPhase = "dpkg -x $src ./"; buildPhase = ""; @@ -142,8 +142,6 @@ installPhase = '' mkdir -p $out mkdir -p $out/lib - ln -s ${lib.getLib openssl}/lib/libssl.so.1.0.0 $out/lib/libssl.so.1.0.2 - ln -s ${lib.getLib openssl}/lib/libcrypto.so.1.0.0 $out/lib/libcrypto.so.1.0.2 cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/ ''; |