From 27928a020a8d0d4f48140adacdc74716cc2d73bc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 13 Jan 2016 12:07:23 +0000 Subject: [PATCH] gnome3: default to gnome 3.18 --- nixos/tests/gnome3_18.nix | 36 --------------------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 nixos/tests/gnome3_18.nix diff --git a/nixos/tests/gnome3_18.nix b/nixos/tests/gnome3_18.nix deleted file mode 100644 index 971fd48b186..00000000000 --- a/nixos/tests/gnome3_18.nix +++ /dev/null @@ -1,36 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "gnome3"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ iElectric eelco chaoflow lethalman ]; - }; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; - services.xserver.desktopManager.gnome3.enable = true; - - environment.gnome3.packageSet = pkgs.gnome3_18; - - virtualisation.memorySize = 512; - }; - - testScript = - '' - $machine->waitForX; - $machine->sleep(15); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->waitForWindow(qr/Terminal/); - $machine->sleep(20); - $machine->screenshot("screen"); - ''; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8a56bcb179..d93656b81f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14516,7 +14516,7 @@ let gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); - gnome3 = gnome3_16; + gnome3 = gnome3_18; gnome = recurseIntoAttrs gnome2;