diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-11 09:09:18 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-11 09:09:26 +0800 |
| commit | ce8276b5316b8c88c3eb7f4371d15f310639311c (patch) | |
| tree | 35cdfcc0594f7e68f025b31de9f73856635694fc /contrib | |
| parent | 551933f9ec984053a8f44e47120507e4bd16e25a (diff) | |
| parent | 683d197970a533690ca1bd4d06d021900e87cb8b (diff) | |
| download | bitcoin-ce8276b5316b8c88c3eb7f4371d15f310639311c.tar.xz | |
Merge bitcoin/bitcoin#22190: Use latest signapple commit
683d197970a533690ca1bd4d06d021900e87cb8b Use latest signapple commit (Andrew Chow)
Pull request description:
Update gitian and guix to use the same latest signapple commit.
Also changed guix to use the actual repo. The changes from the fork were incorporated upstream.
ACKs for top commit:
fanquake:
ACK 683d197970a533690ca1bd4d06d021900e87cb8b - sanity checked that the updated package is built:
Tree-SHA512: a4981f8bbe33e6c5654632bc9b9f6f2f1e675741a19ac7296205e370f1e64a747101ecb632e0cc82a0134e4c2e9ce47b3f7b4d8c8f75f0f06dd069c078303759
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/gitian-osx-signer.yml | 2 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index 3f0c0c3332..addad0a5d2 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -14,7 +14,7 @@ remotes: "dir": "signature" - "url": "https://github.com/achow101/signapple.git" "dir": "signapple" - "commit": "c7e73aa27a7615ac9506559173f787e2906b25eb" + "commit": "b084cbbf44d5330448ffce0c7d118f75781b64bd" files: - "bitcoin-osx-unsigned.tar.gz" script: | diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index d2bc789b60..12eab27a3e 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -524,7 +524,7 @@ and endian independent.") (license license:expat))) (define-public python-signapple - (let ((commit "4ff1c1754e37042c002a3f6375c47fd931f2030b")) + (let ((commit "b084cbbf44d5330448ffce0c7d118f75781b64bd")) (package (name "python-signapple") (version (git-version "0.1" "1" commit)) @@ -532,12 +532,12 @@ and endian independent.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dongcarl/signapple") + (url "https://github.com/achow101/signapple") (commit commit))) (file-name (git-file-name name commit)) (sha256 (base32 - "043czyzfm04rcx5xsp59vsppla3vm5g45dbp1npy2hww4066rlnh")))) + "0k7inccl2mzac3wq4asbr0kl8s4cghm8982z54kfascqg45shv01")))) (build-system python-build-system) (propagated-inputs `(("python-asn1crypto" ,python-asn1crypto) |