Skip to content

Commit

Permalink
Merge #228: Update nixpkgs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jonasnick committed Aug 26, 2020
2 parents 5c99656 + 52978b8 commit 4d19fb7
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 267 deletions.
2 changes: 1 addition & 1 deletion pkgs/electrs/get-sha256.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "Latest release is ${latest}"
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Roman Zeyde's Key"
gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv-keys 15c8c3574ae4f1e25f3f35c587cae5fa46917cbb 2> /dev/null
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 15c8c3574ae4f1e25f3f35c587cae5fa46917cbb 2> /dev/null
echo "Verifying latest release"
git verify-tag ${latest}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/elementsd/get-sha256.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "Latest release is ${latest}"
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Steven Roose's Key"
gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv-keys DE10E82629A8CAD55B700B972F2A88D7F8D68E87 2> /dev/null
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys DE10E82629A8CAD55B700B972F2A88D7F8D68E87 2> /dev/null
echo "Verifying latest release"
git verify-tag ${latest}

Expand Down
8 changes: 4 additions & 4 deletions pkgs/nixpkgs-pinned.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ in
{
# To update, run ../helper/fetch-channel REV
nixpkgs = fetch {
rev = "b103b4bc62085f475d81e61dca85fe03e7eff935";
sha256 = "1fjb5c80g1vsz9xvii5l6aiga392pbw6dvjky8wmx8xrc5f5g7ja";
rev = "14006b724f3d1f25ecf38238ee723d38b0c2f4ce";
sha256 = "07hfbilyh818pigfn342v2r05n8061wpjaf1m4h291lf6ydjagis";
};
nixpkgs-unstable = fetch {
rev = "a5cc7d3197705f933d88e97c0c61849219ce76c1";
sha256 = "0b7y2nv5nj776zh9jwir8fq1qrgcqpaap05qxlxp9qfngw12k6ji";
rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38";
sha256 = "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v";
};
}
4 changes: 2 additions & 2 deletions pkgs/spark-wallet/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ TMPDIR="$(mktemp -d -p /tmp)"
trap "rm -rf $TMPDIR" EXIT

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

0 comments on commit 4d19fb7

Please sign in to comment.