Skip to content

Commit 4d19fb7

Browse files
committed
Merge #228: Update nixpkgs
52978b8 Update nixpkgs (Jonas Nick) 6a2efcc spark-wallet: 0.2.14 -> 0.2.16 (Jonas Nick) 438dde8 Replace sks-keyservers.net with keyserver.ubuntu.com (Jonas Nick) Pull request description: ACKs for top commit: nixbitcoin: ACK 52978b8 Tree-SHA512: b3f68865e2606760682e8fc1f6e637bfb38b382ea25cc67eff6402585b0f7118f132a5d9d7531c650d29d69c0b4eb8e277ad172038be73c4d34a9de678140844
2 parents 5c99656 + 52978b8 commit 4d19fb7

File tree

5 files changed

+89
-267
lines changed

5 files changed

+89
-267
lines changed

pkgs/electrs/get-sha256.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ echo "Latest release is ${latest}"
1515
# GPG verification
1616
export GNUPGHOME=$TMPDIR
1717
echo "Fetching Roman Zeyde's Key"
18-
gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv-keys 15c8c3574ae4f1e25f3f35c587cae5fa46917cbb 2> /dev/null
18+
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 15c8c3574ae4f1e25f3f35c587cae5fa46917cbb 2> /dev/null
1919
echo "Verifying latest release"
2020
git verify-tag ${latest}
2121

pkgs/elementsd/get-sha256.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ echo "Latest release is ${latest}"
1515
# GPG verification
1616
export GNUPGHOME=$TMPDIR
1717
echo "Fetching Steven Roose's Key"
18-
gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv-keys DE10E82629A8CAD55B700B972F2A88D7F8D68E87 2> /dev/null
18+
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys DE10E82629A8CAD55B700B972F2A88D7F8D68E87 2> /dev/null
1919
echo "Verifying latest release"
2020
git verify-tag ${latest}
2121

pkgs/nixpkgs-pinned.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ in
88
{
99
# To update, run ../helper/fetch-channel REV
1010
nixpkgs = fetch {
11-
rev = "b103b4bc62085f475d81e61dca85fe03e7eff935";
12-
sha256 = "1fjb5c80g1vsz9xvii5l6aiga392pbw6dvjky8wmx8xrc5f5g7ja";
11+
rev = "14006b724f3d1f25ecf38238ee723d38b0c2f4ce";
12+
sha256 = "07hfbilyh818pigfn342v2r05n8061wpjaf1m4h291lf6ydjagis";
1313
};
1414
nixpkgs-unstable = fetch {
15-
rev = "a5cc7d3197705f933d88e97c0c61849219ce76c1";
16-
sha256 = "0b7y2nv5nj776zh9jwir8fq1qrgcqpaap05qxlxp9qfngw12k6ji";
15+
rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38";
16+
sha256 = "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v";
1717
};
1818
}

pkgs/spark-wallet/generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ TMPDIR="$(mktemp -d -p /tmp)"
66
trap "rm -rf $TMPDIR" EXIT
77

88
# Get/verify spark-wallet-npm.tgz
9-
version="0.2.14"
9+
version="0.2.16"
1010
export GNUPGHOME=$TMPDIR
11-
gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv-key FCF19B67866562F08A43AAD681F6104CD0F150FC
11+
gpg --keyserver hkps://keyserver.ubuntu.com --recv-key FCF19B67866562F08A43AAD681F6104CD0F150FC
1212
wget -P $TMPDIR https://github.com/shesek/spark-wallet/releases/download/v${version}/SHA256SUMS.asc
1313
wget -P $TMPDIR https://github.com/shesek/spark-wallet/releases/download/v${version}/spark-wallet-${version}-npm.tgz
1414
(cd $TMPDIR; gpg --verify $TMPDIR/SHA256SUMS.asc; sha256sum -c --ignore-missing $TMPDIR/SHA256SUMS.asc)

0 commit comments

Comments
 (0)