From patchwork Mon Feb 12 18:48:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60243 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 8C8BC27BBEA; Mon, 12 Feb 2024 18:58:01 +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, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 7A53827BBE2 for ; Mon, 12 Feb 2024 18:58:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbUy-0001xh-Fd; Mon, 12 Feb 2024 13:57:48 -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 1rZbUx-0001wi-1J for guix-patches@gnu.org; Mon, 12 Feb 2024 13:57:47 -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 1rZbUw-0008WE-Nk for guix-patches@gnu.org; Mon, 12 Feb 2024 13:57:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbVC-0002Dw-1P; Mon, 12 Feb 2024 13:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 26/30] gnu: go-golang-org-x-image: Move to golang-build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 12 Feb 2024 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69042@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday , Liliana Marie Prikler , Sharlatan Hellseher , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Katherine Cox-Buday , Liliana Marie Prikler , Sharlatan Hellseher , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 69042-submit@debbugs.gnu.org id=B69042.17077642258288 (code B ref 69042); Mon, 12 Feb 2024 18:58:02 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:57:05 +0000 Received: from localhost ([127.0.0.1]:49830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbUG-00029Z-94 for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:57:04 -0500 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]:44201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbUE-00028c-2Z for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:57:02 -0500 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5114fa38434so3905834e87.0 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707764199; x=1708368999; 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=ASc4EO9vceklRMGsbAiBVSg9veQ1Rsh7+Y+gJyp6BJQ=; b=Gk7DG5UG62VEKaBv4ciBacz5eVyWaCm2fqFipuOAMGNWYfOKh1pPJixksj5TXkyMHm 4uMPy6QHeDQJE8PaMMjejaQ/xh+9cD1PnTW9u0Q4s/fJWwL8tXTIALobF8hKTTUkB+cx oRBPXX6IlyvZBq0ox82KiWGO+26SuliS1aaUSCewRVVFIrlzw2S2GBV0nydSp2PyQgA1 E8yPIH00mlbJqDV/YptS1vknWiatVZDB4/61OvsvSB1/WQVxHFgLmkFoN4S/gfhltcyZ 8ZRV9Q46dPXWylaHWbxy1/pYN7KaeiKwjz987DnCvFK3wUTgon97usw2pd9rzeQh99Q5 azVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707764199; x=1708368999; 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=ASc4EO9vceklRMGsbAiBVSg9veQ1Rsh7+Y+gJyp6BJQ=; b=ZVxKzqjgSLg+TSv9DaTV/l6zKmiKUPAd8sZu/j2QTMD7hpd36gR48BpkiGg2z4oXkJ JOyt2pm35DRdJLooUF41hpqijCkSuMoD+YASo7D5eoRIJmfMiDkpcmYOMUiC58Lfs6q6 CJUd4HXglBLpBcnfYUUenCKOm29dDNsmvSd4VT4pzJ/SKCx6MI2EYPjhJsOBCujDEgfv itaJ6cyVE0AqMqeKhGSafvkmHnfgWPirR4Xj8RKhhZCnoVKMgJ3UgGE3ioPhJoxbi6Yd n/pJkfjV/EudB0wbY+DkOWgI3GhwXu/7FAXSuD37fhJjo7PBna4AsRJFbnOHzm54lNkS SzqA== X-Gm-Message-State: AOJu0YymJqLrFjPDfXdP5LwkKHlbx8BJE4bTv2Ww5dHoLjaB2Soeqdg7 UkPhL38uuGA1n9buzSHowziNcsns53Q/07QWd1cMW0Ig2ds64WpD+bGK8apzz1E= X-Google-Smtp-Source: AGHT+IHRpiFESaKeTzxoCpTkIFRmQfad5Ol5UW5HPl2uuVfBvEnPI3jX73B5PgMlR3QOIhMWXjQ0Gw== X-Received: by 2002:a5d:6292:0:b0:33b:2835:a1fe with SMTP id k18-20020a5d6292000000b0033b2835a1femr5423836wru.47.1707763756385; Mon, 12 Feb 2024 10:49:16 -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 v5-20020a5d59c5000000b0033b74a3dcf9sm6423510wry.27.2024.02.12.10.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:49:16 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:43 +0000 Message-ID: <7d85f4e56662d00a63190cd687280466452bfa84.1707763691.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/golang.scm (go-golang-org-x-image): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/game.scm: Add (gnu packages golang-build) module. Change-Id: Icd0b303d8f7544f6eae10ac30d7bd01779abaede --- gnu/packages/games.scm | 1 + gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 30 ------------------------------ 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f95681fbb7..c257a2cfe8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -150,6 +150,7 @@ (define-module (gnu packages games) #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 87f184fb14..b717c3ad27 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Danny Milosavljevic +;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 HiPhish ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Oleg Pykhalov @@ -99,6 +100,36 @@ (define-public go-golang-org-x-exp @code{old} directory) packages.") (license license:bsd-3))) +(define-public go-golang-org-x-image + (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") + (revision "1")) + (package + (name "go-golang-org-x-image") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/image") + (commit commit))) + (file-name (string-append "go.googlesource.com-image-" + version "-checkout")) + (sha256 + (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/image" + ;; Source-only package + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build)))) + (home-page "https://go.googlesource.com/image") + (synopsis "Supplemental Go image libraries") + (description "This package provides supplemental Go libraries for image +processing.") + (license license:bsd-3)))) + (define-public go-golang-org-x-mod (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4c2781bf45..0437b4e83d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3488,36 +3488,6 @@ (define-public gopls editor.") (license license:bsd-3))) -(define-public go-golang-org-x-image - (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") - (revision "1")) - (package - (name "go-golang-org-x-image") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/image") - (commit commit))) - (file-name (string-append "go.googlesource.com-image-" - version "-checkout")) - (sha256 - (base32 - "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/image" - ; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))) - (home-page "https://go.googlesource.com/image") - (synopsis "Supplemental Go image libraries") - (description "This package provides supplemental Go libraries for image -processing.") - (license license:bsd-3)))) - (define-public go-golang-org-x-oauth2 (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33") (revision "1"))