From 23f2529ffc0d880f86a9e045e47de6948200c276 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 22 Jun 2024 15:56:13 +0200 Subject: [PATCH] gpaste: Move from gnome scope to top-level Not really a GNOME project. --- nixos/modules/programs/gpaste.nix | 10 +++++----- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- .../modules/services/x11/desktop-managers/cinnamon.nix | 2 +- nixos/modules/services/x11/desktop-managers/gnome.md | 2 +- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../modules/services/x11/desktop-managers/pantheon.nix | 2 +- nixos/tests/cinnamon-wayland.nix | 2 +- nixos/tests/cinnamon.nix | 2 +- .../gnome/misc => by-name/gp}/gpaste/fix-paths.patch | 0 .../default.nix => by-name/gp/gpaste/package.nix} | 0 .../gnome/misc => by-name/gp}/gpaste/wrapper.js | 0 pkgs/desktops/gnome/default.nix | 3 +-- 12 files changed, 13 insertions(+), 14 deletions(-) rename pkgs/{desktops/gnome/misc => by-name/gp}/gpaste/fix-paths.patch (100%) rename pkgs/{desktops/gnome/misc/gpaste/default.nix => by-name/gp/gpaste/package.nix} (100%) rename pkgs/{desktops/gnome/misc => by-name/gp}/gpaste/wrapper.js (100%) diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 32b81434bdd9..f0c3baf10da0 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -18,12 +18,12 @@ ###### implementation config = lib.mkIf config.programs.gpaste.enable { - environment.systemPackages = [ pkgs.gnome.gpaste ]; - services.dbus.packages = [ pkgs.gnome.gpaste ]; - systemd.packages = [ pkgs.gnome.gpaste ]; + environment.systemPackages = [ pkgs.gpaste ]; + services.dbus.packages = [ pkgs.gpaste ]; + systemd.packages = [ pkgs.gpaste ]; # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. - services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ]; # gpaste-reloaded applet doesn't work without the typelib - services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 5e81b5ef8411..7f43a939970b 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -61,7 +61,7 @@ in { ''; type = types.listOf types.package; default = []; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; }; extraGSettingsOverrides = mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a361b907613c..b9f1384c1aa3 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -27,7 +27,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index 2b4bd06df04f..9943f138dc60 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -114,7 +114,7 @@ in `dconf-editor` ## Shell Extensions {#sec-gnome-shell-extensions} Most Shell extensions are packaged under the `gnomeExtensions` attribute. -Some packages that include Shell extensions, like `gnome.gpaste`, don’t have their extension decoupled under this attribute. +Some packages that include Shell extensions, like `gpaste`, don’t have their extension decoupled under this attribute. You can install them like any other package: diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 0de8147cf22a..861a32f01975 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -89,7 +89,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GNOME Shell extensions or GSettings-conditional autostart. diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 42038d6439e1..263cda2d2b7a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -44,7 +44,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExpression "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index 19529d820d9c..cba0c9f60e8d 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; # For the sessionPath subtest. - services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; enableOCR = true; diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index 694308152149..57300c3e4b16 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ]; # For the sessionPath subtest. - services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; + services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ]; }; enableOCR = true; diff --git a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/pkgs/by-name/gp/gpaste/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/misc/gpaste/fix-paths.patch rename to pkgs/by-name/gp/gpaste/fix-paths.patch diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/by-name/gp/gpaste/package.nix similarity index 100% rename from pkgs/desktops/gnome/misc/gpaste/default.nix rename to pkgs/by-name/gp/gpaste/package.nix diff --git a/pkgs/desktops/gnome/misc/gpaste/wrapper.js b/pkgs/by-name/gp/gpaste/wrapper.js similarity index 100% rename from pkgs/desktops/gnome/misc/gpaste/wrapper.js rename to pkgs/by-name/gp/gpaste/wrapper.js diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index f67f239c5506..9c340550a54b 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -194,8 +194,6 @@ in gnome-tweaks = callPackage ./misc/gnome-tweaks { }; - gpaste = callPackage ./misc/gpaste { }; - metacity = callPackage ./misc/metacity { }; gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; @@ -228,6 +226,7 @@ in gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. + gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.