From d2039913a6a2cd79478cffbf8862ec4854d890bd Mon Sep 17 00:00:00 2001 From: Roman Firment Date: Fri, 1 May 2020 03:26:36 +0200 Subject: [PATCH] gnomeExtensions: refactor pnames and derivations headers --- pkgs/desktops/gnome-3/extensions/arc-menu/default.nix | 2 +- pkgs/desktops/gnome-3/extensions/caffeine/default.nix | 4 ++-- .../gnome-3/extensions/chrome-gnome-shell/default.nix | 3 ++- .../gnome-3/extensions/dash-to-dock/default.nix | 10 +++------- .../gnome-3/extensions/dash-to-panel/default.nix | 2 +- pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 5 +++-- .../desktops/gnome-3/extensions/impatience/default.nix | 2 +- .../extensions/mpris-indicator-button/default.nix | 9 +++------ .../extensions/sound-output-device-chooser/default.nix | 7 +------ .../gnome-3/extensions/system-monitor/default.nix | 2 +- .../desktops/gnome-3/extensions/tilingnome/default.nix | 2 +- 11 files changed, 19 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index db1741e72bb56..ad9550c901d9e 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: stdenv.mkDerivation rec { - pname = "gnome-shell-arc-menu"; + pname = "gnome-shell-extension-arc-menu"; version = "43"; src = fetchFromGitLab { diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 608d44a2892fd..6fb017aabf882 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-caffeine-unstable"; - version = "2020-03-13"; + pname = "gnome-shell-extension-caffeine"; + version = "unstable-2020-03-13"; src = fetchFromGitHub { owner = "eonpatapon"; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 1e3815705cd38..b9bf562696443 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: +{ stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook }: let version = "10.1"; inherit (python3.pkgs) python pygobject3 requests; + in stdenv.mkDerivation rec { pname = "chrome-gnome-shell"; inherit version; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 3784f10990012..128cac91fb967 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,12 +1,8 @@ -{ stdenv -, fetchFromGitHub -, glib -, gettext -}: +{ stdenv , fetchFromGitHub , glib , gettext }: stdenv.mkDerivation rec { - pname = "gnome-shell-dash-to-dock-unstable"; - version = "2020-04-20"; + pname = "gnome-shell-extension-dash-to-dock"; + version = "unstable-2020-04-20"; src = fetchFromGitHub { owner = "micheleg"; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 84662505a374b..5086bd068beed 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - pname = "gnome-shell-dash-to-panel"; + pname = "gnome-shell-extension-dash-to-panel"; version = "31"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index baaca39a4c4f0..54c49bd3b7b99 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound , meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook -, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }: +, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs +}: stdenv.mkDerivation rec { - pname = "gnome-shell-gsconnect"; + pname = "gnome-shell-extension-gsconnect"; version = "35"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix index 230498f5d7bc1..d18d6f84c66ab 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - pname = "gnome-shell-impatience"; + pname = "gnome-shell-extension-impatience"; version = "unstable-2019-09-23"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix index c16f7bc420909..cc55d70af3b01 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix @@ -1,11 +1,8 @@ -{ stdenv -, fetchFromGitHub -, gnome3 -}: +{ stdenv , fetchFromGitHub , gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-mpris-indicator-button-unstable"; - version = "2020-03-21"; + pname = "gnome-shell-extension-mpris-indicator-button"; + version = "unstable-2020-03-21"; src = fetchFromGitHub { owner = "JasonLG1979"; diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index 6fa1840bbb177..dbb4e0291e4a5 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -1,9 +1,4 @@ -{ stdenv -, substituteAll -, fetchFromGitHub -, libpulseaudio -, python3 -}: +{ stdenv , substituteAll , fetchFromGitHub , libpulseaudio , python3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 489a4c5587fa6..2cf776d45fbe0 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-system-monitor"; + pname = "gnome-shell-extension-system-monitor"; version = "38"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index 60ca1dcbef379..60cc3ab5613c4 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, glib, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-tilingnome-unstable"; + pname = "gnome-shell-extension-tilingnome"; version = "unstable-2019-09-19"; src = fetchFromGitHub {