Merge pull request #261196 Revert "gnomeExtensions: Update for GNOME 45"

pkgs/desktops/gnome/extensions/collisions.json

@@ -343,11 +343,5 @@
       "batime@martin.zurowietz.de",
       "batterytime@typeof.pw"
     ]
-  },
-  "45": {
-    "applications-menu": [
-      "apps-menu@gnome-shell-extensions.gcampax.github.com",
-      "Applications_Menu@rmy.pobox.com"
-    ]
   }
 }

pkgs/desktops/gnome/extensions/default.nix

@@ -62,10 +62,9 @@ in rec {
   gnome42Extensions = mapUuidNames (produceExtensionsList "42");
   gnome43Extensions = mapUuidNames (produceExtensionsList "43");
   gnome44Extensions = mapUuidNames (produceExtensionsList "44");
-  gnome45Extensions = mapUuidNames (produceExtensionsList "45");
 
   # Keep the last three versions in here
-  gnomeExtensions = lib.trivial.pipe (gnome43Extensions // gnome44Extensions // gnome45Extensions) [
+  gnomeExtensions = lib.trivial.pipe (gnome42Extensions // gnome43Extensions // gnome44Extensions) [
     # Apply some custom patches for automatically packaged extensions
     (callPackage ./extensionOverrides.nix {})
     # Add all manually packaged extensions

pkgs/desktops/gnome/extensions/extensionRenames.nix

@@ -6,17 +6,12 @@
 # - Make a separate section for each GNOME version. Collisions will come back eventually
 #   as the extensions are updated.
 {
-  # ####### GNOME 45 #######
+
+  # ####### GNOME 44 #######
 
   "apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
   "Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
 
-  # ############################################################################
-  # These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
-  # Make sure to move them up once they are updated
-
-  # ####### GNOME 44 #######
-
   "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
   "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
 
@@ -35,6 +30,10 @@
   "batime@martin.zurowietz.de" = "battery-time";
   "batterytime@typeof.pw" = "battery-time-2";
 
+  # ############################################################################
+  # These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
+  # Make sure to move them up once they are updated
+
   # ####### GNOME 43 #######
 
   "lockkeys@vaina.lt" = "lock-keys";

pkgs/desktops/gnome/extensions/update-extensions.py

@@ -20,7 +20,6 @@ supported_versions = {
     "42": "42",
     "43": "43",
     "44": "44",
-    "45": "45",
 }
 
 # Some type alias to increase readability of complex compound types

pkgs/top-level/all-packages.nix

@@ -38673,7 +38673,6 @@ with pkgs;
     gnome42Extensions
     gnome43Extensions
     gnome44Extensions
-    gnome45Extensions
   ;
 
   gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { };