From cb90579ba2c2d461f5bc9f6254380f44de39123a Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 25 Dec 2024 21:58:28 +0800
Subject: [PATCH] aerogramme: re-enable build

(cherry picked from commit 40effac24bad6f1f3bcfb326fb2226477c728776)
---
 pkgs/by-name/ae/aerogramme/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix
index a8643ba1b6cf9..b28ebe1eb61cc 100644
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y=";
   };
 
@@ -20,16 +20,8 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-time-rs.patch
   ];
 
-  # must use our own Cargo.lock due to git dependencies
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "imap-codec-2.0.0" = "sha256-o64Q74Q84xLRfU4K4JtcjyS0J8mfoApvUs9siscd0RA=";
-      "imap-flow-0.1.0" = "sha256-IopxybuVt5OW6vFiw/4MxojzaNZrKu2xyfaX6F8IYlA=";
-      "k2v-client-0.0.4" = "sha256-V71FCIsgK3VStFOzVntm8P0vXRobF5rQ74qar+cKyik=";
-      "smtp-message-0.1.0" = "sha256-FoSakm3D1xg1vefLf/zkyvzsij1G0QstK3CRo+LbByE=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-GPj8qhfKgfAadQD9DJafN4ec8L6oY62PS/w/ljkPHpw=";
 
   # disable network tests as Nix sandbox breaks them
   doCheck = false;
@@ -50,6 +42,5 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ supinie ];
     mainProgram = "aerogramme";
     platforms = lib.platforms.linux;
-    broken = true; # https://github.com/rust-lang/rust/issues/129811
   };
 }