gnomeExtensions: rename uuid field to extensionUuid

3 years ago · 6aae2894ef
parent 48db86f42c
commit 6aae2894ef
26 changed files with 46 additions and 45 deletions
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

-  uuid = "EasyScreenCast@iacopodeenosee.gmail.com";
+  passthru.extensionUuid = "EasyScreenCast@iacopodeenosee.gmail.com";

  meta = with lib; {
    description = "Simplifies the use of the video recording function integrated in gnome shell";
--- a/pkgs/desktops/gnome/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  # installing doesn't build an unnecessary release.
  dontBuild = true;

-  uuid = "appindicatorsupport@rgcjonas.gmail.com";
+  passthru.extensionUuid = "appindicatorsupport@rgcjonas.gmail.com";
  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions/${uuid}
--- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix
+++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ];

-  uuid = "arcmenu@arcmenu.com";
+  passthru.extensionUuid = "arcmenu@arcmenu.com";

  meta = with lib; {
    description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow";
--- a/pkgs/desktops/gnome/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs";
  };

-  uuid = "caffeine@patapon.info";
+  passthru.extensionUuid = "caffeine@patapon.info";

  nativeBuildInputs = [
    glib gettext
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "caffeine@patapon.info" $out/share/gnome-shell/extensions
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/clock-override/default.nix
+++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    stripRoot = false;
  };

-  uuid = "clock-override@gnomeshell.kryogenix.org";
+  passthru.extensionUuid = "clock-override@gnomeshell.kryogenix.org";

  nativeBuildInputs = [ gettext glib ];

@ -22,8 +22,8 @@ stdenv.mkDerivation rec {

  installPhase = ''
    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions/${uuid}
-    cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid}
+    mkdir -p "$out/share/gnome-shell/extensions/clock-override@gnomeshell.kryogenix.org"
+    cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} "$out/share/gnome-shell/extensions/clock-override@gnomeshell.kryogenix.org"
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
  ];

