From 3a77187c8a72fe0c9fcf566b853996d01220f1a9 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 19 Jan 2021 13:49:24 +0100
Subject: gnomeExtensions.unite-shell: rename to gnomeExtensions.unite

---
 .../gnome-3/extensions/unite-shell/default.nix     | 39 ----------------------
 pkgs/desktops/gnome-3/extensions/unite/default.nix | 39 ++++++++++++++++++++++
 pkgs/top-level/aliases.nix                         |  3 ++
 pkgs/top-level/all-packages.nix                    |  2 +-
 4 files changed, 43 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/extensions/unite-shell/default.nix
 create mode 100644 pkgs/desktops/gnome-3/extensions/unite/default.nix

(limited to 'pkgs')

diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix
deleted file mode 100644
index 778743071d6f..000000000000
--- a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
-stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-unite-shell";
-  version = "44";
-
-  src = fetchFromGitHub {
-    owner = "hardpixel";
-    repo = "unite-shell";
-    rev = "v${version}";
-    sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g";
-  };
-
-  uuid = "unite@hardpixel.eu";
-
-  nativeBuildInputs = [ glib ];
-
-  buildInputs = [ xprop ];
-
-  buildPhase = ''
-    runHook preBuild
-    glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ rhoriguchi ];
-    homepage = "https://github.com/hardpixel/unite-shell";
-    broken = versionOlder gnome3.gnome-shell.version "3.32";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix
new file mode 100644
index 000000000000..9d58a923740e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-unite";
+  version = "44";
+
+  src = fetchFromGitHub {
+    owner = "hardpixel";
+    repo = "unite-shell";
+    rev = "v${version}";
+    sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g";
+  };
+
+  uuid = "unite@hardpixel.eu";
+
+  nativeBuildInputs = [ glib ];
+
+  buildInputs = [ xprop ];
+
+  buildPhase = ''
+    runHook preBuild
+    glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r ${uuid} $out/share/gnome-shell/extensions
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ rhoriguchi ];
+    homepage = "https://github.com/hardpixel/unite-shell";
+    broken = versionOlder gnome3.gnome-shell.version "3.32";
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d5374158a106..532f42ef5ef4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -730,6 +730,9 @@ mapAliases ({
   youtubeDL = youtube-dl;  # added 2014-10-26
   ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
   zdfmediathk = mediathekview; # added 2019-01-19
+  gnomeExtensions = gnomeExtensions // {
+    unite-shell = gnomeExtensions.unite; # added 2021-01-19
+  };
   gnome_user_docs = gnome-user-docs; # added 2019-11-20
   # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
   spidermonkey = spidermonkey_78; # added 2020-10-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182c6f904545..73793ee675ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27283,7 +27283,7 @@ in
     tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { };
     timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
-    unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { };
+    unite = callPackage ../desktops/gnome-3/extensions/unite { };
     window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
     window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { };
     workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { };
-- 
cgit v1.2.3