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

Merge pull request #23890 from peterhoeg/u/kmod

Browse Source 
kmod: 23 -> 24 and update kmod-blacklist-ubuntu to zesty
This commit is contained in:
Peter Hoeg 2017-03-17 16:01:09 +08:00 committed by GitHub
commit cb73e06989
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchurl, gnugrep, findutils }: { stdenv, fetchurl, gnugrep, findutils }:
let let
version = "3ubuntu1"; # Saucy version = "22-1.1ubuntu1"; # Zesty
in
stdenv.mkDerivation { in stdenv.mkDerivation {
name = "kmod-blacklist-${version}"; name = "kmod-blacklist-${version}";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";
}; };
installPhase = '' installPhase = ''
@ -15,6 +16,8 @@ stdenv.mkDerivation {
for f in modprobe.d/*.conf; do for f in modprobe.d/*.conf; do
echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
cat "$f" >> "$out"/modprobe.conf cat "$f" >> "$out"/modprobe.conf
# https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1475945
sed -i '/^blacklist i2c_801/d' $out/modprobe.conf
done done
substituteInPlace "$out"/modprobe.conf \ substituteInPlace "$out"/modprobe.conf \
@ -25,9 +28,9 @@ stdenv.mkDerivation {
--replace " xargs " " ${findutils}/bin/xargs " --replace " xargs " " ${findutils}/bin/xargs "
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://packages.ubuntu.com/source/saucy/kmod; homepage = http://packages.ubuntu.com/source/zesty/kmod;
description = "Linux kernel module blacklists from Ubuntu"; description = "Linux kernel module blacklists from Ubuntu";
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

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

@ -6,11 +6,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "kmod-${version}"; name = "kmod-${version}";
version = "23"; version = "24";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
sha256 = "0mc12sx06p8il1ym3hdmgxxb37apn9yv7xij26gddjdfkx8xa0yk"; sha256 = "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];