From patchwork Mon Oct 30 01:09:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55637 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 A67E827BBEC; Sun, 29 Oct 2023 22:14:47 +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 EEC9E27BBF3 for ; Sun, 29 Oct 2023 22:14:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxE2N-00004q-Ct; Sun, 29 Oct 2023 18:13:39 -0400 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 1qxE2G-0008Oj-PW for guix-patches@gnu.org; Sun, 29 Oct 2023 18:13:34 -0400 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 1qxE2G-0001AC-6M for guix-patches@gnu.org; Sun, 29 Oct 2023 18:13:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxE2m-0005ne-UR for guix-patches@gnu.org; Sun, 29 Oct 2023 18:14:04 -0400 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: Sun, 29 Oct 2023 22:14: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 Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.169861762522117 (code B ref 66827); Sun, 29 Oct 2023 22:14:04 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Oct 2023 22:13:45 +0000 Received: from localhost ([127.0.0.1]:43922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxE2S-0005kZ-Pc for submit@debbugs.gnu.org; Sun, 29 Oct 2023 18:13:45 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:60472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDzz-0005X1-26 for 66827@debbugs.gnu.org; Sun, 29 Oct 2023 18:11:12 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40859dee28cso30624945e9.0 for <66827@debbugs.gnu.org>; Sun, 29 Oct 2023 15:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698617432; x=1699222232; 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=Si7ljFnc4X4fmIkMVM4RyHdGCSmMslnyqUtaj9Ytzb5vsSnOAu2nwp77/D2GaXaaHn vbJs98Soikev/wnwybzNPDKBQWGcc++CTVcpviCqMmFj6H/ShPk+ssHT1vIcI2vRALTk EJ8uIsZ53skDO8HhHSqh0zXymyrd64+8+renUwPAE6F5MhS8dX/4wLqnq3nVK1rUe3EJ 3qjRnAm3673/qE4RGu4/uKcRIJKnPTCfo+j04bUpUYHifgi3BBOs6RUACC+gY3EAeZCC yMOfYK+7peJaftOpvR7c8BhMsveeuWJ4VD+Qvdn3XFmZD40VPcsQE1XaE+IURLNwtbdf MHOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698617432; x=1699222232; 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=W6GQHwz94xo2J23DipiAWQIBF14jT1zrSA4MgwAbaJ9wcY870vMSCIhm1f+RiV7Xiq Pum10nEdnj6fuMqg9YHDy2Tk6BSmNFzfkxJGUyy4IUwdh19HCRyiKIf3oRfNTQ6E1gJT /rqY5UXubinTgsFr8nGSNPBWvpkl5W0ZAtLRcixOAyJX2fKY/b8qkB5keX6KJyNUu8Wq VRJRazgZCbMDQYsPgDuv7JVBiCDN8m6JN/yrpc9Q/zrC31n5t5R4GLaA07+N4BfvGpOJ qhtqzV1WhyMqhu3rU1Id/9xvFzjC/A7KutZqzpZ2AaHmI9KWpClqItUI0ininUyM30IJ E2Zg== X-Gm-Message-State: AOJu0YycYhJHe7ZHz+zgl2D6l788U3WmOpE34uVz3+a6s7giLLrbOTiR yKHJ4ysAMp7eAhT99mYlK1E8+IOWVmyn3w== X-Google-Smtp-Source: AGHT+IEElPfuuSwK/ozKIABi//XxQvNegrYmPjlotjz9zqmFyM5mNFtl8/spZXJR5KDZklzfcNPung== X-Received: by 2002:a05:600c:450f:b0:408:3918:1bc1 with SMTP id t15-20020a05600c450f00b0040839181bc1mr7351040wmo.8.1698617432593; Sun, 29 Oct 2023 15:10:32 -0700 (PDT) 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 3-20020a05600c234300b004063cced50bsm7527511wmq.23.2023.10.29.15.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 15:10:32 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 30 Oct 2023 01:09:15 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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")