qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evince: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-06-13 23:35:26 +02:00
parent 85a1179dab
commit 5482d7417b
7 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ in
# Since some of these have a corresponding package, we only
# enable that program module if the package hasn't been excluded
# through `environment.gnome.excludePackages`
programs.evince.enable = notExcluded pkgs.gnome.evince;
programs.evince.enable = notExcluded pkgs.evince;
programs.file-roller.enable = notExcluded pkgs.file-roller;
programs.geary.enable = notExcluded pkgs.gnome.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;

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

@ -284,7 +284,7 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
programs.evince.enable = mkDefault (notExcluded pkgs.evince);
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
environment.systemPackages = utils.removePackagesByName ([

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

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

@ -4,6 +4,7 @@
, meson
, gettext
, gobject-introspection
, evince
, glib
, gnome
, gtksourceview4
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gtk3
gnome.evince
evince
icu
harfbuzz
gjs

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

@ -26,8 +26,6 @@ lib.makeScope pkgs.newScope (self: with self; {
epiphany = callPackage ./core/epiphany { };
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
evolution-data-server = callPackage ./core/evolution-data-server { };
gdm = callPackage ./core/gdm { };
@ -249,6 +247,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ 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
evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # 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.
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.

2
pkgs/desktops/pantheon/default.nix
View File

@ -234,7 +234,7 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21
evince = pkgs.gnome.evince; # added 2022-03-18
evince = pkgs.evince; # added 2022-03-18
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01

1
pkgs/top-level/all-packages.nix
View File

@ -30402,7 +30402,6 @@ with pkgs;
keeweb = callPackage ../applications/misc/keeweb { };
inherit (gnome) evince;
evolution-data-server = gnome.evolution-data-server;
evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; };
evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };