pyrox.dev
solana-validator: adapt update script to new nix-prefetch-github
The update script is also already broken and needs:
1. Add missing packages to the shebang.
2. Retrieve cargo hash from the proper package.
We also take the opportunity to switch ot using the newer "hash" and
"cargoHash" properties.
+4
-4
pkgs/applications/blockchains/solana-validator/default.nix
+4
-4
pkgs/applications/blockchains/solana-validator/default.nix
···
42
let
43
pinData = lib.importJSON ./pin.json;
44
version = pinData.version;
45
-
sha256 = pinData.sha256;
46
-
cargoSha256 = pinData.cargoSha256;
47
in
48
rustPlatform.buildRustPackage rec {
49
pname = "solana-validator";
···
53
owner = "solana-labs";
54
repo = "solana";
55
rev = "v${version}";
56
-
inherit sha256;
57
};
58
59
# partly inspired by https://github.com/obsidiansystems/solana-bridges/blob/develop/default.nix#L29
60
-
inherit cargoSha256;
61
62
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
63
···
42
let
43
pinData = lib.importJSON ./pin.json;
44
version = pinData.version;
45
+
hash = pinData.hash;
46
+
cargoHash = pinData.cargoHash;
47
in
48
rustPlatform.buildRustPackage rec {
49
pname = "solana-validator";
···
53
owner = "solana-labs";
54
repo = "solana";
55
rev = "v${version}";
56
+
inherit hash;
57
};
58
59
# partly inspired by https://github.com/obsidiansystems/solana-bridges/blob/develop/default.nix#L29
60
+
inherit cargoHash;
61
62
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
63
+2
-2
pkgs/applications/blockchains/solana-validator/pin.json
+2
-2
pkgs/applications/blockchains/solana-validator/pin.json
+9
-9
pkgs/applications/blockchains/solana-validator/update.sh
+9
-9
pkgs/applications/blockchains/solana-validator/update.sh
···
1
#!/usr/bin/env nix-shell
2
-
#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
3
4
# TODO set to `verbose` or `extdebug` once implemented in oil
5
shopt --set xtrace
6
-
# we need failures inside of command subs to get the correct cargoSha256
7
shopt --unset inherit_errexit
8
9
const directory = $(dirname $0 | xargs realpath)
···
11
const repo = "solana"
12
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
13
jq -r '.tag_name')
14
-
const latest_version = $(echo $latest_rev | sd 'v' '')
15
const current_version = $(jq -r '.version' $directory/pin.json)
16
if ("$latest_version" === "$current_version") {
17
echo "solana is already up-to-date"
18
return 0
19
} else {
20
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
21
-
const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
22
23
jq ".version = \"$latest_version\" | \
24
-
.\"sha256\" = \"$tarball_hash\" | \
25
-
.\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
26
27
-
const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
28
tail -n 2 | \
29
head -n 1 | \
30
-
sd '\s+got:\s+' '')
31
32
-
jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
33
}
···
1
#!/usr/bin/env nix-shell
2
+
#! nix-shell -i oil -p jq moreutils nix-prefetch-github gnused
3
4
# TODO set to `verbose` or `extdebug` once implemented in oil
5
shopt --set xtrace
6
+
# we need failures inside of command subs to get the correct cargoHash
7
shopt --unset inherit_errexit
8
9
const directory = $(dirname $0 | xargs realpath)
···
11
const repo = "solana"
12
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
13
jq -r '.tag_name')
14
+
const latest_version = $(echo ${latest_rev#v})
15
const current_version = $(jq -r '.version' $directory/pin.json)
16
if ("$latest_version" === "$current_version") {
17
echo "solana is already up-to-date"
18
return 0
19
} else {
20
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
21
+
const tarball_hash = $(echo $tarball_meta | jq -r '.hash')
22
23
jq ".version = \"$latest_version\" | \
24
+
.\"hash\" = \"$tarball_hash\" | \
25
+
.\"cargoHash\" = \"\"" $directory/pin.json | sponge $directory/pin.json
26
27
+
const new_cargo_hash = $(nix-build -A solana-validator 2>&1 | \
28
tail -n 2 | \
29
head -n 1 | \
30
+
sed 's/\s*got:\s*//')
31
32
+
jq ".cargoHash = \"$new_cargo_hash\"" $directory/pin.json | sponge $directory/pin.json
33
}