From dbf3b5daf536c2dd73f6ca2d147a6daa6f259f5b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 22 Feb 2024 18:31:07 +0000 Subject: [PATCH] gnu: Remove go-golang-org-x-net-html. golang.org/x/net is distributed as a single module according to provided go.mod file. This changes remove the last reference to golang.org/x/net/html. * gnu/packages/golang-build.scm (go-golang-org-x-net) [propagated-inputs]: Add go-golang-org-x-sys, go-golang-org-x-term and go-golang-org-x-text. (go-golang-org-x-net-html): Remove variable. * gnu/packages/version-control.scm (ghq) [inputs]: Remove go-golang-org-x-net-html. Add go-golang-org-x-net. * gnu/packages/textutils.scm (vale) [inputs]: Remove go-golang-org-x-net-html. Add go-golang-org-x-net. Change-Id: Ic275f2f7ccd145edfd376d65bd24599a550e849a --- gnu/packages/golang-build.scm | 15 ++------------- gnu/packages/textutils.scm | 2 +- gnu/packages/version-control.scm | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index e13ce3afa8..bccacf59f4 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -238,6 +238,8 @@ (define-public go-golang-org-x-net #~(modify-phases %standard-phases ;; Source-only package (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text)) (home-page "https://go.googlesource.com/net") (synopsis "Go supplemental networking libraries") (description "This package provides supplemental Go networking libraries.") @@ -262,19 +264,6 @@ (define-public go-golang-org-x-net-0.17 (sha256 (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) -(define-public go-golang-org-x-net-html - (package - (inherit go-golang-org-x-net) - (name "go-golang-org-x-net-html") - (arguments - '(#:import-path "golang.org/x/net/html" - #:unpack-path "golang.org/x/net")) - (propagated-inputs (list go-golang-org-x-text)) - (home-page "https://godoc.org/golang.org/x/net/html") - (synopsis "HTML5-compliant tokenizer and parser") - (description - "This package provides an HTML5-compliant tokenizer and parser."))) - (define-public go-golang-org-x-sync (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1") (revision "1")) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index b58038dcc2..0d704faed9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1471,7 +1471,7 @@ (define-public vale go-github-com-spf13-afero go-github-com-urfave-cli go-github-com-yuin-goldmark - go-golang-org-x-net-html + go-golang-org-x-net go-gopkg-in-ini-v1 go-gopkg-in-yaml-v2)) (home-page "https://github.com/errata-ai/vale") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index da02d0e4ea..afa7700413 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3849,7 +3849,7 @@ (define-public ghq go-github-com-motemen-go-colorine go-github-com-saracen-walker go-github-com-urfave-cli-v2 - go-golang-org-x-net-html + go-golang-org-x-net go-golang.org-x-sync-errgroup)) (synopsis "Manage remote repository clones") (description