From patchwork Fri Apr 19 19:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 63165 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 1C8EF27BBEB; Fri, 19 Apr 2024 20:33:02 +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=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 7A86E27BBE9 for ; Fri, 19 Apr 2024 20:33:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxtyd-0006eM-Re; Fri, 19 Apr 2024 15:32:51 -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 1rxtya-0006dy-TL for guix-patches@gnu.org; Fri, 19 Apr 2024 15:32:49 -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 1rxtya-0000F0-Kz for guix-patches@gnu.org; Fri, 19 Apr 2024 15:32:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxtyo-0001qm-Ld for guix-patches@gnu.org; Fri, 19 Apr 2024 15:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70428] [PATCH 2/2] gnu: diffoscope: Update to 265. Resent-From: vagrant@reproducible-builds.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2024 19:33:02 +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.17135551276739 (code B ref 70428); Fri, 19 Apr 2024 19:33:02 +0000 Received: (at 70428) by debbugs.gnu.org; 19 Apr 2024 19:32:07 +0000 Received: from localhost ([127.0.0.1]:59971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxtxt-0001kP-Lc for submit@debbugs.gnu.org; Fri, 19 Apr 2024 15:32:06 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:42718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxtxi-0001hg-5N for 70428@debbugs.gnu.org; Fri, 19 Apr 2024 15:31:55 -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 2138E1AD53; Fri, 19 Apr 2024 12:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1713555091; bh=NCDAcLJVW7J6wb0HlE6O5C92J1Lh/JRSiJIC0iWuQPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vBuT6ehPCVKTWU+8Syg+ZFTcuzj5m4FynYS1wJUoUDmwDCSCEgKRVGpr9DpZ2wd3c +uSp024xAYRb85qGYdXm6o+wIQrIXwz/IwlwOAffjtNOtC7YMBdGnQ9tF4d2Qmgt8T fHj+OQY+jeZ6dMxRqCKlOR48N1Nj4ccNtZMLQsIOn9WOU8kL2n5LuXkztTt5rKcdw7 L7E9itJK8MvZYQ1DaQc8BfBhdtP6HEAgOFxzuElROaUksjMhE2bUgjO4T0KxYUL9bD pu4DVoTUA9d5EetaRn71EjVYPEMtuqs3QPHysV1tynvPtxKqJqVa1l7ddPVTumwdxf bFrUk2Ik4waBQ== From: vagrant@reproducible-builds.org Date: Fri, 19 Apr 2024 12:31:17 -0700 Message-Id: <20240419193117.425782-2-vagrant@reproducible-builds.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419193117.425782-1-vagrant@reproducible-builds.org> References: <20240419193117.425782-1-vagrant@reproducible-builds.org> 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 265. [native-inputs]: Fix architecture specific conditional for "enjarify" --- gnu/packages/diffoscope.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index d97ce5dda2..fd2146456d 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 "265") (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 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg")))) (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")