From e9df6147441dd3ac93653828561fa3f560dd1597 Mon Sep 17 00:00:00 2001
From: Dennis Schridde <okonkwo@mailbox.org>
Date: Thu, 29 Aug 2024 22:19:32 +0200
Subject: [PATCH] meli: 0.8.6 -> 0.8.7

Release notes: https://git.meli-email.org/meli/meli/releases/tag/v0.8.7

Include Cargo.lock patch to allow building with Rust 1.80,
cf. https://github.com/NixOS/nixpkgs/issues/332957#issuecomment-2278578811
and https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8

Closes: https://github.com/NixOS/nixpkgs/issues/338191
---
 pkgs/by-name/me/meli/package.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix
index ab5542bb8cb6..a9116aa6546f 100644
--- a/pkgs/by-name/me/meli/package.nix
+++ b/pkgs/by-name/me/meli/package.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchzip
+, fetchpatch
 , rustPlatform
 
 # native build inputs
@@ -23,7 +24,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "meli";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchzip {
     urls = [
@@ -31,10 +32,19 @@ rustPlatform.buildRustPackage rec {
       "https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
       "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
     ];
-    hash = "sha256-7lSxXv2i8B6vRWIJqMiXlMqHH6fmgACy9X5qNKuj+IU=";
+    hash = "sha256-2+JIehi2wuWdARbhFPvNPIJ9ucZKWjNSORszEG9lyjw=";
   };
 
-  cargoHash = "sha256-vZkMfaALnRBK9ZwMB2uvvJgQq+BdUX7enNnr9t5H+MY=";
+  cargoHash = "sha256-ZVhUkpiiPKbWcf56cXFgn3Nyr63STHLlD7mpYEetNIY=";
+
+  cargoPatches = [
+    (fetchpatch {
+      # https://github.com/NixOS/nixpkgs/issues/332957#issuecomment-2278578811
+      name = "fix-rust-1.80-compat.patch";
+      url = "https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8.patch";
+      hash = "sha256-mh8H7wmHMXAe01UTvdY8vJeeLyH6ZFwylNLFFL+4LO0=";
+    })
+  ];
 
   # Needed to get openssl-sys to use pkg-config
   OPENSSL_NO_VENDOR=1;
@@ -55,6 +65,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeCheckInputs = [
     file
+    gnum4
   ];
 
   postInstall = ''
@@ -70,10 +81,9 @@ rustPlatform.buildRustPackage rec {
   '';
 
   checkFlags = [
-    "--skip=conf::test_config_parse"        # panicking due to sandbox
-    "--skip=smtp::test::test_smtp"          # requiring network
-    "--skip=utils::xdg::query_default_app"  # doesn't build
-    "--skip=utils::xdg::query_mime_info"    # doesn't build
+    "--skip=conf::tests::test_config_parse"            # panicking due to sandbox
+    "--skip=utils::tests::test_shellexpandtrait_impls" # panicking due to sandbox
+    "--skip=utils::tests::test_shellexpandtrait"       # panicking due to sandbox
   ];
 
   meta = with lib; {