movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

seahorse: Move from gnome scope to top-level

Browse source
This commit is contained in:
Jan Tojnar 2024-06-22 13:52:15 +02:00
parent 0daa38a8fc
commit f622b52aaa
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/programs/seahorse.nix
View file

@ -21,14 +21,14 @@
config = lib.mkIf config.programs.seahorse.enable { config = lib.mkIf config.programs.seahorse.enable {
programs.ssh.askPassword = lib.mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass"; programs.ssh.askPassword = lib.mkDefault "${pkgs.seahorse}/libexec/seahorse/ssh-askpass";
environment.systemPackages = [ environment.systemPackages = [
pkgs.gnome.seahorse pkgs.seahorse
]; ];
services.dbus.packages = [ services.dbus.packages = [
pkgs.gnome.seahorse pkgs.seahorse
]; ];
}; };

2
nixos/modules/services/x11/desktop-managers/gnome.nix
View file

@ -436,7 +436,7 @@ in
programs.file-roller.enable = notExcluded pkgs.file-roller; programs.file-roller.enable = notExcluded pkgs.file-roller;
programs.geary.enable = notExcluded pkgs.gnome.geary; programs.geary.enable = notExcluded pkgs.gnome.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
programs.seahorse.enable = notExcluded pkgs.gnome.seahorse; programs.seahorse.enable = notExcluded pkgs.seahorse;
services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
# VTE shell integration for gnome-console # VTE shell integration for gnome-console

1
pkgs/desktops/gnome/apps/seahorse/default.nix → pkgs/by-name/se/seahorse/package.nix
View file

@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome.${pname}";
}; };
}; };

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

@ -159,8 +159,6 @@ in
polari = callPackage ./apps/polari { }; polari = callPackage ./apps/polari { };
seahorse = callPackage ./apps/seahorse { };
vinagre = callPackage ./apps/vinagre { }; vinagre = callPackage ./apps/vinagre { };
#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ #### Dev http://ftp.gnome.org/pub/GNOME/devtools/
@ -252,6 +250,7 @@ in
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.
seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22.
#### Removals #### Removals
anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16