Merge pull request #31224 from peterhoeg/u/tds

freetds: 0.91 -> 1.00.70
This commit is contained in:
Peter Hoeg 2017-11-06 12:28:53 +08:00 committed by GitHub
commit 9b9dacb5fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 36 deletions

View file

@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ phreedom ebzzry ]; maintainers = with maintainers; [ phreedom ebzzry ];
inherit (kdelibs4.meta) platforms; inherit (kdelibs4.meta) platforms;
license = licenses.gpl2; license = licenses.gpl2;
broken = true;
}; };
} }

View file

@ -1,34 +1,35 @@
{ stdenv, fetchurl { stdenv, fetchurl, autoreconfHook, pkgconfig
, openssl
, odbcSupport ? false, unixODBC ? null }: , odbcSupport ? false, unixODBC ? null }:
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freetds-0.91"; name = "freetds-${version}";
version = "1.00.70";
src = fetchurl { src = fetchurl {
url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz"; url = "http://www.freetds.org/files/stable/${name}.tar.bz2";
sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; sha256 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp";
}; };
hardeningDisable = [ "format" ]; configureFlags = [
"--with-tdsver=7.3"
];
buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; buildInputs = [
openssl
] ++ stdenv.lib.optional odbcSupport unixODBC;
configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; nativeBuildInputs = [ autoreconfHook pkgconfig ];
doDist = true; enableParallelBuilding = true;
distPhase = '' meta = with stdenv.lib; {
touch $out/include/tds.h description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
touch $out/lib/libtds.a homepage = http://www.freetds.org;
''; license = licenses.lgpl2;
maintainers = with maintainers; [ peterhoeg ];
meta = { platforms = platforms.all;
description =
"Libraries to natively talk to Microsoft SQL Server and Sybase databases";
homepage = http://www.freetds.org;
license = "lgpl";
platforms = stdenv.lib.platforms.all;
}; };
} }

View file

@ -1,33 +1,38 @@
{ stdenv, fetchurl, freetds, readline }: { stdenv, fetchurl, autoreconfHook, freetds, readline }:
stdenv.mkDerivation rec { let
version = "2.5.16.1"; mainVersion = "2.5";
in stdenv.mkDerivation rec {
name = "sqsh-${version}"; name = "sqsh-${version}";
version = "${mainVersion}.16.1";
src = fetchurl { src = fetchurl {
url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz"; url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz";
sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n";
}; };
preConfigure = preConfigure = ''
''
export SYBASE=${freetds} export SYBASE=${freetds}
'';
buildInputs = [ substituteInPlace src/cmd_connect.c \
freetds --replace CS_TDS_80 CS_TDS_73
readline '';
];
meta = { enableParallelBuilding = true;
buildInputs = [ freetds readline ];
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
description = "Command line tool for querying Sybase/MSSQL databases"; description = "Command line tool for querying Sybase/MSSQL databases";
longDescription = longDescription = ''
''
Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell),
it is intended as a replacement for the venerable 'isql' program supplied it is intended as a replacement for the venerable 'isql' program supplied
by Sybase. by Sybase.
''; '';
homepage = http://www.cs.washington.edu/~rose/sqsh/sqsh.html; homepage = http://sourceforge.net/projects/sqsh/;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }