diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:02:48 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:02:48 +0200 |
commit | 30f551d8b25782611f869369e54539efe745f5ea (patch) | |
tree | 73187d1c515078f33bfdaa5088ac41dc3f1ea2ce /pkgs/os-specific | |
parent | d067b7bd3502a64b852ad8511502ed35d20cbc1b (diff) | |
parent | 529a4050cdaf0f659534c2ba2d2565c43735ceb8 (diff) | |
download | nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.gz nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.bz2 nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.lz nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.xz nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.zst nixlib-30f551d8b25782611f869369e54539efe745f5ea.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.8.nix | 20 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rtkit/default.nix | 11 |
2 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix new file mode 100644 index 000000000000..5c2112686235 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.8"; + modDirVersion = "4.8.0"; + extraMeta.branch = "4.8"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index fe392fb08410..3284dfcb88ba 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libcap }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, dbus, libcap }: stdenv.mkDerivation rec { name = "rtkit-0.11"; - + src = fetchurl { url = "http://0pointer.de/public/${name}.tar.xz"; sha256 = "1l5cb1gp6wgpc9vq6sx021qs6zb0nxg3cn1ba00hjhgnrw4931b8"; @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-multimedia/rtkit.git/plain/debian/patches/0002-Drop-Removed-ControlGroup-stanza.patch?id=21f2c6be6985c777cbf113c67043353406744050"; + sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck"; + }) + ]; + buildInputs = [ pkgconfig dbus libcap ]; meta = { |