about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-07-22 13:18:07 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-07-22 13:18:07 +0000
commit0db478d40b9126efe5dfa9cd5689ad1262e67681 (patch)
tree48439150c08c5d1b8728bf71187e22c1a6fb5200 /pkgs/servers
parentea14f111ddaf0082fe99d323799dd99eca4bb1a2 (diff)
parent8115040c08396d99bc2b781f1c639b505278c8dd (diff)
downloadnixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar
nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.gz
nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.bz2
nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.lz
nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.xz
nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.tar.zst
nixlib-0db478d40b9126efe5dfa9cd5689ad1262e67681.zip
* Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=22707
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/dico/default.nix9
-rw-r--r--pkgs/servers/sql/mysql/jdbc/default.nix6
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index 0be61a1a558c..ac897554ce20 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -1,15 +1,16 @@
-{ fetchurl, stdenv, libtool, gettext, zlib, readline, guile, python }:
+{ fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl
+, guile, python }:
 
 stdenv.mkDerivation rec {
-  name = "dico-2.0";
+  name = "dico-2.1";
 
   src = fetchurl {
     url = "mirror://gnu/dico/${name}.tar.gz";
-    sha256 = "03cpg16jbsv5xh9mvyjj7myvpdpb82354a1yjrhcy0k5w8faa9kv";
+    sha256 = "0cs4jxnz6g5xqrhkbnycn7jl9fs8jfjh33vza7i68m8qmjwx2vza";
   };
 
   # XXX: Add support for GNU SASL.
-  buildInputs = [ libtool gettext zlib readline guile python ];
+  buildInputs = [ libtool gettext zlib readline gsasl guile python ];
 
   doCheck = true;
 
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 8275d0e2ee98..3a2fc55dfc0c 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant}:
 
 stdenv.mkDerivation {
-  name = "mysql-connector-java-5.1.6";
+  name = "mysql-connector-java-5.1.13";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://mirror.hostfuss.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.6.tar.gz;
-    md5 = "84641aa4ddc138fc400366021f05cec5";
+    url = http://mirror.hostfuss.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.13.tar.gz;
+    sha256 = "1y0x9a7d0qfn9bb2114v65407wnjwhz1ylxk0fn997gvwy43schi";
   };
 
   buildInputs = [ant];