From 0444b58f792458aba883dcec232f97a792491ea4 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 22 Jul 2025 15:12:10 +0200
Subject: [PATCH] electrs: fix package update script

Using `update-source-version` requires a separate attrset for cargo deps.
Also convert pkg to `finalAttrs` format.
---
 pkgs/by-name/el/electrs/package.nix | 12 +++++++-----
 pkgs/by-name/el/electrs/update.sh   |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/el/electrs/package.nix b/pkgs/by-name/el/electrs/package.nix
index f5b9f1eb8337..7c2a655be4a8 100644
--- a/pkgs/by-name/el/electrs/package.nix
+++ b/pkgs/by-name/el/electrs/package.nix
@@ -8,19 +8,21 @@
 let
   rocksdb = rocksdb_7_10;
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "electrs";
   version = "0.10.9";
 
   src = fetchFromGitHub {
     owner = "romanz";
     repo = "electrs";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA=";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA=";
+  };
 
   # needed for librocksdb-sys
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -38,4 +40,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ prusnak ];
     mainProgram = "electrs";
   };
-}
+})
diff --git a/pkgs/by-name/el/electrs/update.sh b/pkgs/by-name/el/electrs/update.sh
index 0c1db1772886..ef6a1ac123e0 100755
--- a/pkgs/by-name/el/electrs/update.sh
+++ b/pkgs/by-name/el/electrs/update.sh
@@ -2,6 +2,8 @@
 #!nix-shell -i bash -p coreutils curl jq git gnupg common-updater-scripts
 set -euo pipefail
 
+trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
+
 # Fetch latest release, GPG-verify the tag, update derivation
 
 scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
@@ -34,6 +36,6 @@ git -C $repo verify-tag v${version}
 rm -rf $repo/.git
 hash=$(nix --extra-experimental-features nix-command hash path $repo)
 
-(cd "$nixpkgs" && update-source-version electrs "$version" "$hash" && update-source-version electrs --ignore-same-version --source-key=cargoDeps)
+(cd "$nixpkgs" && update-source-version electrs "$version" "$hash" && update-source-version electrs --ignore-same-version --source-key=cargoDeps.vendorStaging)
 echo
 echo "electrs: $oldVersion -> $version"