From e44a9cc1b61d43c3b054ba3ad4c8bc11f8e66e54 Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Thu, 2 May 2024 16:11:05 +0700
Subject: [PATCH 1/2] meli: mv to by-name

---
 .../meli/default.nix => by-name/me/meli/package.nix}            | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/mailreaders/meli/default.nix => by-name/me/meli/package.nix} (100%)

diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/by-name/me/meli/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/meli/default.nix
rename to pkgs/by-name/me/meli/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0054b6f0a94..087093da254d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32824,8 +32824,6 @@ with pkgs;
 
   meld = callPackage ../applications/version-management/meld { };
 
-  meli = callPackage ../applications/networking/mailreaders/meli { };
-
   melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
 
   melody = callPackage ../tools/misc/melody { };

From b285b744ac6edfd17a8620a707e42f1eb3a5363c Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Thu, 2 May 2024 16:22:34 +0700
Subject: [PATCH 2/2] meli: support mirrors

Servers go down. We can support mirrors for resilience.
---
 pkgs/by-name/me/meli/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix
index 3dc373a09024..a4ff654ad892 100644
--- a/pkgs/by-name/me/meli/package.nix
+++ b/pkgs/by-name/me/meli/package.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, fetchgit
+, fetchzip
 , rustPlatform
 
 # native build inputs
@@ -24,9 +24,12 @@ rustPlatform.buildRustPackage rec {
   pname = "meli";
   version = "0.8.4";
 
-  src = fetchgit {
-    url = "https://git.meli-email.org/meli/meli.git";
-    rev = "v${version}";
+  src = fetchzip {
+    urls = [
+      "https://git.meli-email.org/meli/meli/archive/v${version}.tar.gz"
+      "https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
+      "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
+    ];
     hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs=";
   };