summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-06-08 11:22:36 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-06-08 12:34:24 +0200
commit9f7d7adb052ceed89d817b46facbe7c192e36ce0 (patch)
tree249a1687e12cb7a33d86bfd12a995c36f1b604da
parentef1c9cdeef21c2c1b11931182662f644701367f1 (diff)
downloadnixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.tar
nixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.tar.gz
nixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.tar.bz2
nixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.tar.lz
nixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.tar.xz
nixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.tar.zst
nixpkgs-9f7d7adb052ceed89d817b46facbe7c192e36ce0.zip
Revert "kmod-blacklist-ubuntu: update to Vivid"
This reverts commit 0307c27219ba43cc0a78cd370f825deca16eeaa2.

The only change was blacklisting bochs-drm, but that breaks our VM setup
and I don't see a good reason to do that on the Ubuntu issue
(just some PowerPC failure).

Defaulting to qxl driver might be better anyway, but I'm not venturing
such changes now.
-rw-r--r--pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index b894908eb13..c750006fcd2 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gnugrep, findutils }:
 let
-  version = "18-3ubuntu1"; # Vivid
+  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 = "14ypc1ij9rjnkz4zklbxpgf0ac1bnqlx0mjv0pjjvrrf857fiq94";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
+    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
   };
 
   installPhase = ''