From patchwork Thu Apr 18 19:42:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 26180 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 5278727BBEB; Thu, 18 Apr 2024 20:44:21 +0100 (BST) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 E0D2227BBEA for ; Thu, 18 Apr 2024 20:44:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxXfm-0005y7-3f; Thu, 18 Apr 2024 15:43:54 -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 1rxXfi-0005xT-Do for guix-patches@gnu.org; Thu, 18 Apr 2024 15:43:50 -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 1rxXfi-0001z5-6R for guix-patches@gnu.org; Thu, 18 Apr 2024 15:43:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxXfv-0001X8-QK for guix-patches@gnu.org; Thu, 18 Apr 2024 15:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70428] [PATCH 1/2] gnu: diffoscope: Update to 264. References: <8734rl2fhz.fsf@wireframe> In-Reply-To: <8734rl2fhz.fsf@wireframe> Resent-From: vagrant@reproducible-builds.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Apr 2024 19:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 70428@debbugs.gnu.org Cc: vagrant@reproducible-builds.org Received: via spool by 70428-submit@debbugs.gnu.org id=B70428.17134693925528 (code B ref 70428); Thu, 18 Apr 2024 19:44:03 +0000 Received: (at 70428) by debbugs.gnu.org; 18 Apr 2024 19:43:12 +0000 Received: from localhost ([127.0.0.1]:54265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxXf3-0001Qf-T5 for submit@debbugs.gnu.org; Thu, 18 Apr 2024 15:43:11 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:52410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxXez-0001Op-Lz for 70428@debbugs.gnu.org; Thu, 18 Apr 2024 15:43:06 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id D95C71AD16; Thu, 18 Apr 2024 12:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1713469363; bh=HdY/WNuH6bXuvT8iYogZ2Sr6DMr5geFiPyuR0y6R/tg=; h=From:To:Cc:Subject:Date:From; b=IZARRQ0sQowDyZ3lcQ4oToWyjd+VI3onnwN3Gqzavsfuh30epAoTB71NbZN1ILoFO hUb8p6jhU+15ZvET8V3QcNVD4blC3iEPxr69PIAryofzTRD1yGXiBPXpbK/1/AF5Tz mP3gdNj5izpAgpyj9OM+g8QyAJUUr9lxiN64RHCOcyXKQYJ5wOzDNSrBccjTzZF1Q+ cDDW+kBcjaJlttBglXXqR4XUpbZo0bhuhrsb114STT88CBeSjhzwqghq+/J4IjbZOL SKkGkgalkKzwuHIYFxIMUpCO4n8pXvpA1/NT7eXFRlLCc8qruJlgwXyXJhA5psYKSB ubw5W2qQ4T1Gg== From: vagrant@reproducible-builds.org Date: Thu, 18 Apr 2024 12:42:32 -0700 Message-Id: <20240418194233.192105-1-vagrant@reproducible-builds.org> X-Mailer: git-send-email 2.39.2 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 From: Vagrant Cascadian * gnu/packages/diffoscope.scm (diffoscope): Update to 264. [native-inputs]: Fix architecture specific conditional for "enjarify" --- gnu/packages/diffoscope.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 65e8472a4b6fc6f66871ba0dad518b7d4c63595e diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 8106a6d258..fbcf3a36f2 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "263") + (version "264") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4")))) + (base32 "1m2jrg0y283m07gml7nd6fy4x827i93bj23varjn3add4kixxr57")))) (build-system python-build-system) (arguments (list @@ -233,9 +233,9 @@ (define (bin command) ;; openjdk and dependent packages are only ;; available on x86_64 currently. ((or "x86_64-linux") - (list enjarify) ;; No unversioned openjdk available. - (list `(,openjdk12 "jdk"))) + (list `(,openjdk12 "jdk") + enjarify)) (_ '())))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth")