public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-22 11:00:00 +02:00
parent f77abc8b7a 7491fccfe6
commit 7f410ef923
179 changed files with 2646 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -157,6 +157,13 @@ with stdenv.lib;
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR? y
UBIFS_FS_ADVANCED_COMPR? y
${optionalString (versionAtLeast version "3.6") ''
NFS_SWAP y
''}
${optionalString (versionAtLeast version "3.11") ''
NFS_V4_1 y # NFSv4.1 client support
NFS_V4_2 y
''}
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y

1
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@@ -104,7 +104,6 @@ installPhase() {
# Test a bit.
$out/bin/nvidia-settings --version
$out/bin/nvidia-smi --help > /dev/null
fi
}

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let
versionNumber = "331.79";
versionNumber = "340.24";
in
@@ -25,12 +25,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l";
sha256 = "0c5iix6rihbx7mbfhznz0jjbc3kkccwyfxi56p76fvrbyan9dvam";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v";
sha256 = "04yy26722fjf9k7y6r909g68nqnsglfd9xs1dk1nain1021p70iq";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";

12
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@@ -5,13 +5,13 @@
assert readlineSupport -> readline != null;
stdenv.mkDerivation rec {
version = "2.1";
version = "2.2";
name = "wpa_supplicant-${version}";
src = fetchurl {
url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi";
sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70";
};
extraConfig =
@@ -38,13 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
patches = [ ./libnl.patch
# remove this patch after wpa_supplicant 2.1
(fetchurl {
url ="http://projects.archlinux.org/svntogit/packages.git/plain/trunk/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch?h=packages/wpa_supplicant";
sha256 = "0x1wl2nbl7v9kv80qvysfjhhg5a7lmgygv1y723flps6y8ngm19w";
})
];
patches = [ ./libnl.patch ];
postInstall = ''
mkdir -p $out/share/man/man5 $out/share/man/man8