nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 01:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-terminal: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-06-13 23:21:27 +02:00
parent 98c35c10ff
commit b91d4ead2a
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/programs/gnome-terminal.nix
View File

@ -19,9 +19,9 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome.gnome-terminal ]; environment.systemPackages = [ pkgs.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome.gnome-terminal ]; services.dbus.packages = [ pkgs.gnome-terminal ];
systemd.packages = [ pkgs.gnome.gnome-terminal ]; systemd.packages = [ pkgs.gnome-terminal ];
programs.bash.vteIntegration = true; programs.bash.vteIntegration = true;
programs.zsh.vteIntegration = true; programs.zsh.vteIntegration = true;

2
nixos/modules/services/x11/desktop-managers/budgie.nix
View File

@ -162,7 +162,7 @@ in {
++ cfg.sessionPath; ++ cfg.sessionPath;
# Both budgie-desktop-view and nemo defaults to this emulator. # Both budgie-desktop-view and nemo defaults to this emulator.
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
# Fonts. # Fonts.
fonts.packages = [ fonts.packages = [

2
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -230,7 +230,7 @@ in
(mkIf serviceCfg.apps.enable { (mkIf serviceCfg.apps.enable {
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility); programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [

2
nixos/tests/terminal-emulators.nix
View File

@ -42,7 +42,7 @@ let tests = {
germinal.pkg = p: p.germinal; germinal.pkg = p: p.germinal;
gnome-terminal.pkg = p: p.gnome.gnome-terminal; gnome-terminal.pkg = p: p.gnome-terminal;
guake.pkg = p: p.guake; guake.pkg = p: p.guake;
guake.cmd = "SHELL=$command guake --show"; guake.cmd = "SHELL=$command guake --show";

0
pkgs/desktops/gnome/core/gnome-terminal/default.nix → pkgs/by-name/gn/gnome-terminal/package.nix
View File

4
pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
View File

@ -2,7 +2,7 @@
, runCommand , runCommand
, nixos-artwork , nixos-artwork
, glib , glib
, gnome , gnome-terminal
, gtk3 , gtk3
, gsettings-desktop-schemas , gsettings-desktop-schemas
, extraGSettingsOverrides ? "" , extraGSettingsOverrides ? ""
@ -36,7 +36,7 @@ let
cinnamon-session cinnamon-session
cinnamon-settings-daemon cinnamon-settings-daemon
cinnamon-common cinnamon-common
gnome.gnome-terminal gnome-terminal
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
] ++ extraGSettingsOverridePackages; ] ++ extraGSettingsOverridePackages;

3
pkgs/desktops/gnome/default.nix
View File

@ -81,8 +81,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
gnome-terminal = callPackage ./core/gnome-terminal { };
gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; gnome-themes-extra = callPackage ./core/gnome-themes-extra { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };
@ -254,6 +252,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27
gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # 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.
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.