From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4LRNJ49anmGEKQEAgWs5BA (envelope-from ) for ; Wed, 24 Nov 2021 16:30:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QD/5Io9anmFqcwAAB5/wlQ (envelope-from ) for ; Wed, 24 Nov 2021 15:30:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1D69826F27 for ; Wed, 24 Nov 2021 16:30:23 +0100 (CET) Received: from localhost ([::1]:35492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpuE1-0003VP-IN for larch@yhetil.org; Wed, 24 Nov 2021 10:30:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpuDi-0003V2-Ok for guix-patches@gnu.org; Wed, 24 Nov 2021 10:30:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpuDi-0001Q4-GL for guix-patches@gnu.org; Wed, 24 Nov 2021 10:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpuDi-0002hu-CB for guix-patches@gnu.org; Wed, 24 Nov 2021 10:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52079] [PATCH] gnu: Add conflict. Resent-From: Foo Chuan Wei Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Nov 2021 15:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52079 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52079@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163776778310353 (code B ref -1); Wed, 24 Nov 2021 15:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Nov 2021 15:29:43 +0000 Received: from localhost ([127.0.0.1]:54733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpuDO-0002gv-Mw for submit@debbugs.gnu.org; Wed, 24 Nov 2021 10:29:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:37130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpuDM-0002gn-J7 for submit@debbugs.gnu.org; Wed, 24 Nov 2021 10:29:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpuDM-0003RU-DU for guix-patches@gnu.org; Wed, 24 Nov 2021 10:29:40 -0500 Received: from [2a01:111:f400:feab::81f] (port=39649 helo=APC01-SG2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpuDJ-0001M0-NT for guix-patches@gnu.org; Wed, 24 Nov 2021 10:29:40 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aPjty9GbjvnZuflwVT2lWl9Qd/moTTKZlqppefEA32GFi3njYkebt9TtyVO2fRPlaoExuP7OKprEPAyfu6pECMloZsNPydhhnGEVXPkJt60ziPzjCLeO+TODPuGneV5JhV35I6ukfKrioVRFIZ6qIhBkmEadyHCCjN588lZqBAk10/yaKHcngn2g8W886pPbtd3CL7OQgDVjeok9IbYjfKKObioTC4b+anUju1XCf15zyO5X6WaXm0xnnZ6Xgl0R7HsAs+0q8I9ZKA24U7M+FpbJybx5A8CvXalllV6Y/igaSKdsWuLz2+NLVllEIsZBAJoHxzf92G3bcmKKPi40xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CtIZi3pZeW/w6oTSNHL00kjLrpA4lf6aDxtZjNShOHY=; b=NA6XIze0cbClTCcsm4sXn3N67viAQE8LkWl5zUxRvskN2DU5q/O9WBUT0Xm/G4/NHJ2GymRkoAKnzHuswXQ5UOISirPfUiLGRnoaVCF5CPM7RY2Q3K781/ujuAGbqRMBQ0Z1fS0/VqbREHFGQHDroUpojEhUl60KaH5vNTC9k69oGDvWb96dp2vYOJ120rtb4c1mZ7m+wfbSV4etMhPf0f27Qp4cSpDV8edAeHuBbquMP8VvRLIgqMMMupeub/fVQLs4uAExSDY26eNu6nHh8yQUFpWAwbyemoB6LBrwTmJiWj+Xt1Eg/QuRpBgu0vfPKto/9+FQMpPhn9ZEzuUC8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CtIZi3pZeW/w6oTSNHL00kjLrpA4lf6aDxtZjNShOHY=; b=plEAlviufbtk1lmdFkbint2xKlPz2rDbikMYe7O7MILCeDxWsl6CwVn+BmqEN+YZQveXQkuRMu3EGxO5hBXqxNAQfwlDQepcq3Y01Znv7VAu2gWKMm55wXW5o5/rJJQiFFKtbOM5a46p5YvQb30//0UiQf6t6nmAWL9IyBl6RNNxfGKe+MWOmOHfUucPcQJqhn0nUAWtLIPuy4EPCiwtzf8BxahZjvBm9TDBzlD13qUZTTywFIP42plQH2Bm1ybL8Hn72s3SXZqewpMdu2enIyhYMKvhLdWaPUbqZMsQCcA2VBplqThcQ3giUArnKfPHF4FfQlzXS5jCFb/zL82uHg== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by PS2PR01MB2280.apcprd01.prod.exchangelabs.com (2603:1096:300:39::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21; Wed, 24 Nov 2021 15:24:28 +0000 Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::258d:e124:fd3a:40ee]) by PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::258d:e124:fd3a:40ee%7]) with mapi id 15.20.4713.026; Wed, 24 Nov 2021 15:24:28 +0000 Date: Wed, 24 Nov 2021 15:24:25 +0000 From: Foo Chuan Wei Message-ID: Mail-Followup-To: guix-patches@gnu.org Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-TMN: [FYDLpcX8iKBn+XWJymdn5g/S1L/n1IPN] X-ClientProxiedBy: HK0PR01CA0064.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::28) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20211124152425.ovcps4hte3v6k36k@main> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from main (202.160.36.38) by HK0PR01CA0064.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Wed, 24 Nov 2021 15:24:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 802d554c-6086-4f7f-0dd0-08d9af5e8142 X-MS-TrafficTypeDiagnostic: PS2PR01MB2280: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RhWj67c5Gj7+vXWOnMZ02/EEE8aN7naSJqDcSlLbo6/Gr/EXjsFHSZjz0LO1+nSLPaNK74MqkF2mRVENm0q2rj0bWn4MJrw+GyW/J3XP4YuZFYydi0OibndsetiOBtdh9Oy44INxHjHObZW/ZWXrWKxMZmuk720Ocj7K3yBcrTDW6aS9hdlG3Rsd8tdkb9XErkX+nvP6XdQMh0jicbbiRa/b2CTZo8QpkAiSPwz0uPldFfRS/zlVCFs4Tj1uaPatK212clNMPcqO+ZbTLFt1Wp4DvGMa1biPWlCqb19y2sxuaJwiN8gkXXj1S7efCyLnC/HwYMhxlORRDrzW2GX2kANyAzKVCu9VZZyE5lk97hPu9d3Doq+QygcGkfFmi7emTvmHbfe2aaRFcEQK4GghvO2YrxcI3Vq8zVoJgZBWmfAm8TCBsGhs/WO8LFs4IumVWMV4mGbt5BPiR8QldK526CrnaFkRqhNxKIDQceU5kubxuA5g6ZKmFxEIlizJ1qeWzfPdLzypUo/K6ufrKr6w3LtMfKDrrP1776VFaUqHTokzD0jyR6+5xv9OFV1Qi7n2GHQrgaAzsFsh/yqh/ZX6FMYjLTdD3kbd0HvHTEVeZU87hEBU9ari6N1EGvkCQ7UO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2hOOPo4UBZKeEHazSapxCjFR4k6fVSPCxy1qCnrT9E7fQTSOc4omSvdFHC68ANrhZulobTxQU/zh6IRYrfxJajIzj8TqiPEvWNweCp43OgBhO1Cg7w8/0+UA3J7mP3V6ceJWaj8xlEZgauIFKx1YdZIQp5qZCMxxl7cb9U/ece26e1m3r+URDV01d0IBcJDOXDz//HyeJxlAaadfubvbOh3C8OcKD5xNuUnJCGDELoY8OS3HEpSTe+kMeksY+AiOelBpL5bpCU7Ufu2UKLIXqgF5L53s7DAc5wDqLUraivu4Xf4sYdt9HCq64uAqGHPjFigWYbCJu4NhsYIEf2IJjVRQyMFIHdl9QcgWrQuibJxVi0px5/eryWXJBs+3s9tnRJSyY2Th+i4yJCvouOlklNRAr6HOgVqCBIoa0aE8wFF/09ikHXg7XhCmGRH4u9aGr/hb56XBq/rYSRkWNDW2TLt+eLgpgkNUOJwA57OaQkNXhWtvP4p5znK0MA+QlaF9of7KFcS8Tljd4fyesz4q7qXeLQ1wRkk/mfBHmdB5J2VgVKGuvDcyp1MjoggcWpDxpJRvkZKRa/QWwg5Y8S7pxuiGaHDtxS3WBD/D/4sB+d3axuERYviudcs1T6ZvRmQKF/JgH18fZkMhD1f0XR+TakTTyNugsjaHcuM14yTPnwoDjGMP+ySpCuzmLopfzSeSNz8XJzFFyDIl7a5lDKPXqQ== X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-5c337.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 802d554c-6086-4f7f-0dd0-08d9af5e8142 X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 15:24:28.4609 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS2PR01MB2280 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:111:f400:feab::81f (failed) Received-SPF: pass client-ip=2a01:111:f400:feab::81f; envelope-from=chuanwei.foo@hotmail.com; helo=APC01-SG2-obe.outbound.protection.outlook.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637767823; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=CtIZi3pZeW/w6oTSNHL00kjLrpA4lf6aDxtZjNShOHY=; b=kJn+eifhfl8k72oshjXl9hAaVt6OybpkUlXxWaVx1u+r59EioAUmxRcUfc4um+Uc1FYMNl 0XyZ8dBnGMTEdLEHzt7h0PuajBcg07BzQf5HelJPu6PwWusyV9vIs+6tVNo2yzxGnRAir9 unsSBKel+8UGfrZ9xDdmG1gsO2LY0Kgl1AAMDwtSvbGvFBWV2sPV7MkeW5qBQrFYRblQB5 gf5YuCmRt0eXwuMpI5s09pfHL8o8bg5XBRLJL4E8x6SLH/g0POwdPmWcAYHP7XluxIBK1x J1PfeloG8esQrKdilllT0CkX62I2yK2cBuO5+uQW81WouhLmPTdqEkSzaTzP1g== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1637767823; a=rsa-sha256; cv=fail; b=kmM28N4spXLYebJYoqnQpyyXyEZ0GuOOknhDlWrGcoqDjH9D4JZjz70liskFsU1xbPXP6o U2ncwb2Zp1Rzkem4/V6CXWMVeKF9UJBY2jlMyk00sTgHTZqD3cFVVOWY+g+wGzLvHKod7J Z0UM4gPDITdZoawM3WrqiD8VObJNg+W7vGcgq0YAMF9VMvx61YBqqh118Z17U04BdEZ9w6 2pyn8mMPlsEaLpnG2pyFfrncJZdHHiT4/HX/VF/o72p0kUlZS5TcxqbiPOyVppXMI3w6Xa 9Va6yREBpYxaagmlpgK0AHU3+fGzCqBiaUacsBCZUSuPgBq1t7Clt2Y/FgzDEw== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=hotmail.com header.s=selector1 header.b=plEAlviu; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=hotmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=hotmail.com header.s=selector1 header.b=plEAlviu; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=hotmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1D69826F27 X-Spam-Score: 0.01 X-Migadu-Scanner: scn1.migadu.com X-TUID: xQ3O4z+Ha7jD * gnu/packages/shellutils.scm (conflict): New variable. --- gnu/packages/shellutils.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 70443f5019..4e24a80cef 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -514,6 +514,35 @@ (define-public rig city, state, zip, or area code, it will check out.") (license license:gpl2+))) +(define-public conflict + (package + (name "conflict") + (version "20210108") + (source (origin + (method url-fetch) + (uri (string-append + "https://invisible-mirror.net/archives/conflict/conflict-" + version ".tgz")) + (sha256 + (base32 + "0mls4climvp7v9hnc3zh01mh270kqcj797ng0xslwb027lipis4h")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "run_test.sh" + (("PATH=\".:\\$BIN:/bin\"") + "PATH=\".:$BIN:$PATH\""))))))) + (home-page "https://invisible-island.net/conflict/conflict.html") + (synopsis "Displays conflicting filenames in your execution path") + (description + "@code{conflict} examines the user-specifiable list of programs, looking +for instances in the user's path which conflict (i.e., the name appears in more +than one point in the path).") + (license (license:x11-style "file://COPYING")))) + (define-public renameutils (package (name "renameutils") base-commit: 8452c5d1f44b6fb6456409d9c51a3a32a7860b9c -- 2.34.0