diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-05-18 10:48:05 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-05-18 12:24:08 +0200 |
| commit | 25f95555990b2681a269b066c47bf790e3bcbf3f (patch) | |
| tree | 469d7b3c2f5983346bf0812cab945e313a10d4fb /nixos | |
| parent | baf8061cd7d48cafb82c5af1edc3b9d3ba737db6 (diff) | |
| download | nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.tar nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.tar.gz nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.tar.bz2 nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.tar.lz nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.tar.xz nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.tar.zst nixlib-25f95555990b2681a269b066c47bf790e3bcbf3f.zip | |
Drop GNOME 3.12
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 | ||||
| -rw-r--r-- | nixos/tests/gnome3_16.nix | 34 |
2 files changed, 1 insertions, 38 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index d53f119c9558..cf6d2cab3492 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -45,7 +45,7 @@ in { environment.gnome3.packageSet = mkOption { default = null; - example = literalExample "pkgs.gnome3_12"; + example = literalExample "pkgs.gnome3_16"; description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; @@ -109,9 +109,6 @@ in { # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility. - export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ - # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix deleted file mode 100644 index 23a66aba50c5..000000000000 --- a/nixos/tests/gnome3_16.nix +++ /dev/null @@ -1,34 +0,0 @@ -import ./make-test.nix { - name = "gnome3"; - - 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_16; - - 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"); - ''; - -} |