From 8f2d3208b88a25641ecdda861462823de73fec8a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 21:13:31 -0300 Subject: [PATCH 01/29] xfce4-icon-theme: reorder file A small modification to standardize the directory structure of XFCE expressions. --- .../art/{xfce4-icon-theme.nix => xfce4-icon-theme/default.nix} | 0 pkgs/desktops/xfce/default.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/art/{xfce4-icon-theme.nix => xfce4-icon-theme/default.nix} (100%) diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix similarity index 100% rename from pkgs/desktops/xfce/art/xfce4-icon-theme.nix rename to pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 3d88cbd92229..a12523765ad4 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -96,7 +96,7 @@ lib.makeScope pkgs.newScope (self: with self; { #### ART - xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { }; + xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; xfwm4-themes = callPackage ./art/xfwm4-themes.nix { }; From e1dd2a9ff11c658b82d013186ef18bc59f3c0b6b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 21:53:00 -0300 Subject: [PATCH 02/29] xfwm4-themes: reorder --- .../xfce/art/{xfwm4-themes.nix => xfwm4-themes/default.nix} | 0 pkgs/desktops/xfce/default.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/art/{xfwm4-themes.nix => xfwm4-themes/default.nix} (100%) diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix similarity index 100% rename from pkgs/desktops/xfce/art/xfwm4-themes.nix rename to pkgs/desktops/xfce/art/xfwm4-themes/default.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index a12523765ad4..183807d68b77 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -98,7 +98,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; - xfwm4-themes = callPackage ./art/xfwm4-themes.nix { }; + xfwm4-themes = callPackage ./art/xfwm4-themes { }; #### PANEL PLUGINS From 85d7cbb4854f51ba83e72f7b9b173e9b8758daf6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 22:18:28 -0300 Subject: [PATCH 03/29] xfce4-cpugraph-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-cpugraph-plugin.nix => xfce4-cpugraph-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 183807d68b77..cba9718675b5 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -110,7 +110,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { }; - xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; + xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { }; xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix From ab06afe57ac751e554798ee156f3baf83d64ac6f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 22:26:06 -0300 Subject: [PATCH 04/29] xfce4-dockbarx-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-dockbarx-plugin.nix => xfce4-dockbarx-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index cba9718675b5..b98fe8adc8e3 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -114,7 +114,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; + xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix From 1e586af4b150f912e21ce1acd5032a8acab2bf9a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 22:29:10 -0300 Subject: [PATCH 05/29] xfce4-embed-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../{xfce4-embed-plugin.nix => xfce4-embed-plugin/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-embed-plugin.nix => xfce4-embed-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index b98fe8adc8e3..f9ce5a8cb337 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -116,7 +116,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; + xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix From f8955d59bfb303f488385404c9db983489bc8383 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 22:32:18 -0300 Subject: [PATCH 06/29] xfce4-eyes-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../{xfce4-eyes-plugin.nix => xfce4-eyes-plugin/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-eyes-plugin.nix => xfce4-eyes-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f9ce5a8cb337..1b4f1c52a4da 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -118,7 +118,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; + xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix From 63d5a1adcc4cef5f3b2febc18fa3b29f311da699 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 22:39:43 -0300 Subject: [PATCH 07/29] xfce4-fsguard-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-fsguard-plugin.nix => xfce4-fsguard-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 1b4f1c52a4da..172329cbe4fc 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -120,7 +120,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; - xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; + xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix From 94c5d879ae1898d3a8f3308bd235f08fa16ea8ba Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 22:40:29 -0300 Subject: [PATCH 08/29] xfce4-genmon-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-genmon-plugin.nix => xfce4-genmon-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 172329cbe4fc..5a6019609379 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -122,7 +122,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; - xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix From 525975e2a18b72bef25628349835cab472fa2392 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:03:23 -0300 Subject: [PATCH 09/29] xfce4-hardware-monitor-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-hardware-monitor-plugin.nix => xfce4-hardware-monitor-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 5a6019609379..4b8bf4db2e17 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -124,7 +124,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; - xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix From e6396dc230127c266f21c17bae1203644119824f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:05:56 -0300 Subject: [PATCH 10/29] xfce4-i3-workspaces-plugin.nix: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-i3-workspaces-plugin.nix => xfce4-i3-workspaces-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 4b8bf4db2e17..a9f45d9fcb6f 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -126,7 +126,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; - xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin.nix { }; + xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix From a77768f8077377205deccd4b6b327829dcb95879 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:07:03 -0300 Subject: [PATCH 11/29] xfce4-mailwatch-plugin.nix: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-mailwatch-plugin.nix => xfce4-mailwatch-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index a9f45d9fcb6f..65ebbc812961 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -128,7 +128,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; - xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix From ac99266415ceb1760dc6c6afe66927397ff2baf6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:11:30 -0300 Subject: [PATCH 12/29] xfce4-mpc-plugin.nix: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../{xfce4-mpc-plugin.nix => xfce4-mpc-plugin/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-mpc-plugin.nix => xfce4-mpc-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 65ebbc812961..18f2df93a734 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -136,7 +136,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; - xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { }; + xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix From 3d51ede8b2d009ab04f22a45338b605dbf9cc6f9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:15:16 -0300 Subject: [PATCH 13/29] xfce4-notes-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../{xfce4-notes-plugin.nix => xfce4-notes-plugin/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-notes-plugin.nix => xfce4-notes-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 18f2df93a734..0a2970728739 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -132,7 +132,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; - xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; + xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix From 0f6a865dd9fac8014327ca22b5fc54b11701b646 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:25:12 -0300 Subject: [PATCH 14/29] xfce4-systemload-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-systemload-plugin.nix => xfce4-systemload-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 0a2970728739..3e28163a55d4 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -140,7 +140,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; - xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix From 7f49ba11d8dcdd52896f28bea65367b9dfe0f79b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:26:16 -0300 Subject: [PATCH 15/29] xfce4-windowck-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-windowck-plugin.nix => xfce4-windowck-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 3e28163a55d4..ffa4f6310412 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -152,7 +152,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; - xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { }; + xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { }; xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix From a75a5c403fc1a1a349bdd45afce4583ceca7fa51 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:27:42 -0300 Subject: [PATCH 16/29] xfce4-weather-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-weather-plugin.nix => xfce4-weather-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index ffa4f6310412..fcb965303eb1 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -148,7 +148,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; - xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { }; xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix From 9fc7c3391a039c17e53f950d8b637d0cd5e04704 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:29:58 -0300 Subject: [PATCH 17/29] xfce4-timer-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../{xfce4-timer-plugin.nix => xfce4-timer-plugin/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-timer-plugin.nix => xfce4-timer-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index fcb965303eb1..c5309db26010 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -142,7 +142,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; - xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { }; + xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix From 95c9001cadb0fa124fe131f7caf680b8ade61715 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:31:19 -0300 Subject: [PATCH 18/29] xfce4-sensors-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- .../default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-sensors-plugin.nix => xfce4-sensors-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index c5309db26010..215e5ed7bc49 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -138,7 +138,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { }; xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix From 54269736bea3033d3c4afd795d2825d89ab7cf8d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:34:50 -0300 Subject: [PATCH 19/29] xfce4-namebar-plugin: reorder --- .../default.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/desktops/xfce/panel-plugins/{xfce4-namebar-plugin.nix => xfce4-namebar-plugin/default.nix} (100%) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix similarity index 100% rename from pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix rename to pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix From b57e63b788cd99aa45f4355f756b41721e61c731 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 30 Jan 2021 23:37:09 -0300 Subject: [PATCH 20/29] xfce4-mailwatch-plugin: reorder --- pkgs/desktops/xfce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 215e5ed7bc49..de8ae12b8952 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -134,7 +134,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; - xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; + xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { }; xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; From b831e09bf4df951429e8abfcff522e2dd099a464 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:29:02 -0300 Subject: [PATCH 21/29] xfce4-cpugraph-plugin: 1.1.0 -> 1.2.1 --- .../xfce4-cpugraph-plugin/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index aed655eb2bd2..e80d0bbc9ac7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, glib +, exo +, libXtst +, xorgproto +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, hicolor-icon-theme +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; + sha256 = "YVrfmr2RQXpEMZ2OTa3GAS+iKjd48vN5cXUS3Lfvkko="; }; nativeBuildInputs = [ @@ -42,6 +56,6 @@ stdenv.mkDerivation rec { description = "CPU graph show for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From e1adcd80d58474125dff2de00f3b12447467bfc0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:32:05 -0300 Subject: [PATCH 22/29] xfce4-fsguard-plugin: 1.1.1 -> 1.1.2 --- .../xfce4-fsguard-plugin/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 95f93148a912..36cca7b73954 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-fsguard-plugin"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; + sha256 = "Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU="; }; nativeBuildInputs = [ @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { description = "Filesystem usage monitor plugin for the Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From aaa6db17307e690891397e9ede8a70136b0f6b58 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:32:43 -0300 Subject: [PATCH 23/29] xfce4-genmon-plugin: 4.0.2 -> 4.1.1 --- .../xfce4-genmon-plugin/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 59796ad55b14..8289be333100 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-genmon-plugin"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; + sha256 = "shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU="; }; nativeBuildInputs = [ @@ -36,6 +44,6 @@ stdenv.mkDerivation rec { description = "Generic monitor plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From dc5efe63fd4639316fb5ad0649efcb635fbe68d3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:36:58 -0300 Subject: [PATCH 24/29] xfce4-notes-plugin: 1.8.1 -> 1.9.0 --- .../xfce4-notes-plugin/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 09ff309c05fc..7442e30ed69f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk2 +, libunique +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-notes-plugin"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; + sha256 = "E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg="; }; nativeBuildInputs = [ @@ -40,6 +51,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From 47e82e173347ce2d80ee582a309a71b4a060e621 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:37:31 -0300 Subject: [PATCH 25/29] xfce4-systemload-plugin: 1.2.3 -> 1.2.4 --- .../xfce4-systemload-plugin/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index a313510fded5..13bce97fe33f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; + sha256 = "BTG435I8ujvo0GTLi2OLlU33SRXlpEciiZlReEd4mDU="; }; nativeBuildInputs = [ @@ -36,6 +44,6 @@ stdenv.mkDerivation rec { description = "System load plugin for Xfce panel"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From 29234c4378938a8691f3abdc75171a39023eccca Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:37:58 -0300 Subject: [PATCH 26/29] xfce4-verve-plugin: 2.0.0 -> 2.0.1 --- .../xfce4-verve-plugin/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 5a98173ea00c..94b467fd6828 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,18 +1,26 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, libxfce4ui +, pcre +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-verve-plugin"; - version = "2.0.0"; + version = "2.0.1"; rev-prefix = ""; - sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz"; + sha256 = "YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M="; buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; hardeningDisable = [ "format" ]; - meta = { + meta = with lib; { description = "A command-line plugin"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; }; } From 272e31c31085075e3e6f178764d5be81d3b51fa7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:38:28 -0300 Subject: [PATCH 27/29] xfce4-xkb-plugin: 0.8.1 -> 0.8.2 --- .../xfce4-xkb-plugin/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index a08621594890..35bc5ea8284e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,16 +1,37 @@ -{ lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, gtk3 +, librsvg +, libwnck3 +, libxklavier +, garcon +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; - version = "0.8.1"; + version = "0.8.2"; rev-prefix = ""; - sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky"; + sha256 = "xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg="; - buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ]; + buildInputs = [ + garcon + gtk3 + librsvg + libxfce4ui + libxfce4util + libxklavier + libwnck3 + xfce4-panel + xfconf + ]; meta = with lib; { description = "Allows you to setup and use multiple keyboard layouts"; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From fa2ba895133c0c326d77d91c048c6c32f5e92f67 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:30:53 -0300 Subject: [PATCH 28/29] xfce4-eyes-plugin: removing myself from maintainers list --- .../xfce4-eyes-plugin/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 8df173d3367f..d19f0051d432 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -1,10 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, xfconf +, gtk3 +, xfce +}: let category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; version = "4.5.1"; @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; } From 1a1fc977f788d21607735cc1cdfb9bde2d8dde00 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Jan 2021 01:30:07 -0300 Subject: [PATCH 29/29] xfce4-embed-plugin: removing myself from maintainers list --- .../xfce4-embed-plugin/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index a731c9fcbb53..cf383f840d5c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -1,11 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, libxfce4util +, xfce4-panel +, libxfce4ui +, gtk2 +, xfce +}: let category = "panel-plugins"; -in - -with lib; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "xfce4-embed-plugin"; version = "1.6.0"; @@ -32,11 +39,11 @@ stdenv.mkDerivation rec { versionLister = xfce.archiveLister category pname; }; - meta = { + meta = with lib;{ homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; description = "Embed arbitrary app windows on Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ ]; }; }