From patchwork Wed Nov 8 00:41:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56038 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 1F8D027BBE9; Tue, 7 Nov 2023 21:44:45 +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=unavailable 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 669DC27BBE2 for ; Tue, 7 Nov 2023 21:44:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0TsC-0002Ow-0E; Tue, 07 Nov 2023 16:44:36 -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 1r0Ts6-0002Fh-UK for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:30 -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 1r0Ts6-0007ug-MQ for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:30 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Tsi-0000oz-PP for guix-patches@gnu.org; Tue, 07 Nov 2023 16:45:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 61/67] gnu: go-github-com-stretchr-objx: Move to (gnu packages golang-web). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Nov 2023 21:45:08 +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 Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.16993934732914 (code B ref 66827); Tue, 07 Nov 2023 21:45:08 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:44:33 +0000 Received: from localhost ([127.0.0.1]:43674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Ts8-0000ks-Bx for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:44:32 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:51294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0TrM-0000Zj-0A for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:44 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32fdd0774d9so1031894f8f.2 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699393380; x=1699998180; 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=gwm8xX/aADYYQTP7CdR7yeUUPUhpilYR/HPQVbKPW00=; b=QpSMpKOx/gO65+qZgaaaZRGi56gsZGJi+VW0k5BBIkZu9CXUl2cnzT9259UJFgFcNF CvEtyku0AlCS3kgovekRLQWpoKQfiN69LKmVjyvlT7PnABLHXSELA1h5iaLHfDF0LCmE l+ZSq5EIz8ly0XmHHcei/n11/0gVNdEAchgNsV/Cpjux5YI1csKLGP37J3Z1RP1n7CHz R4myBwZ+e4nrHhuGL9OMXojM/XscYrVeTEDIRsR/IxS3HfghoYRI5TiSNmiqXMjUE5hL MrByllogPRG+C3MYav7xS9ZkCPpv4fd3f56MHtpnCqi7letr1Af+8hYbxE3+NTODkC2m f/HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699393380; x=1699998180; 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=gwm8xX/aADYYQTP7CdR7yeUUPUhpilYR/HPQVbKPW00=; b=u1JsDLRmqiKdHxB+QVKV0DQ+qub9EoFeNKc/w3ziJOEXVxSUZKIVxzQqk2GqkAU++B S1AKmYcuWHVWl+8ciXcIq6MaIBV3I3Lmn60nyxs+acOzLXclHVs6rE/R+2GrPw2vzi5K cUE9Hq0AWdxeZX+REBu+r1Uhsgs8d8uVClfnlNNpyWz1mhB1P/aosYrdwYdGhKUod8Ii rFBsFQnMzOysgZHA6426om5rbtA1tyr289FCoA1vd+xXWwKwDcagMbGDMROYZ2IlVFXg CA4nTnsoPSrGzz03D/5bs9cZjDEWd6i81dqTm7FOKhxh8sZqWsII/nP0WcnnElJx2/Zk A6LA== X-Gm-Message-State: AOJu0YyZa9zUUWQ00fksMxC4q/ykxSURlWj/B4JFd9asGSHHkdAlJPFn yeptqGY9qtEU4QAuyyNmFt/HozE42UqQhA== X-Google-Smtp-Source: AGHT+IGtoah939LKa/nXLqoxzLC9fajaHv+g6NIJfIycuIDHJ6WfwuNBgYWGYi8dF5jy2OBHs+xy1w== X-Received: by 2002:a5d:654e:0:b0:32f:7a65:da64 with SMTP id z14-20020a5d654e000000b0032f7a65da64mr19148wrv.65.1699393380145; Tue, 07 Nov 2023 13:43:00 -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 p2-20020adfce02000000b0032f9688ea48sm3310178wrn.10.2023.11.07.13.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:42:59 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:41:38 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.git.sharlatanus@gmail.com> References: <0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.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 3f93f6eaee..feb1295e7b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4110,58 +4110,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")