summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-12-29 18:39:36 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-12-29 18:39:36 +0100
commita1a3e54ac91d087e27da6b95a83ac375bb7c0603 (patch)
treeedc64167f315a48faa4e96e04232f7606d603301 /nixos
parent0ac589246a7020d6ed024353b8b39ef1c363e50e (diff)
parent805e25988f779476f8aed7d13d9fcfaa47010dab (diff)
downloadnixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar
nixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.gz
nixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.bz2
nixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.lz
nixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.xz
nixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.zst
nixpkgs-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.zip
Merge branch 'master' into staging
Haskell rebuild :-)
Hydra: ?compare=1421865
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/profiles/all-hardware.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 3c7e516c497..f56640f1978 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -19,13 +19,12 @@
       "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
       "sata_uli" "sata_via" "sata_vsc"
 
-      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
       "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
       "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
       "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
       "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+      "pata_serverworks" "pata_sil680" "pata_sis"
       "pata_sl82c105" "pata_triflex" "pata_via"
       "pata_winbond"