From 745aa270dcfd400d34eb39f7e719985c34d79788 Mon Sep 17 00:00:00 2001 Message-ID: <745aa270dcfd400d34eb39f7e719985c34d79788.1701457354.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Fri, 1 Dec 2023 21:52:19 +0300 Subject: [PATCH 1/2] gnu: kubo: Fix build. * gnu/packages/ipfs.scm (kubo): Fix build. [inputs]: Replace "go-golang-org-x-sys" with "go-golang-org-x-sys-0.8" in inputs. Change-Id: I0d7659efd71fe723ee411347598914fee68e0875 --- gnu/packages/ipfs.scm | 117 ++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 56 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index a4c0613e40..30d579ed3f 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -299,62 +299,67 @@ (define-public kubo "ipfs" #~(string-append #$output "/bin/ipfs")) "commands" "completion" "bash"))))))))) - (inputs (list go-github-com-alecthomas-units - ;; TODO: needs to be updated first - ;; go-github-com-blang-semver - go-github-com-cespare-xxhash - go-github-com-cheekybits-genny - go-github-com-cheggaaa-pb-v3 - go-github-com-davecgh-go-spew - go-github-com-dustin-go-humanize - go-github-com-flynn-noise - go-github-com-francoispqt-gojay - go-github-com-fsnotify-fsnotify - go-github-com-gogo-protobuf - go-github-com-google-uuid - go-github-com-golang-groupcache-lru - go-github-com-golang-snappy - go-github-com-gorilla-websocket - go-github-com-jackpal-go-nat-pmp - go-github-com-klauspost-compress - go-github-com-klauspost-cpuid - go-github-com-lucas-clemente-quic-go - go-github-com-mattn-go-colorable - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth - go-github-com-mgutz-ansi - go-github-com-minio-blake2b-simd - go-github-com-minio-sha256-simd - go-github-com-mitchellh-go-homedir - go-github-com-mr-tron-base58 - go-github-com-opentracing-opentracing-go - go-github-com-pkg-errors - go-github-com-pmezard-go-difflib - go-github-com-prometheus-client-golang - go-github-com-prometheus-client-model - go-github-com-prometheus-common - go-github-com-prometheus-procfs - go-github-com-spaolacci-murmur3 - go-github-com-stretchr-testify - go-github-com-syndtr-goleveldb - go-gopkg-in-yaml-v2 - go-gopkg-in-yaml-v3 - go-go-uber-org-atomic - go-go-uber-org-multierr - go-go-uber-org-zap - go-golang-org-x-crypto - go-golang-org-x-lint - go-golang-org-x-mod - go-golang-org-x-net - go-golang-org-x-oauth2 - go-golang-org-x-sync - go-golang-org-x-sys - go-golang-org-x-term - go-golang-org-x-tools - go-golang-org-x-xerrors - go-golang-org-x-exp - go-golang-org-x-text - go-lukechampine-com-blake3)) + (inputs + (let ((p (package-input-rewriting + `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) + #:deep? #true))) + (cons go-golang-org-x-sys-0.8 + (map p + (list go-github-com-alecthomas-units + ;; TODO: needs to be updated first + ;; go-github-com-blang-semver + go-github-com-cespare-xxhash + go-github-com-cheekybits-genny + go-github-com-cheggaaa-pb-v3 + go-github-com-davecgh-go-spew + go-github-com-dustin-go-humanize + go-github-com-flynn-noise + go-github-com-francoispqt-gojay + go-github-com-fsnotify-fsnotify + go-github-com-gogo-protobuf + go-github-com-google-uuid + go-github-com-golang-groupcache-lru + go-github-com-golang-snappy + go-github-com-gorilla-websocket + go-github-com-jackpal-go-nat-pmp + go-github-com-klauspost-compress + go-github-com-klauspost-cpuid + go-github-com-lucas-clemente-quic-go + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-mgutz-ansi + go-github-com-minio-blake2b-simd + go-github-com-minio-sha256-simd + go-github-com-mitchellh-go-homedir + go-github-com-mr-tron-base58 + go-github-com-opentracing-opentracing-go + go-github-com-pkg-errors + go-github-com-pmezard-go-difflib + go-github-com-prometheus-client-golang + go-github-com-prometheus-client-model + go-github-com-prometheus-common + go-github-com-prometheus-procfs + go-github-com-spaolacci-murmur3 + go-github-com-stretchr-testify + go-github-com-syndtr-goleveldb + go-gopkg-in-yaml-v2 + go-gopkg-in-yaml-v3 + go-go-uber-org-atomic + go-go-uber-org-multierr + go-go-uber-org-zap + go-golang-org-x-crypto + go-golang-org-x-lint + go-golang-org-x-mod + go-golang-org-x-net + go-golang-org-x-oauth2 + go-golang-org-x-sync + go-golang-org-x-term + go-golang-org-x-tools + go-golang-org-x-xerrors + go-golang-org-x-exp + go-golang-org-x-text + go-lukechampine-com-blake3))))) (native-inputs (append (if (%current-target-system) (list this-package) base-commit: 842a11f1caa1bb929c427722ad9d7b7c1ff65727 -- 2.41.0