From 7013d1cbc9acce05146836b56e60a8c4bd653be8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Jun 2024 23:40:24 +0200
Subject: [PATCH] evolution-data-server: Move from gnome scope to top-level

---
 .../networking/mailreaders/evolution/evolution/wrapper.nix    | 4 ++--
 .../drop-tentative-settings-constructor.patch                 | 0
 .../core => by-name/ev}/evolution-data-server/fix-paths.patch | 0
 .../ev}/evolution-data-server/hardcode-gsettings.patch        | 0
 .../ev/evolution-data-server/package.nix}                     | 0
 pkgs/desktops/gnome/default.nix                               | 3 +--
 pkgs/top-level/all-packages.nix                               | 1 -
 7 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/ev}/evolution-data-server/drop-tentative-settings-constructor.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/ev}/evolution-data-server/fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/ev}/evolution-data-server/hardcode-gsettings.patch (100%)
 rename pkgs/{desktops/gnome/core/evolution-data-server/default.nix => by-name/ev/evolution-data-server/package.nix} (100%)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
index 6b65211d0b4b..bae0bdb2fd45 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
@@ -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 ];
 
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch b/pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch
rename to pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch b/pkgs/by-name/ev/evolution-data-server/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch
rename to pkgs/by-name/ev/evolution-data-server/fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
rename to pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/evolution-data-server/default.nix
rename to pkgs/by-name/ev/evolution-data-server/package.nix
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 80b3cef3d334..5c0101eb6e2a 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -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.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b7550094284..a0e2bd66cb55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };