From 6fafbb4f27aaee2b402efe7e9849a38b2a76d40a Mon Sep 17 00:00:00 2001 From: dkabot <1316469+dkabot@users.noreply.github.com> Date: Sun, 14 Feb 2021 07:25:00 -0500 Subject: [PATCH 1/2] gnomeExtensions.arc-menu: 47 -> 5 --- .../gnome-3/extensions/arc-menu/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index 58f1836a132a..ed55bb3d058f 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-arc-menu"; - version = "47"; + version = "5"; src = fetchFromGitLab { - owner = "arcmenu-team"; - repo = "Arc-Menu"; - rev = "v${version}-Stable"; - sha256 = "1hhjxdm1sm9pddhkkxx532hqqiv9ghvqgn9xszg1jwhj29380fv6"; + owner = "arcmenu"; + repo = "ArcMenu"; + rev = "v${version}"; + sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3"; }; patches = [ @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - uuid = "arc-menu@linxgem33.com"; + uuid = "arcmenu@arcmenu.com"; meta = with lib; { - description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; + description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow."; license = licenses.gpl2Plus; maintainers = with maintainers; [ dkabot ]; - homepage = "https://gitlab.com/LinxGem33/Arc-Menu"; + homepage = "https://gitlab.com/arcmenu/ArcMenu"; }; } From e1fc0f5e384a6da9e42a4ba701959def22a170ff Mon Sep 17 00:00:00 2001 From: dkabot <1316469+dkabot@users.noreply.github.com> Date: Sun, 14 Feb 2021 07:54:17 -0500 Subject: [PATCH 2/2] gnomeExtensions.arc-menu: rename to gnomeExtensions.arcmenu The upstream has been changed to a different repository with this name. --- .../gnome-3/extensions/{arc-menu => arcmenu}/default.nix | 4 ++-- .../gnome-3/extensions/{arc-menu => arcmenu}/fix_gmenu.patch | 0 pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/desktops/gnome-3/extensions/{arc-menu => arcmenu}/default.nix (89%) rename pkgs/desktops/gnome-3/extensions/{arc-menu => arcmenu}/fix_gmenu.patch (100%) diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix similarity index 89% rename from pkgs/desktops/gnome-3/extensions/arc-menu/default.nix rename to pkgs/desktops/gnome-3/extensions/arcmenu/default.nix index ed55bb3d058f..851a816c61c7 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: stdenv.mkDerivation rec { - pname = "gnome-shell-arc-menu"; + pname = "gnome-shell-arcmenu"; version = "5"; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { uuid = "arcmenu@arcmenu.com"; meta = with lib; { - description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow."; + description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dkabot ]; homepage = "https://gitlab.com/arcmenu/ArcMenu"; diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch rename to pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bef22c21e98c..ab6e3410eb6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27393,7 +27393,7 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; + arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; @@ -27431,6 +27431,7 @@ in mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; } // lib.optionalAttrs (config.allowAliases or false) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 + arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };