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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel }:
{ stdenv, fetchurl, fetchpatch, kernel }:
let
version = "6.30.223.271";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/${tarball}";
sha256 = hashes.${stdenv.system};
sha256 = hashes."${stdenv.system}";
};
hardeningDisable = [ "pic" ];
@@ -27,6 +27,11 @@ stdenv.mkDerivation {
./linux-4.7.patch
./null-pointer-fix.patch
./gcc.patch
(fetchpatch {
name = "linux-4.8.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms";
sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs";
})
];
makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";

25
pkgs/os-specific/linux/cachefilesd/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cachefilesd-${version}";
version = "0.10.9";
src = fetchurl {
url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8";
};
installFlags = [
"ETCDIR=$(out)/etc"
"SBINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man"
];
meta = with stdenv.lib; {
description = "Local network file caching management daemon";
homepage = "https://people.redhat.com/dhowells/fscache/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

41
pkgs/os-specific/linux/facetimehd/default.nix
View File

@@ -3,25 +3,40 @@
# facetimehd is not supported for kernels older than 3.19";
assert stdenv.lib.versionAtLeast kernel.version "3.19";
let
# Note: When updating this revision:
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
# 2. Test the module and firmware change via:
# a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
# b. Run: journalctl -f
# c. Then close the lid
# d. Then open the lid (and maybe press a key to wake it up)
# e. see if the module loads back (apps using the camera won't
# recover and will have to be restarted) and the camera
# still works.
srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then
{ # Use mainline branch
version = "unstable-2016-10-09";
rev = "887d0f531ef7b91457be519474136c3355c5132b";
sha256 = "0bayahnxar1q6wvf9cb6p8gsfw98w0wqp715hs4r7apmddwk9v7n";
}
else
{ # Use master branch (broken on 4.8)
version = "unstable-2016-05-02";
rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
}
;
in
stdenv.mkDerivation rec {
name = "facetimehd-${version}-${kernel.version}";
version = "git-20160503";
version = srcParams.version;
src = fetchFromGitHub {
owner = "patjak";
repo = "bcwc_pcie";
# Note: When updating this revision:
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
# 2. Test the module and firmware change via:
# a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
# b. Run: journalctl -f
# c. Then close the lid
# d. Then open the lid (and maybe press a key to wake it up)
# e. see if the module loads back (apps using the camera won't
# recover and will have to be restarted) and the camera
# still works.
rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
inherit (srcParams) rev sha256;
};
preConfigure = ''

9
pkgs/os-specific/linux/google-authenticator/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pam, qrencode }:
{ stdenv, lib, fetchurl, pam, qrencode }:
stdenv.mkDerivation rec {
name = "google-authenticator-1.0";
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
cp google-authenticator $out/bin
'';
meta = {
meta = with lib; {
homepage = https://code.google.com/p/google-authenticator/;
description = "Two-step verification, with pam module";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ aneeshusa ];
platforms = platforms.linux;
};
}

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

@@ -180,7 +180,7 @@ with stdenv.lib;
VGA_SWITCHEROO y # Hybrid graphics support
DRM_GMA600 y
DRM_GMA3600 y
${optionalString (versionAtLeast version "4.5") ''
${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
''}
@@ -210,6 +210,7 @@ with stdenv.lib;
# ACLs for all filesystems that support them.
FANOTIFY y
TMPFS y
FS_ENCRYPTION? m
EXT2_FS_XATTR y
EXT2_FS_POSIX_ACL y
EXT2_FS_SECURITY y
@@ -219,6 +220,7 @@ with stdenv.lib;
EXT3_FS_POSIX_ACL y
EXT3_FS_SECURITY y
EXT4_FS_POSIX_ACL y
EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
EXT4_FS_SECURITY y
REISERFS_FS_XATTR? y
REISERFS_FS_POSIX_ACL? y
@@ -231,6 +233,10 @@ with stdenv.lib;
OCFS2_DEBUG_MASKLOG? n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_ADVANCED_COMPR? y
F2FS_FS m
F2FS_FS_SECURITY? y
F2FS_FS_ENCRYPTION? y
UDF_FS m
${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
NFSD_PNFS y
''}

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.24";
version = "4.4.26";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0yhs1742wrl0ip9wsayparjpr7vccljnhfjimgy4fjp3w6aync1k";
sha256 = "17h2k7imdv96pp121y4hswzqjx53vd8wx2s628pifk4vfs9kya2q";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-4.7.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.7";
version = "4.7.9";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
sha256 = "13g2b8ap2xyx0c35ka92j9j3x7mh610ax5fq2xl75787hqmdaf06";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-4.8.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8.1";
version = "4.8.3";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0rcqgi91jz5iyx1nrd4qjmvh0sgqjpqj94bwjh56c21nkxxiahg6";
sha256 = "00s0jscqhiqlfvcxwz5gix1n185i4wj713l6l71gn7jxrw0c1mzr";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.7";
version = "4.7.9";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d";
sha256 = "13g2b8ap2xyx0c35ka92j9j3x7mh610ax5fq2xl75787hqmdaf06";
};
kernelPatches = args.kernelPatches;

8
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8-rc6";
modDirVersion = "4.8.0-rc6";
extraMeta.branch = "4.8";
version = "4.9-rc1";
modDirVersion = "4.9.0-rc1";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "122qn2r3q85xqcb56lgpkiv06yrd5w742fcdjk1sribqcvl1xlqr";
sha256 = "1s123bs20zp1zzy0i12y63n6wsr9cwaad4110rl5ir49j6z6byqf";
};
features.iwlwifi = true;

6
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -86,9 +86,9 @@ rec {
};
grsecurity_testing = grsecPatch
{ kver = "4.7.7";
grrev = "201610101902";
sha256 = "18x8grxj03bh9gqlm3sfgjl8vy5gpyrjr8nmdnrnas6ycmbvyjx4";
{ kver = "4.7.9";
grrev = "201610200819";
sha256 = "1q2j819g3yidd9m7myskx2g1rzrx3cw8fwjrzbbhaxv2kxjmrrjb";
};
# This patch relaxes grsec constraints on the location of usermode helpers,

8
pkgs/os-specific/linux/libselinux/default.nix
View File

@@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig libsepol pcre ]
++ optionals enablePython [ swig python ];
NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
# Avoid this false warning:
# avc_internal.c: In function 'avc_netlink_receive':
# avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align]
# struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
# ^
NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align";
# Unreleased upstream patch that fixes Python package issue arising
# from recent SWIG changes.

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

@@ -29,12 +29,12 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23";
}
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}.run";
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";