diff options
| author | fanquake <fanquake@gmail.com> | 2023-11-13 16:40:57 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-11-13 16:41:21 +0000 |
| commit | 5800c558eb5efb4839ed00d6967e43306d68e1c3 (patch) | |
| tree | 3eb782f61ea82fb93d9d5b91e05b306bfd798f19 | |
| parent | d232e36abdb1a4f01787766a758051c16940b0c5 (diff) | |
| parent | 92d12f1c890350f40d8e5d5c6a59d5c172ea7550 (diff) | |
Merge bitcoin/bitcoin#28580: guix: update time-machine
92d12f1c890350f40d8e5d5c6a59d5c172ea7550 guix: update time-machine to 77386bdbfe6b0c649c05ab37f08051d1ab3e5074 (fanquake)
Pull request description:
python-altgraph (0.17.4) has been upstreamed, see: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=0c6198319a61d85cd8925af418466dcdccf3daff, so we can use it, and drop our package definition.
Also includes:
* GCC 10.4.0 -> 10.5.0: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=2fbb5398a39bf18e41235891a0740fa0bc4d7a4d.
* Linux Kernel Headers 6.1 -> 6.1.61
* LLVM 16 & LLVM 17 become available.
ACKs for top commit:
hebasto:
ACK 92d12f1c890350f40d8e5d5c6a59d5c172ea7550.
laanwj:
LGTM ACK 92d12f1c890350f40d8e5d5c6a59d5c172ea7550
Tree-SHA512: e362890ebf44d0fa6b276e023f431ce02c7a451dc8472d0ad729f72a76a8001c8c02cec322bd17680e039a1f55e654eccc4466e24a6eeccd50f0076328b3cedd
| -rw-r--r-- | contrib/guix/libexec/prelude.bash | 2 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 24 |
2 files changed, 2 insertions, 24 deletions
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash index 4d5b06a54d..28ca23098d 100644 --- a/contrib/guix/libexec/prelude.bash +++ b/contrib/guix/libexec/prelude.bash @@ -51,7 +51,7 @@ fi time-machine() { # shellcheck disable=SC2086 guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ - --commit=160f78a4d92205df986ed9efcce7d3aac188cb24 \ + --commit=77386bdbfe6b0c649c05ab37f08051d1ab3e5074 \ --cores="$JOBS" \ --keep-failed \ --fallback \ diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index d7cab862e4..ceb178155d 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -19,6 +19,7 @@ ((gnu packages python) #:select (python-minimal)) ((gnu packages python-build) #:select (python-tomli)) ((gnu packages python-crypto) #:select (python-asn1crypto)) + ((gnu packages python-xyz) #:select (python-altgraph)) ((gnu packages tls) #:select (openssl)) ((gnu packages version-control) #:select (git-minimal)) (guix build-system cmake) @@ -372,29 +373,6 @@ certificates or paths. Supports various options, including: validation at a specific moment in time, whitelisting and revocation checks.") (license license:expat)))) -(define-public python-altgraph - (package - (name "python-altgraph") - (version "0.17") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ronaldoussoren/altgraph") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09sm4srvvkw458pn48ga9q7ykr4xlz7q8gh1h9w7nxpf001qgpwb")))) - (build-system python-build-system) - (home-page "https://github.com/ronaldoussoren/altgraph") - (synopsis "Python graph (network) package") - (description "altgraph is a fork of graphlib: a graph (network) package for -constructing graphs, BFS and DFS traversals, topological sort, shortest paths, -etc. with graphviz output.") - (license license:expat))) - - (define-public python-macholib (package (name "python-macholib") |