diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-06-01 10:17:38 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-06-01 10:17:38 +0200 |
commit | 8b5dc2d67bdd20d16a51893e36f0620e3bca4012 (patch) | |
tree | 7e598be3a2d79f0e870093c6625264f677eea5da /pkgs/os-specific | |
parent | 983657087b739fd3fc735165e4f095f177218a6e (diff) | |
parent | 0a7bafca0cb97d62c5f0bc4166176552a4145f45 (diff) | |
download | nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.tar nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.tar.gz nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.tar.bz2 nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.tar.lz nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.tar.xz nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.tar.zst nixlib-8b5dc2d67bdd20d16a51893e36f0620e3bca4012.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/eventstat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fnotifystat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/forkstat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 36 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 23 | ||||
-rw-r--r-- | pkgs/os-specific/linux/smemstat/default.nix | 4 |
6 files changed, 44 insertions, 31 deletions
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index de27d7b0d838..cd11a79c8f82 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.03.03"; + version = "0.03.04"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "02pg46f3x7v1c1vvqzfjqq0wjb2bzmfkd6a8xp06cg9zvidn6jpb"; + sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 35638e7dabd5..2c90ff94d4a0 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.01.16"; + version = "0.01.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1k9nc7a4r7c2l7vrlcrfxj9rsdb04amiqcsnxm5kpshncry38nl5"; + sha256 = "0ncfbrpyb3ak49nrdr4cb3w082n9s181lizfqx51zi9rdgkj1vm3"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index f8d0eab835bd..6a987dc9f5b5 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.01.16"; + version = "0.01.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "0g65basrs569y42zhgjq9sdyz62km8xy55yfilmyxa43ckb3xmlw"; + sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c117f8f29fae..307c661ddf43 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ lib, callPackage, fetchurl, fetchpatch }: let generic = args: callPackage (import ./generic.nix args) { }; @@ -28,16 +28,42 @@ in settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598"; persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i"; useGLVND = false; + + patches = [ + (fetchpatch { + name = "kernel-4.10.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89; + sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa"; + }) + # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx + # with datestamps removed + ./fs52243.patch + ]; }; legacy_304 = generic { - version = "304.134"; - sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; - sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550"; - settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf"; + version = "304.135"; + sha256_32bit = "14qdl39wird04sqba94dcb77i63igmxxav62ndr4qyyavn8s3c2w"; + sha256_64bit = "125mianhvq591np7y5jjrv9vmpbvixnkicr49ni48mcr0yjnjqkh"; + settingsSha256 = "1y7swikdngq4nlwzkrq20yfah9zr31n1a5i6nw37awnp8xjilhzm"; persistencedSha256 = null; useGLVND = false; useProfiles = false; + + prePatch = let + debPatches = fetchurl { + url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" + + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz"; + sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr"; + }; + prefix = "debian/module/debian/patches"; + applyPatches = pnames: if pnames == [] then null else + '' + tar xf '${debPatches}' + sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch + patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" + ''; + in applyPatches [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ]; }; legacy_173 = callPackage ./legacy173.nix { }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index a21e6ecfc312..0d19079fe662 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -6,6 +6,9 @@ , useGLVND ? true , useProfiles ? true , preferGtk2 ? false + +, prePatch ? "" +, patches ? [] }: { stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch @@ -42,24 +45,8 @@ let } else throw "nvidia-x11 does not support platform ${stdenv.system}"; - # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 - patches = if libsOnly - then null - else if versionOlder version "340" - then null - else if versionOlder version "375" - then [ - (fetchpatch { - name = "kernel-4.10.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89; - sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa"; - }) - # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx - # with datestamps removed - ./fs52243.patch - ] - else null; - + patches = if libsOnly then null else patches; + inherit prePatch; inherit version useGLVND useProfiles; inherit (stdenv) system; diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 9a244c6ed8fb..04f5bf53f936 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.01.16"; + version = "0.01.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; - sha256 = "14n3s6ibm9bq58drvpiasqn11ci6mrwswfpcbpbsimx6fh2j4bi3"; + sha256 = "093ifrz688cm0kmzz1c6himhbdr75ig1mcaapmqy8jadc1gaw2im"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; |