From patchwork Sun Mar 24 00:37:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62197 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 9E76127BBEA; Sun, 24 Mar 2024 00:39:48 +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 DF17F27BBE2 for ; Sun, 24 Mar 2024 00:39:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roBtV-0001ap-9a; Sat, 23 Mar 2024 20:39:25 -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 1roBtU-0001aN-3c for guix-patches@gnu.org; Sat, 23 Mar 2024 20:39:24 -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 1roBtT-0001GH-P1 for guix-patches@gnu.org; Sat, 23 Mar 2024 20:39:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roBu9-0004hd-46 for guix-patches@gnu.org; Sat, 23 Mar 2024 20:40:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69969] [PATCH 12/12] gnu: clipman: Refresh package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 00:40:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69969@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 69969-submit@debbugs.gnu.org id=B69969.171124080018034 (code B ref 69969); Sun, 24 Mar 2024 00:40:05 +0000 Received: (at 69969) by debbugs.gnu.org; 24 Mar 2024 00:40:00 +0000 Received: from localhost ([127.0.0.1]:36742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roBu3-0004gh-PT for submit@debbugs.gnu.org; Sat, 23 Mar 2024 20:40:00 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:50637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roBu0-0004fe-JL for 69969@debbugs.gnu.org; Sat, 23 Mar 2024 20:39:56 -0400 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-33ecb04e018so2197518f8f.1 for <69969@debbugs.gnu.org>; Sat, 23 Mar 2024 17:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711240689; x=1711845489; 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=Up7sQhh/PHwzW8Eo98HaZgm9i0s6zo6zBJ3n/SNHmaY=; b=H/9aWk7C7CKrAODfxEyLF0wt07l4kiSNCCTyhTzg+G39sey4oYQULZrdSwRtUj+huv qRsJxjsO6PR1L6IFRWACSlEECLmWffSqLDnjVDcrqBk3S6PlRb48JQktG2FA5n44vzs6 Sg8IrO5EPZluxdnVOSxvfsIcU+Ma62G5N3hI9KtUJF8dIOJ/JsuQIuRIk2k9dxrHAxNc fEgnLLFjrigAqknsE2yN/pnvrFiVuW+ol9ImnpPp3bPpbf7zaOi5DNndcW9VAgFPTE/q vlUFxrmlRPWhINTGIfEIVkPUe9QLn4DRU9s8TE3KPkZ7oX6+s78JAyx3xr+sYmSpUReh X7pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711240689; x=1711845489; 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=Up7sQhh/PHwzW8Eo98HaZgm9i0s6zo6zBJ3n/SNHmaY=; b=mYPzznOMUNfboR4fI/OHpKgxQQVDoDX9PY/lmaK97Vfca8i/SYM7drvpyEMPiyzA7D zeh3GrIy/7trEECnyrSxQyhHTvnqSBNSA1sTx3BxKXjvAYeMGLw28lb/vcemst+DQylv t5o+EyKy0RKV+XRlrpT0vbVI8x5sCc24RedOB0Q+DJ6TkFYAwRmBYo3+WDiHjdnsshwx FhGualQTl6tlQIn1Xgz1QTvLmj0bJ0URJ+LqPPhKbfqMO5HLo8eG4QYRsefq6JYYB4kN 5UfY76YK0Ny2Z0Ma13rK5a9RfZqlyJOTSttpNBu2+h0log2Udbfe58hcAg1KtK1YYoDR 2Nrw== X-Gm-Message-State: AOJu0YyEaEIEIfrf5golsgXC4GQmS1fg1pcx68Pr1acEKu2MXZpUmcHo 0rMK93nyLL0IvzUcSd5trj71xCYg1+drFAJfunXlYY9WB6ejrUDb8XguoZc4Mjk= X-Google-Smtp-Source: AGHT+IFZW2LNrq76e1NntGOzdphBxoxWbp9LRcf83OviTHiBRkGt4bgxsxu7QzQ7HTPA9hj4CmOUsQ== X-Received: by 2002:a5d:4d0e:0:b0:33e:9dff:a3f7 with SMTP id z14-20020a5d4d0e000000b0033e9dffa3f7mr2445455wrt.62.1711240689482; Sat, 23 Mar 2024 17:38:09 -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 c10-20020adffb4a000000b0034174566ec4sm5512167wrs.16.2024.03.23.17.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 17:38:09 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 24 Mar 2024 00:37:56 +0000 Message-ID: <0618ca4340787ea5b4124e8cd6576548156c7ba5.1711239854.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/xdisorg.scm (clipman): Adjust indentation. [arguments] <#:phases>: Rename 'patch to 'patch-wl-copy-path phase to reflect the purpose. Revert default 'install-license-files phase. [native-inputs]: Remove go-github-com-alecthomas-template and go-github-com-alecthomas-units, they are propagated from go-gopkg-in-alecthomas-kingpin-v2. Change-Id: I5332906c126904ced595aa322be5f933c305c5f7 --- gnu/packages/xdisorg.scm | 47 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 025f1c5939..17a24f792d 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3224,31 +3224,32 @@ (define-public clipman (package (name "clipman") (version "1.6.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chmouel/clipman") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 - "033l2hy46r2zjy8dllcmkjxidhnqac9kfh4wkq9hfvim9imp5a4m")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chmouel/clipman") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "033l2hy46r2zjy8dllcmkjxidhnqac9kfh4wkq9hfvim9imp5a4m")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/yory8/clipman" - #:install-source? #f - #:phases #~(modify-phases %standard-phases - (add-before 'build 'patch - (lambda _ - (substitute* "src/github.com/yory8/clipman/main.go" - (("\"wl-copy\"") - (string-append "\"" (which "wl-copy") "\""))))) - (delete 'install-license-files)))) - (native-inputs (list go-github-com-alecthomas-template - go-github-com-alecthomas-units)) - (inputs (list go-github-com-kballard-go-shellquote - go-gopkg-in-alecthomas-kingpin-v2 - libnotify - wl-clipboard)) + (list + #:import-path "github.com/yory8/clipman" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-wl-copy-path + (lambda _ + (substitute* "src/github.com/yory8/clipman/main.go" + (("\"wl-copy\"") + (string-append "\"" (which "wl-copy") "\"")))))))) + (inputs + (list go-github-com-kballard-go-shellquote + go-gopkg-in-alecthomas-kingpin-v2 + libnotify + wl-clipboard)) (synopsis "Basic clipboard manager with support for persisting copy buffers") (description "A clipboard manager for Wayland that relies on an external selector,