From 785e45ac06209295531955c0da302f72cb01e4ff Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 23 Mar 2017 10:10:04 +0100 Subject: Revert "Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1"" This reverts commit 8c410f4b1877d3de7be5255972ef8177cdb81b9a with a fix to make the tests run correctly. bochs-drm must not be blacklisted for that. --- .../linux/kmod-blacklist-ubuntu/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix') diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 35bf40bf835..7137390ecab 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, gnugrep, findutils }: + let - version = "3ubuntu1"; # Saucy -in -stdenv.mkDerivation { + version = "22-1.1ubuntu1"; # Zesty + +in stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; - sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; + sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi"; }; installPhase = '' @@ -20,6 +21,7 @@ stdenv.mkDerivation { done substituteInPlace "$out"/modprobe.conf \ + --replace "blacklist bochs-drm" "" \ --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ @@ -27,9 +29,9 @@ stdenv.mkDerivation { --replace " xargs " " ${findutils}/bin/xargs " ''; - meta = { - homepage = http://packages.ubuntu.com/source/saucy/kmod; + meta = with stdenv.lib; { + homepage = http://packages.ubuntu.com/source/zesty/kmod; description = "Linux kernel module blacklists from Ubuntu"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } -- cgit 1.4.1