Skip to content

Commit 0f56e32

Browse files
jtojnarjtojnar
authored
Merge pull request #319659 from jtojnar/gnome-extract
Move various packages out of gnome scope
2 parents c9073df + 2413b51 commit 0f56e32

File tree

263 files changed

+609
-678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+609
-678
lines changed

‎doc/languages-frameworks/gnome.section.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs`
143143

144144
## Updating GNOME packages {#ssec-gnome-updating}
145145

146-
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed.
146+
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed.
147147

148148
## Frequently encountered issues {#ssec-gnome-common-issues}
149149

‎maintainers/scripts/update.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ let
158158
to run all update scripts for all packages that lists \`garbas\` as a maintainer
159159
and have \`updateScript\` defined, or:
160160
161-
% nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus
161+
% nix-shell maintainers/scripts/update.nix --argstr package nautilus
162162
163163
to run update script for specific package, or
164164

‎nixos/modules/programs/file-roller.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ in {
1414

1515
enable = lib.mkEnableOption "File Roller, an archive manager for GNOME";
1616

17-
package = lib.mkPackageOption pkgs [ "gnome" "file-roller" ] { };
17+
package = lib.mkPackageOption pkgs "file-roller" { };
1818

1919
};
2020

‎nixos/modules/programs/geary.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ in {
1313
};
1414

1515
config = lib.mkIf cfg.enable {
16-
environment.systemPackages = [ pkgs.gnome.geary ];
16+
environment.systemPackages = [ pkgs.geary ];
1717
programs.dconf.enable = true;
1818
services.gnome.gnome-keyring.enable = true;
1919
services.gnome.gnome-online-accounts.enable = true;

‎nixos/modules/programs/gnome-disks.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232

3333
config = lib.mkIf config.programs.gnome-disks.enable {
3434

35-
environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];
35+
environment.systemPackages = [ pkgs.gnome-disk-utility ];
3636

37-
services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ];
37+
services.dbus.packages = [ pkgs.gnome-disk-utility ];
3838

3939
};
4040

‎nixos/modules/programs/gnome-terminal.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ in
1919
};
2020

2121
config = lib.mkIf cfg.enable {
22-
environment.systemPackages = [ pkgs.gnome.gnome-terminal ];
23-
services.dbus.packages = [ pkgs.gnome.gnome-terminal ];
24-
systemd.packages = [ pkgs.gnome.gnome-terminal ];
22+
environment.systemPackages = [ pkgs.gnome-terminal ];
23+
services.dbus.packages = [ pkgs.gnome-terminal ];
24+
systemd.packages = [ pkgs.gnome-terminal ];
2525

2626
programs.bash.vteIntegration = true;
2727
programs.zsh.vteIntegration = true;

‎nixos/modules/programs/gpaste.nix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
###### implementation
2020
config = lib.mkIf config.programs.gpaste.enable {
21-
environment.systemPackages = [ pkgs.gnome.gpaste ];
22-
services.dbus.packages = [ pkgs.gnome.gpaste ];
23-
systemd.packages = [ pkgs.gnome.gpaste ];
21+
environment.systemPackages = [ pkgs.gpaste ];
22+
services.dbus.packages = [ pkgs.gpaste ];
23+
systemd.packages = [ pkgs.gpaste ];
2424
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
25-
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
25+
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ];
2626
# gpaste-reloaded applet doesn't work without the typelib
27-
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
27+
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
2828
};
2929
}

‎nixos/modules/programs/nautilus-open-any-terminal.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ in
1919

2020
config = lib.mkIf cfg.enable {
2121
environment.systemPackages = with pkgs; [
22-
gnome.nautilus-python
22+
nautilus-python
2323
nautilus-open-any-terminal
2424
];
2525
programs.dconf = lib.optionalAttrs (cfg.terminal != null) {

‎nixos/modules/programs/seahorse.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
config = lib.mkIf config.programs.seahorse.enable {
2323

24-
programs.ssh.askPassword = lib.mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";
24+
programs.ssh.askPassword = lib.mkDefault "${pkgs.seahorse}/libexec/seahorse/ssh-askpass";
2525

2626
environment.systemPackages = [
27-
pkgs.gnome.seahorse
27+
pkgs.seahorse
2828
];
2929

3030
services.dbus.packages = [
31-
pkgs.gnome.seahorse
31+
pkgs.seahorse
3232
];
3333

3434
};

‎nixos/modules/security/pam.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ let
723723
disable_interactive = true;
724724
}; }
725725
{ name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }
726-
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; }
726+
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; }
727727
{ name = "intune"; enable = config.services.intune.enable; control = "optional"; modulePath = "${pkgs.intune-portal}/lib/security/pam_intune.so"; }
728728
{ name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {
729729
store-only = cfg.gnupg.storeOnly;
@@ -789,7 +789,7 @@ let
789789
{ name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = {
790790
use_first_pass = true;
791791
}; }
792-
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
792+
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
793793
use_authtok = true;
794794
}; }
795795
];
@@ -858,7 +858,7 @@ let
858858
debug = true;
859859
}; }
860860
{ name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }
861-
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
861+
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
862862
auto_start = true;
863863
}; }
864864
{ name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {

0 commit comments

Comments
 (0)