From unknown Tue Jun 17 22:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 01:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49589@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162639972515106 (code B ref -1); Fri, 16 Jul 2021 01:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jul 2021 01:42:05 +0000 Received: from localhost ([127.0.0.1]:50130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Crc-0003va-RZ for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:42:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:34302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4CrY-0003vA-VO for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:42:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CrY-0004QV-6J for guix-patches@gnu.org; Thu, 15 Jul 2021 21:42:00 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:39198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CrV-0006Am-H5 for guix-patches@gnu.org; Thu, 15 Jul 2021 21:41:59 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626399711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tOLP0yhB2Wb9KmVVMrJRSeyOWHVPVn8/vFgb6I1x98c=; b=KvBgkZzccf0QuuEmXyZPJ787hGhCDoPHzrVp8ilO8XGCdAFaBeYn63bwtJPybVH+3r/9Nx UfKH0yX7tPPMgZZ7AkGQnZ2LqKOzZDgPWlVXrwHIvxRAw/doGSgJWmKjVj5bwuJGuowCE3 zn95m7sZ38pEaOOPDPp77aEdswdYGW8= From: Sarah Morgensen Date: Thu, 15 Jul 2021 18:41:49 -0700 Message-Id: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * guix/import/go.scm (go-package-licenses): Find license names in 'h2 // div // *text*' elements rather than 'h2 // *text*' elements. --- Hello Guix, A change to the page formatting on pkg.go.dev has caused Go imports to have erroneous license entries: --8<---------------cut here---------------start------------->8--- (license (list unknown-license! unknown-license! unknown-license! unknown-license! license:expat)))) --8<---------------cut here---------------end--------------->8--- This fixes that. guix/import/go.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index d8f838f635..f6a68d62bb 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -146,7 +146,7 @@ name (e.g. \"github.com/golang/protobuf/proto\")." ;; Extract the text contained in a h2 child node of any ;; element marked with a "License" class attribute. (select (sxpath `(// (* (@ (equal? (class "License")))) - h2 // *text*)))) + h2 // div // *text*)))) (select (html->sxml body #:strict? #t)))) (define (sxml->texi sxml-node) base-commit: 01d7e8c2782f61e741f8beff7888adfbdb61779d -- 2.31.1 From unknown Tue Jun 17 22:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jul 2021 02:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49589@debbugs.gnu.org Cc: Sarah Morgensen , 49589-done@debbugs.gnu.org X-Debbugs-Original-To: Sarah Morgensen via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.16265745131726 (code B ref -1); Sun, 18 Jul 2021 02:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jul 2021 02:15:13 +0000 Received: from localhost ([127.0.0.1]:54921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4wKm-0000Rm-MX for submit@debbugs.gnu.org; Sat, 17 Jul 2021 22:15:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:37168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4wKk-0000Rb-8t for submit@debbugs.gnu.org; Sat, 17 Jul 2021 22:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4wKk-00045s-0e for guix-patches@gnu.org; Sat, 17 Jul 2021 22:15:10 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:36458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4wKi-0006zg-G6 for guix-patches@gnu.org; Sat, 17 Jul 2021 22:15:09 -0400 Received: by mail-qk1-x72f.google.com with SMTP id t185so13044724qkd.3 for ; Sat, 17 Jul 2021 19:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=jV8EGjV1yGByNjdsCiddFI+4VaH6nYcaGD2AjOO2E1SzBsXXQi2fxRkQOpT4onsZUR XPO3yYn3RHY3Ie8vAg2nbw+1x21lOHAKBQ6Lr3OJgnsjzM2fOivks2wv6YzPKQ3AjAnA CB/ZXQqTHSsio6D5sS3L9dW3uDtzwyf4Bd38iJnKuvC6WddMUsEpdqbYA4msQ5eSrwGc ofNH6xSGXt88IIIFXNaU+FJTWvHabhvckEusEnrJP9966AjKeUXo+ZyzqH5rf8Ei9Cmf hmCr+O/d4lRqoFBlcgeNYWW4INtr7yJcVS3mMmEh90l4CDJBU6CF03wZEkbLBvIyQ4U2 6pnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=BBsPPO8lXF6B1s78O3ntUzjV5sDGdUy2vFVTR/ez953DcI6o0pPshfhRt09M4uJVqg egA8az5rrCyaKRXU0b+4XiQ3+3IBGokUf+5pnJdiyCWt0P8/xI7ditLvHNXKt5NaEZwY 7K3bIcFfVMwuq0+SBJVQgbreF6HRQB/mhLkyUZneioAwcwzTjmWkzLRm7pP7Ao5uZCP5 t6GLjN+aUU5GC+oULcITqEDpMoK6tluCg+ogMF9L3HbTglZlo5nOz46kt51KcbzfPMqq eYLKsrOolUKNEc18xXk+nx/bQPUci6TqKzFk7Dr8mlXnjqa9Ns2kzPhKsAMWPwpImXXM DzVw== X-Gm-Message-State: AOAM531VttXKIi+zNCm3x7ZyrLcKFOsFoXuB/mkN5AOPZxX/U1argmAa oXSK7oH0sLYO4YWdbT3MAtE= X-Google-Smtp-Source: ABdhPJzIDbWSOSZbBpQe5bGT98rZU3kb6k5GRBIw/j5GLOdqGN7GfECvPs82tAxv0OmhYQtz7mgmBg== X-Received: by 2002:a05:620a:40ce:: with SMTP id g14mr17742845qko.436.1626574507132; Sat, 17 Jul 2021 19:15:07 -0700 (PDT) Received: from hurd (dsl-148-66.b2b2c.ca. [66.158.148.66]) by smtp.gmail.com with ESMTPSA id d28sm2878114qkj.25.2021.07.17.19.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 19:15:06 -0700 (PDT) From: Maxim Cournoyer References: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> Date: Sat, 17 Jul 2021 22:15:05 -0400 In-Reply-To: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> (Sarah Morgensen via Guix-patches via's message of "Thu, 15 Jul 2021 18:41:49 -0700") Message-ID: <874kcsl652.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, Sarah Morgensen via Guix-patches via writes: > * guix/import/go.scm (go-package-licenses): Find license names in > 'h2 // div // *text*' elements rather than 'h2 // *text*' elements. > --- > Hello Guix, > > A change to the page formatting on pkg.go.dev has caused Go imports to have > erroneous license entries: > > (license > (list unknown-license! > unknown-license! > unknown-license! > unknown-license! > license:expat)))) > > > This fixes that. > > guix/import/go.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/guix/import/go.scm b/guix/import/go.scm > index d8f838f635..f6a68d62bb 100644 > --- a/guix/import/go.scm > +++ b/guix/import/go.scm > @@ -146,7 +146,7 @@ name (e.g. \"github.com/golang/protobuf/proto\")." > ;; Extract the text contained in a h2 child node of any > ;; element marked with a "License" class attribute. > (select (sxpath `(// (* (@ (equal? (class "License")))) > - h2 // *text*)))) > + h2 // div // *text*)))) > (select (html->sxml body #:strict? #t)))) > > (define (sxml->texi sxml-node) > > base-commit: 01d7e8c2782f61e741f8beff7888adfbdb61779d LGTM! Tested and applied as 59d20bcfcc. Thank you! Closing. Maxim From unknown Tue Jun 17 22:18:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Sarah Morgensen Subject: bug#49589: closed (Re: [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update.) Message-ID: References: <874kcsl652.fsf@gmail.com> <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> X-Gnu-PR-Message: they-closed 49589 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49589@debbugs.gnu.org Date: Sun, 18 Jul 2021 02:16:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1626574562-1803-1" This is a multi-part message in MIME format... ------------=_1626574562-1803-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49589: [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site u= pdate. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49589@debbugs.gnu.org. --=20 49589: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49589 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1626574562-1803-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49589-done) by debbugs.gnu.org; 18 Jul 2021 02:15:17 +0000 Received: from localhost ([127.0.0.1]:54924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4wKr-0000S2-4P for submit@debbugs.gnu.org; Sat, 17 Jul 2021 22:15:17 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:41561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4wKm-0000RV-P7 for 49589-done@debbugs.gnu.org; Sat, 17 Jul 2021 22:15:13 -0400 Received: by mail-qk1-f173.google.com with SMTP id s6so13012740qkc.8 for <49589-done@debbugs.gnu.org>; Sat, 17 Jul 2021 19:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=jV8EGjV1yGByNjdsCiddFI+4VaH6nYcaGD2AjOO2E1SzBsXXQi2fxRkQOpT4onsZUR XPO3yYn3RHY3Ie8vAg2nbw+1x21lOHAKBQ6Lr3OJgnsjzM2fOivks2wv6YzPKQ3AjAnA CB/ZXQqTHSsio6D5sS3L9dW3uDtzwyf4Bd38iJnKuvC6WddMUsEpdqbYA4msQ5eSrwGc ofNH6xSGXt88IIIFXNaU+FJTWvHabhvckEusEnrJP9966AjKeUXo+ZyzqH5rf8Ei9Cmf hmCr+O/d4lRqoFBlcgeNYWW4INtr7yJcVS3mMmEh90l4CDJBU6CF03wZEkbLBvIyQ4U2 6pnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=v3mQOli/5AP9haN7TxQNC6lHzTlshjhmwxYB1eH6ba4=; b=lwWxE8OVhz4hoJM/P4D1JvwKhmnqACrPXmr5KbHEOB4JRHF5RVi2AQJxV9Dj0ZE/Qc 92WxBFbKhts2oAS2V3HEkRJ+k2xLCYd9zqKm95s0NFGlPSvmofynKXvGNAodOZ16OZPI bWuzSFqGy3NF6SOYn7HCX0YVEXwPsa0+N6YciwCTRwi0IIXfYN55lhgd7KR9F8Yy6ia0 gTnMwOh/XcCSuzmlFiO8NmAjCHKUIOYiJeUrivX6KYpTrtqNQt/kwjxGDAhyhz29DJip lOM7FuSJtdCnPsou3dJXAYVOfGmzJynYqvctGWqE7HLGasm5RDJDkYOFJBuEONGtKFWS KQ6Q== X-Gm-Message-State: AOAM5336/Z6DHJcL8RMHYJ07Rx0QTYBptz5fubwW4RFfeMxV337qISjt 3rcSD28euPm09IxiAkzeLms= X-Google-Smtp-Source: ABdhPJzIDbWSOSZbBpQe5bGT98rZU3kb6k5GRBIw/j5GLOdqGN7GfECvPs82tAxv0OmhYQtz7mgmBg== X-Received: by 2002:a05:620a:40ce:: with SMTP id g14mr17742845qko.436.1626574507132; Sat, 17 Jul 2021 19:15:07 -0700 (PDT) Received: from hurd (dsl-148-66.b2b2c.ca. [66.158.148.66]) by smtp.gmail.com with ESMTPSA id d28sm2878114qkj.25.2021.07.17.19.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 19:15:06 -0700 (PDT) From: Maxim Cournoyer To: Sarah Morgensen via Guix-patches via Subject: Re: [bug#49589] [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update. References: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> Date: Sat, 17 Jul 2021 22:15:05 -0400 In-Reply-To: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> (Sarah Morgensen via Guix-patches via's message of "Thu, 15 Jul 2021 18:41:49 -0700") Message-ID: <874kcsl652.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49589-done Cc: Sarah Morgensen , 49589-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Sarah Morgensen via Guix-patches via writes: > * guix/import/go.scm (go-package-licenses): Find license names in > 'h2 // div // *text*' elements rather than 'h2 // *text*' elements. > --- > Hello Guix, > > A change to the page formatting on pkg.go.dev has caused Go imports to have > erroneous license entries: > > (license > (list unknown-license! > unknown-license! > unknown-license! > unknown-license! > license:expat)))) > > > This fixes that. > > guix/import/go.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/guix/import/go.scm b/guix/import/go.scm > index d8f838f635..f6a68d62bb 100644 > --- a/guix/import/go.scm > +++ b/guix/import/go.scm > @@ -146,7 +146,7 @@ name (e.g. \"github.com/golang/protobuf/proto\")." > ;; Extract the text contained in a h2 child node of any > ;; element marked with a "License" class attribute. > (select (sxpath `(// (* (@ (equal? (class "License")))) > - h2 // *text*)))) > + h2 // div // *text*)))) > (select (html->sxml body #:strict? #t)))) > > (define (sxml->texi sxml-node) > > base-commit: 01d7e8c2782f61e741f8beff7888adfbdb61779d LGTM! Tested and applied as 59d20bcfcc. Thank you! Closing. Maxim ------------=_1626574562-1803-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Jul 2021 01:42:05 +0000 Received: from localhost ([127.0.0.1]:50130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Crc-0003va-RZ for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:42:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:34302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4CrY-0003vA-VO for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:42:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CrY-0004QV-6J for guix-patches@gnu.org; Thu, 15 Jul 2021 21:42:00 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:39198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CrV-0006Am-H5 for guix-patches@gnu.org; Thu, 15 Jul 2021 21:41:59 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626399711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tOLP0yhB2Wb9KmVVMrJRSeyOWHVPVn8/vFgb6I1x98c=; b=KvBgkZzccf0QuuEmXyZPJ787hGhCDoPHzrVp8ilO8XGCdAFaBeYn63bwtJPybVH+3r/9Nx UfKH0yX7tPPMgZZ7AkGQnZ2LqKOzZDgPWlVXrwHIvxRAw/doGSgJWmKjVj5bwuJGuowCE3 zn95m7sZ38pEaOOPDPp77aEdswdYGW8= From: Sarah Morgensen To: guix-patches@gnu.org Subject: [PATCH] import: go: Fix parsing of pkg.go.dev licenses after site update. Date: Thu, 15 Jul 2021 18:41:49 -0700 Message-Id: <52c3bd00c1e919b5e7f8a76b89cb637d3fc2a616.1626399442.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * guix/import/go.scm (go-package-licenses): Find license names in 'h2 // div // *text*' elements rather than 'h2 // *text*' elements. --- Hello Guix, A change to the page formatting on pkg.go.dev has caused Go imports to have erroneous license entries: --8<---------------cut here---------------start------------->8--- (license (list unknown-license! unknown-license! unknown-license! unknown-license! license:expat)))) --8<---------------cut here---------------end--------------->8--- This fixes that. guix/import/go.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index d8f838f635..f6a68d62bb 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -146,7 +146,7 @@ name (e.g. \"github.com/golang/protobuf/proto\")." ;; Extract the text contained in a h2 child node of any ;; element marked with a "License" class attribute. (select (sxpath `(// (* (@ (equal? (class "License")))) - h2 // *text*)))) + h2 // div // *text*)))) (select (html->sxml body #:strict? #t)))) (define (sxml->texi sxml-node) base-commit: 01d7e8c2782f61e741f8beff7888adfbdb61779d -- 2.31.1 ------------=_1626574562-1803-1--