From 9d11912cb4bd31eac64928892a97268dbf0e67a6 Mon Sep 17 00:00:00 2001 Message-ID: <9d11912cb4bd31eac64928892a97268dbf0e67a6.1699737412.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sun, 29 Oct 2023 11:54:49 +0300 Subject: [PATCH 01/12] gnu: Deprecate the "go-github-com-lucas-clemente-quic-go" variable. * gnu/packages/golang.scm (go-github-com-lucas-clemente-quic-go): Rename to "go-github-com-quic-go-quic-go". [arguments]: Patch source files to replace "lucas-clemente" with "quic-go". [home-page]: Update. (go-github-com-lucas-clemente-quic-go): Define as deprecated by "go-github-com-quic-go-quic-go". Change-Id: I9a99d4d904fadcf0b6854e806042ce5ad190ac0c --- gnu/packages/golang.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9c707e5414..16da0ba6be 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7691,14 +7691,14 @@ (define-public go-github-com-cheekybits-genny (home-page "https://github.com/cheekybits/genny/") (license license:expat))) -(define-public go-github-com-lucas-clemente-quic-go +(define-public go-github-com-quic-go-quic-go (package - (name "go-github-com-lucas-clemente-quic-go") + (name "go-github-com-quic-go-quic-go") (version "0.14.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lucas-clemente/quic-go") + (url "https://github.com/quic-go/quic-go") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -7706,20 +7706,31 @@ (define-public go-github-com-lucas-clemente-quic-go "04l3gqbc3gh079n8vgnrsf8ypgv8sl63xjf28jqfrb45v2l73vyz")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/lucas-clemente/quic-go" + '(#:import-path "github.com/quic-go/quic-go" ;; XXX More packages required... - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-repository-path + (lambda _ + (substitute* (find-files "src/github.com/quic-go/quic-go/" ".*\\.go|.*\\.mod") + (("lucas-clemente") + "quic-go"))))))) (propagated-inputs - (list go-golang-org-x-crypto go-github-com-cheekybits-genny + (list go-golang-org-x-crypto + go-github-com-cheekybits-genny go-github-com-marten-seemann-chacha20 go-github-com-marten-seemann-qtls go-github-com-golang-protobuf-proto)) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") - (home-page "https://github.com/lucas-clemente/quic-go") + (home-page "https://github.com/quic-go/quic-go") (license license:expat))) +(define-public go-github-com-lucas-clemente-quic-go + (deprecated-package "go-github-com-lucas-clemente-quic-go" go-github-com-quic-go-quic-go)) + (define-public go-github-com-lunixbochs-vtclean (package (name "go-github-com-lunixbochs-vtclean") base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94 -- 2.41.0