From 8c410f4b1877d3de7be5255972ef8177cdb81b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 22 Mar 2017 21:44:06 +0100 Subject: [PATCH] Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1" This reverts commit 0c262a639e1f5754ebe0701b7f622e2ada26ddfa. It broke X tests, though it's not clear why ATM. Discussion: https://github.com/NixOS/nixpkgs/pull/23890#issuecomment-288528788 --- .../linux/kmod-blacklist-ubuntu/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index c96d17b7a62..35bf40bf835 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, gnugrep, findutils }: - let - version = "22-1.1ubuntu1"; # Zesty - -in stdenv.mkDerivation { + version = "3ubuntu1"; # Saucy +in +stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; - sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; + sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; }; installPhase = '' @@ -28,9 +27,9 @@ in stdenv.mkDerivation { --replace " xargs " " ${findutils}/bin/xargs " ''; - meta = with stdenv.lib; { - homepage = http://packages.ubuntu.com/source/zesty/kmod; + meta = { + homepage = http://packages.ubuntu.com/source/saucy/kmod; description = "Linux kernel module blacklists from Ubuntu"; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.linux; }; }