Bumped MySQL java connector version to 5.1.22

Merge branch 'master' of github.com:NixOS/nixpkgs
This commit is contained in:
Sander van der Burg 2012-10-09 16:41:30 +02:00
commit 4ef6aa3a6c
8 changed files with 31 additions and 17 deletions

View file

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.43";
version = "3.0.45";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1mrsdqsphkixvd5x97nz465r490hr679rq6f98jbyr0g5m4fyc29";
sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d";
};
config = configWithPlatform stdenv.platform;

View file

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.11";
version = "3.4.13";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0fda9z5dxvn8sbgr1c143ly8ixm0grymwm4r94nryby9i03s03a2";
sha256 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11";
};
config = configWithPlatform stdenv.platform;

View file

@ -240,7 +240,7 @@ in
import ./generic.nix (
rec {
version = "3.5.4";
version = "3.5.6";
testing = false;
preConfigure = ''
@ -249,7 +249,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "09pi00sk55rpl4mbhd27mnfajgy22bm0zwcgi68iyilc5wir1m12";
sha256 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf";
};
config = configWithPlatform stdenv.platform;

View file

@ -244,8 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6";
modDirVersion = "3.6.0";
version = "3.6.1";
testing = false;
preConfigure = ''
@ -254,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa";
sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz";
};
config = configWithPlatform stdenv.platform;

View file

@ -189,6 +189,21 @@ rec {
features.aufs3 = true;
};
# not officially released yet, but 3.x seems to work fine
aufs3_6 = rec {
name = "aufs3.6";
version = "3.x.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb";
sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =
@ -226,6 +241,7 @@ rec {
patch = ./dell-rfkill.patch;
};
# seems no longer necessary on 3.6
perf3_5 =
{ name = "perf-3.5";
patch = ./perf-3.5.patch;

View file

@ -18,11 +18,11 @@
assert useKerberos -> kerberos != null;
stdenv.mkDerivation rec {
name = "samba-3.6.7";
name = "samba-3.6.8";
src = fetchurl {
url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q";
sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg";
};
patches =
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
''
mkdir -p $out
mv $TMPDIR/inst/$out/* $out/
mkdir -pv $out/lib/cups/backend
ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
mkdir -pv $out/etc/openldap/schema

View file

@ -1,14 +1,14 @@
{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
let version = "0.19-20120328"; in
let version = "0.20pre20121005"; in
stdenv.mkDerivation {
name = "btrfs-progs-${version}";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
rev = "91d9eec1ff044394f2b98ee7fcb76713dd33b994";
sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764";
};
buildInputs = [ zlib libuuid acl attr e2fsprogs ];

View file

@ -5870,8 +5870,7 @@ let
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_5
# kernelPatches.perf3_5
kernelPatches.aufs3_6
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill