Merge pull request #31224 from peterhoeg/u/tds

freetds: 0.91 -> 1.00.70

pkgs/applications/office/calligra/2.nix

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

pkgs/development/libraries/freetds/default.nix

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

pkgs/development/tools/sqsh/default.nix

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