From f58a46fd5f4576efaf2cac91080b03f64ec359e7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 25 Feb 2026 15:07:37 +0000 Subject: [PATCH] gnu: nncp: Update to 8.13.0. Starting from 8.12.0 all `nncp-*' commands are combined into single `nncp'. * gnu/packages/uucp.scm (nncp): Update to 8.13.0. [phases] {fix-paths}: Adjust to use "unpack-path", switch to search-input-file. {build} Use default phase, which provides just one binary now. Change-Id: I7a6f4d567f8d29c7659c622c5861106e0cc68fb5 --- gnu/packages/uucp.scm | 49 +++++++++---------------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index cde94ededb..bcec21f068 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2025 Artyom V. Poptsov -;;; Copyright © 2025 Sharlatan Hellseher +;;; Copyright © 2025-2026 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,7 +71,7 @@ between computers.") (define-public nncp (package (name "nncp") - (version "8.11.0") + (version "8.13.0") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ between computers.") version ".tar.xz")) (sha256 (base32 - "1wmg6k1nprk9b7vnnly3m6xxyma2l0xamnrq3xwahjhqv6y18hgc")) + "1x057liwly7pk73l866nsbk3pcx9ndh1f0syjzc9hl80k076iqwc")) (modules '((ice-9 ftw) (guix build utils))) (snippet @@ -99,47 +99,18 @@ between computers.") (arguments (list #:install-source? #f - #:import-path "go.cypherpunks.su/nncp/v8" + #:import-path "go.cypherpunks.su/nncp/v8/cmd/..." #:unpack-path "go.cypherpunks.su/nncp" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-paths - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) + (lambda* (#:key inputs unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path "/v8") (substitute* (list "pipe.go" "toss_test.go") - (("/bin/sh") (which "sh")) - (("; cat") (format #f "; ~a" (which "cat"))))))) - (replace 'build - (lambda arguments - (let ((path-prefix "go.cypherpunks.su/nncp/v8/cmd/")) - (for-each - (lambda (cmd) - (apply (assoc-ref %standard-phases 'build) - `(,@arguments #:import-path - ,(string-append path-prefix cmd)))) - (list "nncp-ack" - "nncp-bundle" - "nncp-call" - "nncp-caller" - "nncp-cfgdir" - "nncp-cfgenc" - "nncp-cfgmin" - "nncp-cfgnew" - "nncp-check" - "nncp-cronexpr" - "nncp-daemon" - "nncp-exec" - "nncp-file" - "nncp-freq" - "nncp-hash" - "nncp-log" - "nncp-pkt" - "nncp-reass" - "nncp-rm" - "nncp-stat" - "nncp-toss" - "nncp-trns" - "nncp-xfer")))))))) + (("/bin/sh") + (search-input-file inputs "/bin/sh")) + (("; cat") + (format #f "; ~a" (search-input-file inputs "/bin/cat")))))))))) (inputs (list go-github-com-arceliar-ironwood go-github-com-davecgh-go-xdr