From 485ea9a621faafc11db1112d469d82c2a18c5395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Sep 2015 09:10:38 +0200 Subject: [PATCH] xf86_video_nouveau: deprecate this alias --- nixos/modules/services/x11/xserver.nix | 1 - pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 1ec098fded6..3348e8d0582 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -13,7 +13,6 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { - nouveau = { modules = [ pkgs.xf86_video_nouveau ]; }; unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; }; virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69198adb1b3..e4a8fb9d46c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10257,8 +10257,6 @@ let xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; - xf86_video_nouveau = xorg.xf86videonouveau; - xmoto = callPackage ../games/xmoto { }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; @@ -15044,6 +15042,7 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26