From 5a245c24b0188c6fff933497545f6e84d9b024c0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 10 Jul 2016 16:17:20 +0200
Subject: [PATCH] gnome3: make 3.20 the default

---
 nixos/tests/{gnome3_20-gdm.nix => gnome3_18-gdm.nix} | 0
 nixos/tests/{gnome3_20.nix => gnome3_18.nix}         | 2 +-
 pkgs/top-level/all-packages.nix                      | 9 +--------
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename nixos/tests/{gnome3_20-gdm.nix => gnome3_18-gdm.nix} (100%)
 rename nixos/tests/{gnome3_20.nix => gnome3_18.nix} (95%)

diff --git a/nixos/tests/gnome3_20-gdm.nix b/nixos/tests/gnome3_18-gdm.nix
similarity index 100%
rename from nixos/tests/gnome3_20-gdm.nix
rename to nixos/tests/gnome3_18-gdm.nix
diff --git a/nixos/tests/gnome3_20.nix b/nixos/tests/gnome3_18.nix
similarity index 95%
rename from nixos/tests/gnome3_20.nix
rename to nixos/tests/gnome3_18.nix
index 51c83a4e3129..2c88e6abe890 100644
--- a/nixos/tests/gnome3_20.nix
+++ b/nixos/tests/gnome3_18.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       services.xserver.displayManager.auto.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
 
-      environment.gnome3.packageSet = pkgs.gnome3_20;
+      environment.gnome3.packageSet = pkgs.gnome3_18;
 
       virtualisation.memorySize = 512;
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7c8549faf88..d63b8caa42a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15812,14 +15812,7 @@ in
   gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { });
   gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { });
 
-  gnome3 = self.gnome3_18 // {
-    shellExtensions = {
-      impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix {};
-      system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor.nix {};
-      volume-mixer = callPackage ../desktops/gnome-3/extensions/volume-mixer.nix {};
-      workspace-grid = callPackage ../desktops/gnome-3/extensions/workspace-grid.nix {};
-    };
-  };
+  gnome3 = self.gnome3_20;
 
   gnome = recurseIntoAttrs self.gnome2;