mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

evolution-data-server: Move from gnome scope to top-level

Browse source
This commit is contained in:
Jan Tojnar 2024-06-13 23:40:24 +02:00
parent 5482d7417b
commit 7013d1cbc9
7 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
View file

@ -1,8 +1,8 @@
{ lib, makeWrapper, symlinkJoin, gnome, plugins }:
{ lib, makeWrapper, symlinkJoin, evolution-data-server, plugins }:
symlinkJoin {
name = "evolution-with-plugins";
paths = [ gnome.evolution-data-server ] ++ plugins;
paths = [ evolution-data-server ] ++ plugins;
nativeBuildInputs = [ makeWrapper ];

0
pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch → pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch
View file

0
pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch → pkgs/by-name/ev/evolution-data-server/fix-paths.patch
View file

0
pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch → pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
View file

0
pkgs/desktops/gnome/core/evolution-data-server/default.nix → pkgs/by-name/ev/evolution-data-server/package.nix
View file

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

@ -26,8 +26,6 @@ lib.makeScope pkgs.newScope (self: with self; {
epiphany = callPackage ./core/epiphany { };
evolution-data-server = callPackage ./core/evolution-data-server { };
gdm = callPackage ./core/gdm { };
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@ -248,6 +246,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
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.
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.

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

@ -30402,7 +30402,6 @@ with pkgs;
keeweb = callPackage ../applications/misc/keeweb { };
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 { };
evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };