paru: 2.0.3 -> 2.0.4

pkgs/by-name/pa/paru/cargo-lock.patch

@@ -0,0 +1,35 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 404b5cd..bba31c1 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2613,13 +2613,3 @@ dependencies = [
+  "quote",
+  "syn",
+ ]
+-
+-[[patch.unused]]
+-name = "alpm"
+-version = "3.0.4"
+-source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63"
+-
+-[[patch.unused]]
+-name = "aur-depends"
+-version = "3.0.0"
+-source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af"
+diff --git a/Cargo.toml b/Cargo.toml
+index 020c5c2..f74e9d1 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -70,12 +70,3 @@ static = ["alpm/static"]
+ mock = ["async-trait"]
+ mock_chroot = ["mock"]
+ #default = ["git", "generate"]
+-
+-[patch.crates-io]
+-#alpm = { path = "../alpm.rs/alpm" }
+-#alpm-utils = { path = "../alpm.rs/alpm-utils" }
+-alpm = { git = "https://github.com/archlinux/alpm.rs", rev = "306342" }
+-#alpm-utils = { git = "https://github.com/archlinux/alpm.rs", rev = "8da396" }
+-#aur-depends = { path = "../aur-depends" }
+-aur-depends = { git = "https://github.com/Morganamilo/aur-depends", rev = "30c2c1"}
+-#aur-fetch = { path = "../aur-fetch" }

pkgs/by-name/pa/paru/package.nix

@@ -11,34 +11,22 @@
   stdenv,
 }:
 
-let
-  # only libalpm v14.x.x is supported
-  pacman_6 = pacman.overrideAttrs (previousAttrs: {
-    version = "6.1.0";
-    src = previousAttrs.src.overrideAttrs {
-      outputHash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78=";
-    };
-    hardeningDisable = [ "fortify3" ];
-  });
-in
 rustPlatform.buildRustPackage rec {
   pname = "paru";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "Morganamilo";
     repo = "paru";
     rev = "v${version}";
-    hash = "sha256-0+N1WkjHd2DREoS1pImXXvlJ3wXoXEBxFBtupjXqyP8=";
+    hash = "sha256-VFIeDsIuPbWGf+vio5i8qGUBB+spP/7SwYwmQkMjtL8=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "alpm-3.0.4" = "sha256-cfIOCUyb+kDAT3Bn50oKuJzIyMyeFyOPBFQMkAgMocI=";
-      "aur-depends-3.0.0" = "sha256-Z/vCd4g3ic29vC0DXFHTT167xFAXYxzO2YQc0XQOerE=";
-    };
-  };
+  cargoPatches = [
+    ./cargo-lock.patch
+  ];
+
+  cargoHash = "sha256-z8hYZu/3RV99hOTpnv4ExgXymhzuITDcGjJhcHLWcH8=";
 
   nativeBuildInputs = [
     gettext
@@ -50,11 +38,13 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     libarchive
     openssl
-    pacman_6
+    pacman
   ];
 
-  # https://aur.archlinux.org/packages/paru#comment-961914
-  buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ "generate" ];
+  # https://github.com/Morganamilo/paru/issues/1154#issuecomment-2002357898
+  buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "generate"
+  ];
 
   postBuild = ''
     sh ./scripts/mkmo locale/