gpaste: Move from gnome scope to top-level

Not really a GNOME project.
This commit is contained in:
Jan Tojnar 2024-06-22 15:56:13 +02:00
parent 20d5442d8e
commit 23f2529ffc
12 changed files with 13 additions and 14 deletions

View File

@ -18,12 +18,12 @@
###### implementation ###### implementation
config = lib.mkIf config.programs.gpaste.enable { config = lib.mkIf config.programs.gpaste.enable {
environment.systemPackages = [ pkgs.gnome.gpaste ]; environment.systemPackages = [ pkgs.gpaste ];
services.dbus.packages = [ pkgs.gnome.gpaste ]; services.dbus.packages = [ pkgs.gpaste ];
systemd.packages = [ pkgs.gnome.gpaste ]; systemd.packages = [ pkgs.gpaste ];
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. # 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 # gpaste-reloaded applet doesn't work without the typelib
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
}; };
} }

View File

@ -61,7 +61,7 @@ in {
''; '';
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
example = literalExpression "[ pkgs.gnome.gpaste ]"; example = literalExpression "[ pkgs.gpaste ]";
}; };
extraGSettingsOverrides = mkOption { extraGSettingsOverrides = mkOption {

View File

@ -27,7 +27,7 @@ in
sessionPath = mkOption { sessionPath = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExpression "[ pkgs.gnome.gpaste ]"; example = literalExpression "[ pkgs.gpaste ]";
description = '' description = ''
Additional list of packages to be added to the session search path. Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart. Useful for GSettings-conditional autostart.

View File

@ -114,7 +114,7 @@ in `dconf-editor`
## Shell Extensions {#sec-gnome-shell-extensions} ## Shell Extensions {#sec-gnome-shell-extensions}
Most Shell extensions are packaged under the `gnomeExtensions` attribute. Most Shell extensions are packaged under the `gnomeExtensions` attribute.
Some packages that include Shell extensions, like `gnome.gpaste`, dont have their extension decoupled under this attribute. Some packages that include Shell extensions, like `gpaste`, dont have their extension decoupled under this attribute.
You can install them like any other package: You can install them like any other package:

View File

@ -89,7 +89,7 @@ in
sessionPath = mkOption { sessionPath = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExpression "[ pkgs.gnome.gpaste ]"; example = literalExpression "[ pkgs.gpaste ]";
description = '' description = ''
Additional list of packages to be added to the session search path. Additional list of packages to be added to the session search path.
Useful for GNOME Shell extensions or GSettings-conditional autostart. Useful for GNOME Shell extensions or GSettings-conditional autostart.

View File

@ -44,7 +44,7 @@ in
sessionPath = mkOption { sessionPath = mkOption {
default = []; default = [];
type = types.listOf types.package; type = types.listOf types.package;
example = literalExpression "[ pkgs.gnome.gpaste ]"; example = literalExpression "[ pkgs.gpaste ]";
description = '' description = ''
Additional list of packages to be added to the session search path. Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart. Useful for GSettings-conditional autostart.

View File

@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
}; };
# For the sessionPath subtest. # For the sessionPath subtest.
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
}; };
enableOCR = true; enableOCR = true;

View File

@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ]; environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ];
# For the sessionPath subtest. # For the sessionPath subtest.
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
}; };
enableOCR = true; enableOCR = true;

View File

@ -194,8 +194,6 @@ in
gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gnome-tweaks = callPackage ./misc/gnome-tweaks { };
gpaste = callPackage ./misc/gpaste { };
metacity = callPackage ./misc/metacity { }; metacity = callPackage ./misc/metacity { };
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; 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-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-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. 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. 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 = 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. 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.