-  uuid = "dash-to-dock@micxgx.gmail.com";
+  passthru.extensionUuid = "dash-to-dock@micxgx.gmail.com";

  meta = with lib; {
    description = "A dock for the Gnome Shell";
--- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

-  uuid = "dash-to-panel@jderose9.github.com";
+  passthru.extensionUuid = "dash-to-panel@jderose9.github.com";

  meta = with lib; {
    description = "An icon taskbar for Gnome Shell";
--- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix
+++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i";
  };

-  uuid = "drop-down-terminal@gs-extensions.zzrough.org";
+  passthru.extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org";

  patches = [
    (substituteAll {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions/
+    cp -r "drop-down-terminal@gs-extensions.zzrough.org" $out/share/gnome-shell/extensions/
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix
+++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
  };

  uuid = "dynamic-panel-transparency@rockon999.github.io";
+  passthru.extensionUuid = uuid;

  nativeBuildInputs = [ glib ];

--- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix
+++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix
@ -11,20 +11,20 @@ stdenv.mkDerivation rec {
    sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb";
  };

-  uuid = "emoji-selector@maestroschan.fr";
+  passthru.extensionUuid = "emoji-selector@maestroschan.fr";

  nativeBuildInputs = [ glib ];

  buildPhase = ''
    runHook preBuild
-    glib-compile-schemas ./${uuid}/schemas
+    glib-compile-schemas "./emoji-selector@maestroschan.fr/schemas"
    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "emoji-selector@maestroschan.fr" $out/share/gnome-shell/extensions
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/freon/default.nix
+++ b/pkgs/desktops/gnome/extensions/freon/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  pname = "gnome-shell-extension-freon";
  version = "44";

-  uuid = "freon@UshakovVasilii_Github.yahoo.com";
+  passthru.extensionUuid = "freon@UshakovVasilii_Github.yahoo.com";

  src = fetchFromGitHub {
    owner = "UshakovVasilii";
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {

  buildPhase = ''
    runHook preBuild
-    glib-compile-schemas --strict --targetdir=${uuid}/schemas ${uuid}/schemas
+    glib-compile-schemas --strict --targetdir="freon@UshakovVasilii_Github.yahoo.com/schemas" "freon@UshakovVasilii_Github.yahoo.com/schemas"
    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "freon@UshakovVasilii_Github.yahoo.com" $out/share/gnome-shell/extensions
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
+++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a";
  };

-  uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com";
+  passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com";

  nativeBuildInputs = [ glib ];

--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
    done
  '';

-  uuid = "gsconnect@andyholmes.github.io";
+  passthru.extensionUuid = "gsconnect@andyholmes.github.io";

  passthru = {
    tests = {
--- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
    sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks";
  };

-  uuid = "icon-hider@kalnitsky.org";
+  passthru.extensionUuid = "icon-hider@kalnitsky.org";

  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "icon-hider@kalnitsky.org" $out/share/gnome-shell/extensions
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/impatience/default.nix
+++ b/pkgs/desktops/gnome/extensions/impatience/default.nix
@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r impatience $out/share/gnome-shell/extensions/${uuid}
+    cp -r impatience "$out/share/gnome-shell/extensions/impatience@gfxmonk.net"
    runHook postInstall
  '';

-  uuid = "impatience@gfxmonk.net";
+  passthru.extensionUuid = "impatience@gfxmonk.net";

  meta = with lib; {
    description = "Speed up builtin gnome-shell animations";
--- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
+++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ unzip ];
  buildInputs = [ glib gnome.gnome-shell ];

-  uuid = "nightthemeswitcher@romainvigier.fr";
+  passthru.extensionUuid = "nightthemeswitcher@romainvigier.fr";

  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions/
-    unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid}
+    unzip "build/nightthemeswitcher@romainvigier.fr.shell-extension.zip" -d "$out/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr"
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

-  uuid = "no-title-bar@jonaspoehler.de";
+  passthru.extensionUuid = "no-title-bar@jonaspoehler.de";

  meta = with lib; {
    description = "Integrates maximized windows with the top panel";
--- a/pkgs/desktops/gnome/extensions/paperwm/default.nix
+++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix
@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
    sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs";
  };

-  uuid = "paperwm@hedning:matrix.org";
+  passthru.extensionUuid = "paperwm@hedning:matrix.org";

  dontBuild = true;

  installPhase = ''
    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions/${uuid}
-    cp -r . $out/share/gnome-shell/extensions/${uuid}
+    mkdir -p "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org"
+    cp -r . "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org"
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  uuid = "pidgin@muffinmad";
+  passthru.extensionUuid = "pidgin@muffinmad";

  meta = with lib; {
    homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension";
--- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

  dontBuild = true;

-  uuid = "sound-output-device-chooser@kgshank.net";
+  passthru.extensionUuid = "sound-output-device-chooser@kgshank.net";

  makeFlags = [
    "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions"
--- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
@ -28,18 +28,18 @@ stdenv.mkDerivation rec {

  buildPhase = ''
    runHook preBuild
-    glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+    glib-compile-schemas --targetdir="system-monitor@paradoxxx.zero.gmail.com/schemas" "system-monitor@paradoxxx.zero.gmail.com/schemas"
    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "system-monitor@paradoxxx.zero.gmail.com" $out/share/gnome-shell/extensions
    runHook postInstall
  '';

-  uuid = "system-monitor@paradoxxx.zero.gmail.com";
+  passthru.extensionUuid = "system-monitor@paradoxxx.zero.gmail.com";

  meta = with lib; {
    description = "Display system informations in gnome shell status bar";
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    taskwarrior
  ];

-  uuid = "taskwhisperer-extension@infinicode.de";
+  passthru.extensionUuid = "taskwhisperer-extension@infinicode.de";

  makeFlags = [
    "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
--- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix
+++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix
@ -21,12 +21,12 @@ stdenv.mkDerivation rec {

  installPhase = ''
    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions/${uuid}
-    cp -r * $out/share/gnome-shell/extensions/${uuid}/
+    mkdir -p "$out/share/gnome-shell/extensions/tilingnome@rliang.github.com"
+    cp -r * "$out/share/gnome-shell/extensions/tilingnome@rliang.github.com/"
    runHook postInstall
  '';

-  uuid = "tilingnome@rliang.github.com";
+  passthru.extensionUuid = "tilingnome@rliang.github.com";

  meta = with lib; {
    description = "Tiling window management for GNOME Shell";
--- a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];

-  uuid = "TopIcons@phocean.net";
+  passthru.extensionUuid = "TopIcons@phocean.net";

  meta = with lib; {
    description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround";
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8=";
  };

-  uuid = "unite@hardpixel.eu";
+  passthru.extensionUuid = "unite@hardpixel.eu";

  nativeBuildInputs = [ glib ];

@ -19,14 +19,14 @@ stdenv.mkDerivation rec {

  buildPhase = ''
    runHook preBuild
-    glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas
+    glib-compile-schemas --strict --targetdir="unite@hardpixel.eu/schemas/" "unite@hardpixel.eu/schemas"
    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "unite@hardpixel.eu" $out/share/gnome-shell/extensions
    runHook postInstall
  '';

--- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
+++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {

  dontBuild = true;

-  uuid = "window-corner-preview@fabiomereu.it";
+  passthru.extensionUuid = "window-corner-preview@fabiomereu.it";
  installPhase = ''
    runHook preInstall
    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions
+    cp -r "window-corner-preview@fabiomereu.it" $out/share/gnome-shell/extensions
    runHook postInstall
  '';