pyrox.dev
electrs: fix package update script
Using `update-source-version` requires a separate attrset for cargo deps.
Also convert pkg to `finalAttrs` format.
+7
-5
pkgs/by-name/el/electrs/package.nix
+7
-5
pkgs/by-name/el/electrs/package.nix
···
8
8
let
9
9
rocksdb = rocksdb_7_10;
10
10
in
11
-
rustPlatform.buildRustPackage rec {
11
+
rustPlatform.buildRustPackage (finalAttrs: {
12
12
pname = "electrs";
13
13
version = "0.10.9";
14
14
15
15
src = fetchFromGitHub {
16
16
owner = "romanz";
17
17
repo = "electrs";
18
-
rev = "v${version}";
18
+
rev = "v${finalAttrs.version}";
19
19
hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350=";
20
20
};
21
21
22
-
useFetchCargoVendor = true;
23
-
cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA=";
22
+
cargoDeps = rustPlatform.fetchCargoVendor {
23
+
inherit (finalAttrs) pname version src;
24
+
hash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA=";
25
+
};
24
26
25
27
# needed for librocksdb-sys
26
28
nativeBuildInputs = [ rustPlatform.bindgenHook ];
···
38
40
maintainers = with maintainers; [ prusnak ];
39
41
mainProgram = "electrs";
40
42
};
41
-
}
43
+
})
+3
-1
pkgs/by-name/el/electrs/update.sh
+3
-1
pkgs/by-name/el/electrs/update.sh
···
2
2
#!nix-shell -i bash -p coreutils curl jq git gnupg common-updater-scripts
3
3
set -euo pipefail
4
4
5
+
trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
6
+
5
7
# Fetch latest release, GPG-verify the tag, update derivation
6
8
7
9
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
···
34
36
rm -rf $repo/.git
35
37
hash=$(nix --extra-experimental-features nix-command hash path $repo)
36
38
37
-
(cd "$nixpkgs" && update-source-version electrs "$version" "$hash" && update-source-version electrs --ignore-same-version --source-key=cargoDeps)
39
+
(cd "$nixpkgs" && update-source-version electrs "$version" "$hash" && update-source-version electrs --ignore-same-version --source-key=cargoDeps.vendorStaging)
38
40
echo
39
41
echo "electrs: $oldVersion -> $version"