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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-01-18 15:54:04 +01:00
parent 68c9530998 6ced9ee7a4
commit 40003aa2ed
280 changed files with 10014 additions and 5985 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/busybox/default.nix
+2 -2
View File
@@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
name = "busybox-1.26.1";
name = "busybox-1.26.2";
src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "1wl1yy82am53srhgpi1w04hs5hbqjljrrxwwfic35k1mza3y9fqg";
sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
};
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];
pkgs/os-specific/linux/kernel/common-config.nix
+6
View File
@@ -142,6 +142,7 @@ with stdenv.lib;
L2TP_IP m
L2TP_ETH m
BRIDGE_VLAN_FILTERING y
BONDING m
# Wireless networking.
CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
@@ -186,6 +187,10 @@ with stdenv.lib;
${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
''}
${optionalString (versionAtLeast version "4.9") ''
DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
''}
# Sound.
SND_DYNAMIC_MINORS y
@@ -213,6 +218,7 @@ with stdenv.lib;
# ACLs for all filesystems that support them.
FANOTIFY y
TMPFS y
TMPFS_POSIX_ACL y
FS_ENCRYPTION? m
EXT2_FS_XATTR y
EXT2_FS_POSIX_ACL y
pkgs/os-specific/linux/kernel/linux-4.4.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.41";
version = "4.4.43";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1z26frg7sx5n9bvkpg9pfspwhxxvlnnfnrnjr7aqhcgsbxzq8vca";
sha256 = "1yzphiznkwambniq21fiw0vw1fgql4cwcxjlp290y8cf3b3704qb";
};
kernelPatches = args.kernelPatches;
pkgs/os-specific/linux/kernel/linux-4.8.nix
-19
View File
@@ -1,19 +0,0 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8.17";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1zk0q6bvqgz2pk1axd5z0cx71vqk96314f1zn8apwa4raylf9fpa";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.2";
version = "4.9.4";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0f2p12pkzgrh9k5c7g2wwjnv6gzqha8bgd7b0qgbzq3ss7nrmnld";
sha256 = "1160rs35w58cwynq2pcdjxvxgc5lkhy4ydh00hylsnmi9jvazpcv";
};
kernelPatches = args.kernelPatches;
pkgs/os-specific/linux/kernel/linux-testing.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.10-rc2";
modDirVersion = "4.10.0-rc2";
version = "4.10-rc4";
modDirVersion = "4.10.0-rc4";
extraMeta.branch = "4.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "1r3w6mqvmjnsmqrk73xsrqybdvs1czjw5xl1x2wsi2w9nifb47zq";
sha256 = "0rsi9iw8ag3lcy4yjrr6ipf7zpm3f206anv5xzkn2mi1r4vfndvp";
};
features.iwlwifi = true;
pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+3 -3
View File
@@ -8,7 +8,7 @@
with stdenv.lib;
let versionNumber = "304.131"; in
let versionNumber = "304.134"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -19,12 +19,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1a1d0fsahgijcvs2p59vwhs0dpp7pp2wmvgcs1i7fzl6yyv4nmfj";
sha256 = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "0gpqzb5gvhrcgrp3kph1p0yjkndx9wfzgh5j88ysrlflkv3q4vig";
sha256 = "0hy4q1v4y7q2jq2j963mwpjhjksqhaiing3xcla861r8rmjkf8a2";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+3 -3
View File
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
let
versionNumber = "340.96";
versionNumber = "340.101";
/* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
will be included in 340.* legacy releases through the end of 2019.
@@ -29,12 +29,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "13j739gg1igll88xpfsx46m7pan4fwpzx5hqdskkdc0srmw2f3n4";
sha256 = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "1i0lri76ghhr4c6fdlv5gwzd99n70hv3kw21w51anb55msr9s3r8";
sha256 = "0ln7fxm78zrzrjk3j5ychi5xxlgkzg2m7anw8nklr3d17c3jxxjy";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
pkgs/os-specific/linux/sysdig/default.nix
+10 -1
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}:
{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}:
let
inherit (stdenv.lib) optional optionalString;
baseName = "sysdig";
@@ -18,6 +18,15 @@ stdenv.mkDerivation {
hardeningDisable = [ "pic" ];
patches = [
# patch for linux >= 4.9.1
# is included in the next release
(fetchpatch {
url = "https://github.com/draios/sysdig/commit/68823ffd3a76f88ad34c3d0d9f6fdf1ada0eae43.patch";
sha256 = "02vgyd70mwrk6mcdkacaahk49irm6vxzqb7dfickk6k32lh3m44k";
})
];
postPatch = ''
sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
'';
pkgs/os-specific/linux/wireguard/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
let
name = "wireguard-${version}";
version = "0.0.20170105";
version = "0.0.20170115";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "15iqb1a85aygbf3myw6r79i5h3vpjam1rs6xrnf5kgvgmvp91n8v";
sha256 = "1s7zypgbwyf3mkh9any413p0awpny0dxix8d1plsrm52k539ypvy";
};
meta = with stdenv.lib; {