diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index cfd5bed78d97..7c22d88a9ad5 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -13,7 +13,7 @@ in { }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome.geary ]; + environment.systemPackages = [ pkgs.geary ]; programs.dconf.enable = true; services.gnome.gnome-keyring.enable = true; services.gnome.gnome-online-accounts.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 80561adc210d..34fd7b989f77 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -434,7 +434,7 @@ in # through `environment.gnome.excludePackages` programs.evince.enable = notExcluded pkgs.evince; programs.file-roller.enable = notExcluded pkgs.file-roller; - programs.geary.enable = notExcluded pkgs.gnome.geary; + programs.geary.enable = notExcluded pkgs.geary; programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; programs.seahorse.enable = notExcluded pkgs.seahorse; services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/by-name/ge/geary/package.nix similarity index 98% rename from pkgs/desktops/gnome/misc/geary/default.nix rename to pkgs/by-name/ge/geary/package.nix index 461402dda8b3..565ed9ae2d23 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -143,7 +143,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 81fa669ccd5a..3444113295ab 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -199,8 +199,6 @@ in #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - geary = callPackage ./misc/geary { }; - gitg = callPackage ./misc/gitg { }; gnome-applets = callPackage ./misc/gnome-applets { }; @@ -234,6 +232,7 @@ in evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # Added on 2024-06-13. evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13. file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. + geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. 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-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22.