From patchwork Sat Jan 20 09:58:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59207 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 A2EDA27BBE9; Sat, 20 Jan 2024 10:01:26 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 A917A27BBE2 for ; Sat, 20 Jan 2024 10:01:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR89w-0006WG-UQ; Sat, 20 Jan 2024 05:01:04 -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 1rR89t-0006Rt-Db for guix-patches@gnu.org; Sat, 20 Jan 2024 05:01:01 -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 1rR89t-0003Sk-59 for guix-patches@gnu.org; Sat, 20 Jan 2024 05:01:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR89v-0006rj-Rm; Sat, 20 Jan 2024 05:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68605] [PATCH 35/38] gnu: go-github.com-smartystreets-assertions: Move to (gnu packages golang-check). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 10:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68605@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 68605-submit@debbugs.gnu.org id=B68605.170574483924838 (code B ref 68605); Sat, 20 Jan 2024 10:01:03 +0000 Received: (at 68605) by debbugs.gnu.org; 20 Jan 2024 10:00:39 +0000 Received: from localhost ([127.0.0.1]:32858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR89W-0006Ru-Hd for submit@debbugs.gnu.org; Sat, 20 Jan 2024 05:00:39 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR88A-00056U-JN for 68605@debbugs.gnu.org; Sat, 20 Jan 2024 04:59:15 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40e76109cdeso17571685e9.0 for <68605@debbugs.gnu.org>; Sat, 20 Jan 2024 01:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705744746; x=1706349546; 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=JWflAPds+gDCMvIj8dPOpCz9HrXoezeqLqJbV3SGC/I=; b=i+CWaQCud3MO5umBhCqJ6wYhQqN5pVwlTTCXErXIYF/fi1tm7BAwXKCih9F//pR10w 8DSAkuHUlfOiCFbBTBigCoCdGel2pve4IPwOa7OtET27V8C4RfqqMfHd1u4MfkIHlDIQ CiVnioBaMOpd5ms4BKmSZbzk9Ou7l+K0OMz/GgdAlbehCfI5FaVA55OVxhs8rkAb/EyA Jm/BqF9wmvGG4DpM6mW3FKO3WFdetzzr6X2lnFErGOvX6emcxqgAkin+tWlYxh0CZgtx WYPE0AC6sLZgDH9L8bA8LZc1ROX6KgG0m6C60iImPdSAGPtyZ4G+mle42L4d8goFKhXx rgmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705744746; x=1706349546; 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=JWflAPds+gDCMvIj8dPOpCz9HrXoezeqLqJbV3SGC/I=; b=gDaKzIQNYDOQ8hrvgH9OHJKDSedCjrYqYq/0QkKNvSZeplT1EG8naFSPQzXizUVDgI 4Snnn4Jj4LDrGe+8f9+ABhp/rHKAudif6P7OPwotf3FmOkhiCnE8Ldu7uykY+y93ktJz 7aFNwgrt66nzioxcLV7+jPoZ7+Veh2BVPJzWTnfT13L5+QxRPuWXQhGfGOWlATcBJwzU 7xt7mnnWmwmudCw+TtpFEG6t0Cv82uiO+xVGgRLze6fdKKGDRFun6ur/9duyM4hkz4AV RGdATtljI4wK+0vL1wcPBavGEdYNm3u/m1Dg4DDzLs1NnsFMYjIgMt7hFw/IrEnnMwDj FFIw== X-Gm-Message-State: AOJu0YzxjkbsqYEipRmfrYqkO6n4wdaRUsKbtMl9eCMUjPImgBnvdnrs LVMQehmtaML2SiF+nUL39jt+bDobUrx30rcQu9uAD9kVa7oPppdEZCDAsHFKb9U= X-Google-Smtp-Source: AGHT+IFQQMTIVKfkgp0icvHFJkyNbwKxFwlzhyJHKHRZh3eJnPWlXHJhW9ybmT/gLTtHHFsO0w8yjA== X-Received: by 2002:a05:600c:8516:b0:40e:4193:ace7 with SMTP id gw22-20020a05600c851600b0040e4193ace7mr614841wmb.63.1705744746153; Sat, 20 Jan 2024 01:59:06 -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 f6-20020a05600c4e8600b0040d6ffae526sm36066695wmq.39.2024.01.20.01.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 01:59:05 -0800 (PST) From: Sharlatan Hellseher Date: Sat, 20 Jan 2024 09:58:27 +0000 Message-ID: <44d3faded15eecfc9662007bc7ccca9f959c64d0.1705743628.git.sharlatanus@gmail.com> 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/check.scm (go-github.com-smartystreets-assertions): Move from here ... * gnu/packages/golang-check.scm: ... to here. Change-Id: Ia90bbe984fe19dd48d9df91364a7ecf2bf8bd37f --- gnu/packages/check.scm | 33 --------------------------------- gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0b7acaddad..5e82a09126 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -898,39 +898,6 @@ (define-public python-gixy command.") (license license:mpl2.0)))) -(define-public go-github.com-smartystreets-assertions - (package - (name "go-github.com-smartystreets-assertions") - (version "1.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/smartystreets/assertions") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/smartystreets/assertions" - #: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))))))) - (native-inputs - (list go-github.com-smartystreets-gunit)) - (synopsis "Assertions for testing with Go") - (description - "The @code{assertions} package provides convenient assertion functions -for writing tests in Go.") - (home-page "https://github.com/smartystreets/assertions") - (license license:expat))) - (define-public go-github.com-smartystreets-goconvey (package (name "go-github.com-smartystreets-goconvey") diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 207e4a548f..0c37849806 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Leo Famulari +;;; Copyright © 2019 Vagrant Cascadian ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Oleg Pykhalov @@ -379,6 +380,38 @@ (define-public go-github-com-onsi-ginkgo Gomega matcher library.") (license license:expat))) +(define-public go-github.com-smartystreets-assertions + (package + (name "go-github.com-smartystreets-assertions") + (version "1.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/smartystreets/assertions") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/smartystreets/assertions" + #: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))))))) + (native-inputs + (list go-github.com-smartystreets-gunit)) + (home-page "https://github.com/smartystreets/assertions") + (synopsis "Assertions for testing with Go") + (description "The @code{assertions} package provides convenient assertion +functions for writing tests in Go.") + (license license:expat))) + (define-public go-github.com-smartystreets-gunit (package (name "go-github.com-smartystreets-gunit")