From patchwork Wed Nov 29 22:35:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57111 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EBE3927BBEC; Wed, 29 Nov 2023 19:41:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14FEB27BBE2 for ; Wed, 29 Nov 2023 19:41:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QPm-0001PK-8u; Wed, 29 Nov 2023 14:40:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8QPd-0001CW-2C for guix-patches@gnu.org; Wed, 29 Nov 2023 14:39:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8QPc-00012D-L3 for guix-patches@gnu.org; Wed, 29 Nov 2023 14:39:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QPk-0006Bs-8O; Wed, 29 Nov 2023 14:40:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 61/66] gnu: go-github-com-stretchr-objx: Move to (gnu packages golang-web). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 19:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66827 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66827@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.170128679523715 (code B ref 66827); Wed, 29 Nov 2023 19:40:04 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:39:55 +0000 Received: from localhost ([127.0.0.1]:51470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QPb-0006AK-1b for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:39:55 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:58795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QMx-0005t0-Jv for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:37:12 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40b4f60064eso1013345e9.1 for <66827@debbugs.gnu.org>; Wed, 29 Nov 2023 11:37:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701286618; x=1701891418; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7Omdrfy/0QjC4Z7xG1YAiSZCgijuRebpU2vsjw7TgM0=; b=NGjwQ5TLTI4jO6DdHaj3TigUocc5jjf14ponmxkffj4NjokulPtrFxgmFUdUkrzTpx 4M4ytdoe+exuRSlgbV3WOh0A2G6YnUkIsIFS0Fo48T3+U8OtjJGfmpcMDp6Pa1ZEsu4h aq0q7069QMXGYL5Qk5S1CKpahH2vXrxP1KI6ixvRm7xIwAx0tQCQyZM07T2svVZInWQC QaYoahMuVwnngzr8rU8HqH1uhj8eabKobh71NZWYBA+LhmQVEcaJksZh0J0TI0I4ZuyR eIsPjN0rVw4O2++ETo6qqWnDtwdFeJ8WenptDBDnd6jn5oWmcIG3glEAi4PULSF/3TML 3gIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286618; x=1701891418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Omdrfy/0QjC4Z7xG1YAiSZCgijuRebpU2vsjw7TgM0=; b=Wj2mUxkY9n5c6KpMtolcZVKF4+EG2SJZqy/vIbSFkC0dyPx30qu4bB/27cNHI4T0hU fJk/vBjQTRsNDgTwpAJ5TXqRDwudu+WwBOXSz2RY/B30YkCvtN89VbwXsLhiqm950D7Y fpgwVLABpKJ6Q5OoetacDUH9ebc5rd4lgMCOws6RcCpStnqyXpPgNgION0r0HnJl9RJ6 kJWdjbAJuCcSgXRnKfhoM6FVLF7eT9e0VAxcqAadjPeaHfP/OrHvvsAVYjdYxsiQzIYy sm7Og/g6qZUBJxeBBuvTa2gR/2ewmT8tGllcvvSEYNqW3Um60NDSmo720qiDtM0cEf1i fjZw== X-Gm-Message-State: AOJu0YxO3hKNujdQZZHVye2r/Xwqq8kimAoNuQNSyB/RvjuENoVqWku5 GWRFzkKkSVirMB6NpdeHfdFdUbmW/8fv2w== X-Google-Smtp-Source: AGHT+IHQ7gRUTe24sjz86ToNXPT7FhZqxHnI885ooBhFB18LZcr8tbksqD4/L3qUhVUM+IGNZ5GhvQ== X-Received: by 2002:a05:600c:45cf:b0:408:3ac4:dc3f with SMTP id s15-20020a05600c45cf00b004083ac4dc3fmr13526874wmo.29.1701286618163; Wed, 29 Nov 2023 11:36:58 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id q17-20020a05600c46d100b0040836519dd9sm3239674wmo.25.2023.11.29.11.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 11:36:57 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:39 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <123a0b9b76c24c29184c527dabb652384f7be762.1701297273.git.sharlatanus@gmail.com> References: <123a0b9b76c24c29184c527dabb652384f7be762.1701297273.git.sharlatanus@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-stretchr-objx, go-github-com-stretchr-testify-bootstrap): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I357edfb72b789da67f821ae63afe30f18fc1cb39 --- gnu/packages/golang-check.scm | 51 ++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 52 ----------------------------------- 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 42e501a6e3..b74864d808 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -378,6 +378,46 @@ (define-public go-github-com-onsi-ginkgo Gomega matcher library.") (license license:expat))) +(define-public go-github-com-stretchr-objx + (package + (name "go-github-com-stretchr-objx") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stretchr/objx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "vendor"))))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/stretchr/objx" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) + (propagated-inputs + (list go-github-com-davecgh-go-spew + go-github-com-pmezard-go-difflib)) + (inputs + (list go-github-com-stretchr-testify-bootstrap)) + (home-page "https://github.com/stretchr/objx") + (synopsis "Go package for dealing with maps, slices, JSON and other data") + (description "This package provides a Go library for dealing with maps, +slices, JSON and other data.") + (license license:expat))) + (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") @@ -414,6 +454,17 @@ (define-public go-github-com-stretchr-testify @end itemize") (license license:expat))) +(define go-github-com-stretchr-testify-bootstrap + (package + (inherit go-github-com-stretchr-testify) + (arguments + '(#:import-path "github.com/stretchr/testify" + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs + (list go-gopkg-in-yaml-v3)))) + (define-public go-github-com-tdewolff-test (package (name "go-github-com-tdewolff-test") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1fb656c547..1870eadb9c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4146,58 +4146,6 @@ (define-public go-github-com-jpillora-backoff Go.") (license license:expat)))) -(define-public go-github-com-stretchr-objx - (package - (name "go-github-com-stretchr-objx") - (version "0.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stretchr/objx") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "vendor"))))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/stretchr/objx" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) - (propagated-inputs - (list go-github-com-davecgh-go-spew - go-github-com-pmezard-go-difflib)) - (inputs - (list go-github-com-stretchr-testify-bootstrap)) - (home-page "https://github.com/stretchr/objx") - (synopsis "Go package for dealing with maps, slices, JSON and other data") - (description "This package provides a Go library for dealing with maps, -slices, JSON and other data.") - (license license:expat))) - -(define go-github-com-stretchr-testify-bootstrap - (package - (inherit go-github-com-stretchr-testify) - (arguments - '(#:import-path "github.com/stretchr/testify" - #:tests? #f - #:phases (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs - (list go-gopkg-in-yaml-v3)))) - (define-public go-github-com-technoweenie-multipartstreamer (package (name "go-github-com-technoweenie-multipartstreamer")