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

Revert "Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1""

Browse Source 
This reverts commit 8c410f4b1877d3de7be5255972ef8177cdb81b9a with a fix
to make the tests run correctly. bochs-drm must not be blacklisted for
that.
This commit is contained in:
Robin Gloster 2017-03-23 10:10:04 +01:00
parent e0bf35f0e5
commit 785e45ac06
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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 = ''
@ -20,6 +21,7 @@ stdenv.mkDerivation {
done done
substituteInPlace "$out"/modprobe.conf \ substituteInPlace "$out"/modprobe.conf \
--replace "blacklist bochs-drm" "" \
--replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \
--replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \
--replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \
@ -27,9 +29,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;
}; };
} }