From patchwork Sat Jul 16 18:24:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40693 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 4102F27BBEA; Sat, 16 Jul 2022 19:33:23 +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 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 0A51D27BBE9 for ; Sat, 16 Jul 2022 19:33:23 +0100 (BST) Received: from localhost ([::1]:35204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbS-000090-5C for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTO-00062l-Q5 for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTO-0002LB-Hh for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTO-00036L-A4 for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 1/8] gnu: clojure-tools-cli: Update to 1.0.206.--- Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799585511770 (code B ref 56604); Sat, 16 Jul 2022 18:25:02 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:15 +0000 Received: from localhost ([127.0.0.1]:46031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSc-00033m-PB for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:14 -0400 Received: from mail-ej1-f50.google.com ([209.85.218.50]:46875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSa-00033V-EW for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:12 -0400 Received: by mail-ej1-f50.google.com with SMTP id ez10so14253921ejc.13 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=Gw29KlaIuxQLm8W16CtBeadmWe9p03ZplnUAsifF59E=; b=ZxoPSZ/HDRxrLJBivgvqIO2qq8BUYJqHfpGkpZHZRsq6jmLScU8+hOq1a2yJoHtk7W /6dCvPxS42URt18jmK0N0G7U3gAMp+Ju08wkIduU7R8i2ctuy3iuSVmPr+KVpiixFmwI KDOU9bJg71TYy9NI5Rnv3e2Wfmpa9tQXaKilxcjUWayH10KF1L2jHjnxJKgZSfqMkBND zKWR6YDKgjhPDuoa2p1jDkmwHOpyuvFf3piV7PpcqOJmcoyYZxnnknO3bpC7nEpyxnSm 9kDizjvAvhTrKT8wLZiy1mSOX/7J/yuIiB8WFrnG7q22utZgv8lasOEUjTa8EHs+2+UR iqEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=Gw29KlaIuxQLm8W16CtBeadmWe9p03ZplnUAsifF59E=; b=a7JPt1j5DhiJoibNl4PPmlRFghXyz2E+8w4K5/u6mD7jMoOZUNSN/iEX8OW0pdgTc7 KCp55/AMIQIiO7bkoSvlJdcZDJUgQ0AjTz1neu3vVwF74yTA3wE1v6ZVr6DEnKqxD+f3 MYoMCDVCE/jkH5ach+3ipPl2ELMScPIP+bmsmkKb/viZR+/NH/xbshXRI1zUALhlHKQ2 R5CLDFHBHfSO9XpsNLq7utjH2IPmwiKZFogfEoHWhsWkfI9+44AZJ8hqufH18Cbh5+KE pre6NaHPaNjGNptPQAerbOZpStuWkDp7qdIgYp2JGare0bzjifXwuEZieC2oytNWM7r9 HlTQ== X-Gm-Message-State: AJIora/2AHBda/lJlSx/icASSlanCNtkogC7Fi8bOZRTC/djeK26yTvo EJaci9EYpM8M8MG8m7ZXoI+g/vVY0yT5+HVU X-Google-Smtp-Source: AGRyM1sk/iZ6ONdNTiMroRORsxmlKULdJKdIKjSJWnLD8NWldw0EfGMJZ3srJpCzIXUE3nLmjq86wA== X-Received: by 2002:a17:907:2cf5:b0:72b:7656:f162 with SMTP id hz21-20020a1709072cf500b0072b7656f162mr18193761ejc.565.1657995846070; Sat, 16 Jul 2022 11:24:06 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id o20-20020aa7c7d4000000b0043a587eb95dsm5151988eds.5.2022.07.16.11.24.05 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:05 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: <275e358571b6709a51f7ded2db64b12399155f0b.1657994905.git.roman@burningswell.com> Date: Sat, 16 Jul 2022 20:24:04 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index e6eb749501..0a30e1752a 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -457,7 +457,7 @@ (define-public clojure-tools-macro (define-public clojure-tools-cli (package (name "clojure-tools-cli") - (version "0.4.2") + (version "1.0.206") (home-page "https://github.com/clojure/tools.cli") (source (origin (method git-fetch) @@ -466,7 +466,7 @@ (define-public clojure-tools-cli (commit (string-append "tools.cli-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1yqlm8lwbcjm0dp032z7vzc4bdlmc4jixznvf4adsqhvqw85hvj2")))) + (base32 "1hvk5zacl3fr8lfcbfgckaicqjx697j0kzw2x5hwj8j5xlr8ri2r")))) (build-system clojure-build-system) (arguments '(#:source-dirs '("src/main/clojure/") From patchwork Sat Jul 16 18:24:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40694 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 30ED027BBEA; Sat, 16 Jul 2022 19:33:24 +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 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 E93A627BBE9 for ; Sat, 16 Jul 2022 19:33:23 +0100 (BST) Received: from localhost ([::1]:35312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbT-0000EA-20 for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTP-00062s-9Z for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTO-0002NT-V6 for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTO-00036T-RU for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 2/8] gnu: clojure-tools-gitlibs: Update to 2.4.181.--- Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799585911788 (code B ref 56604); Sat, 16 Jul 2022 18:25:02 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:19 +0000 Received: from localhost ([127.0.0.1]:46034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSh-000344-2l for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:19 -0400 Received: from mail-ej1-f45.google.com ([209.85.218.45]:36415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSe-00033b-C4 for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:17 -0400 Received: by mail-ej1-f45.google.com with SMTP id mf4so14328062ejc.3 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=xaoXQPCXSzxh+p4HgSvKf1GHsXowTB+f/7kKQt+Xl6s=; b=NworMEgYM/jenORxFT73jadQWr7NwqzH8eWO3KObcjg+GPHVZ0VRQ85PrAAhXhMtsx woM3EMdw+NxjfHnqKoa1Q5YAGUYs3lEoGgI2o8JfvUSX+GPItOaIBZQm4Kcis2onShc0 oIoiDiT2vGX4Nc8NnIrP3O870OWYpO/1gPwSECxkU8ja3zReu4H4syhHLHRTTzhFHZHg s0Pz/2hht7bPC5Id8iyR7Gp2ahHIbS9UmEXzWpuoBazkfL+kSVdthmqZf/cntXAlsa3e EH2T90AcsRD2YxXiSiKpuxllkxq+yq6jGA7OCjR1P3Sy/J2rmv50jNJ9zVg36U6NMK4k SMzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=xaoXQPCXSzxh+p4HgSvKf1GHsXowTB+f/7kKQt+Xl6s=; b=0UmokF1lIypraUFUCo4cL61G/akZW2hG+d9E4SHc10zDfR/dHbAR8P6Bs2kh6MuMZe 2NKle7CG60crBEXME4iYugqZIkxBpttkHdeAwljyvA52KVrPpGeESBGJbPXvfQ4LcaIj 7O+GsEzRGLfhKUUrJL0tr5ur15/CszOOLcPjQc76ZxnKsTMlGBI3pqrFfusNXXRDYu0h igdYWdVW8GJoQW93TUfR0JIXczNfQKyHB2J5fY0gFnHLG9AJOfjRaijuICYDBRN4Nxsx 8O0bdyJBJ30N8TQ2YqTMoCy0YrZcox119gz7QLK1lNVrkjPpj+uYgEgpZ2ArN26iXKr0 FywQ== X-Gm-Message-State: AJIora8Mwaoi3mGClvpfGHFw6nOrBuwa+cUOJ9FKEyO7+mjUJcDl9W4w UmzCwTIswB43R1QazdCDyyS0n+VUUu4qc/US X-Google-Smtp-Source: AGRyM1tyj9hEl/Eu+hI6rqTyzSUSsTy6ld3ymOJ6CjZJlDXMxSEP43dcsoqyd/zQniJh6o3UJClN/w== X-Received: by 2002:a17:907:28c9:b0:72b:6912:5453 with SMTP id en9-20020a17090728c900b0072b69125453mr18551731ejc.419.1657995850531; Sat, 16 Jul 2022 11:24:10 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id q10-20020a1709063d4a00b0072b3182368fsm3445503ejf.77.2022.07.16.11.24.09 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:10 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: <98d11e82764d191ede5a3e0e1791d59aba98e619.1657994905.git.roman@burningswell.com> Date: Sat, 16 Jul 2022 20:24:09 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 0a30e1752a..494ac25fc4 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -543,7 +543,7 @@ (define-public clojure-tools-deps-alpha (define-public clojure-tools-gitlibs (package (name "clojure-tools-gitlibs") - (version "2.4.172") + (version "2.4.181") (home-page "https://github.com/clojure/tools.gitlibs") (source (origin (method git-fetch) @@ -553,7 +553,7 @@ (define-public clojure-tools-gitlibs (file-name (git-file-name name version)) (sha256 (base32 - "19d83wigmigy66f5i61a3ishg7zrlv8jngj8m9brsh9v38a0fwdr")))) + "1d8c79f33axghadwqa955yjfsxa6fgl8jq4nfll2zrp6sjw0597k")))) (build-system clojure-build-system) (arguments '(#:source-dirs '("src/main/clojure") From patchwork Sat Jul 16 18:24:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40695 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 68DB327BBEA; Sat, 16 Jul 2022 19:33:35 +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 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 32B4827BBE9 for ; Sat, 16 Jul 2022 19:33:35 +0100 (BST) Received: from localhost ([::1]:35770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbe-0000Y1-B8 for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTP-00062t-NO for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTP-0002SH-Eh for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTP-00036c-BJ for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 3/8] gnu: clojure-tools-deps-alpha: Update to 0.14.1212.--- Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799586111803 (code B ref 56604); Sat, 16 Jul 2022 18:25:03 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:21 +0000 Received: from localhost ([127.0.0.1]:46037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSj-00034J-E7 for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:21 -0400 Received: from mail-ed1-f50.google.com ([209.85.208.50]:40460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSh-00033l-R2 for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:20 -0400 Received: by mail-ed1-f50.google.com with SMTP id r6so10172372edd.7 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=/x52E0CF0KJr5+JDfUZLcJ79ZQtdqpUQ37W4vPv9fl4=; b=X77iXIHZSsn4JEDF0b+hYzkj92Gd/95T5vL0BLSwJSJ7q+DPoY4IUvOZWR+Wwaha5M 4D2EwsjoJvmeOs/esZKUzU3w5U/gIniRyQLzCAJaLtbLEvUzYSDn9fyWLZkPQsjK7HGW dVQj0QthP10vbLBA+UQzOY2s1XV30NtK60VRl0DUynht+tN/UfRax0Z6SBbn3jBKisFb AO98QJ4WrESAKK87JTkNS2x979qOrMttPPLjYFxzdrSgoQv8mGsw1lsF2XVlnEuqhUxV YMG9/7nLAWgsQ5kgXgfzf/lnoQxrWz2NJpyFHIjpQNJJQuXc24sQokLos7j3W6FDMlFt G+gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=/x52E0CF0KJr5+JDfUZLcJ79ZQtdqpUQ37W4vPv9fl4=; b=TLSOTQkgAyYBDBnNnydHKz4oCQShyaUEmPmQOPIAVYwkLC8kJDsZf59YX6B2GNWbim 5Ck8ryZAIHr3wDrskDMtLXj4xVRQCHAdVNFXreVtgj4WVfdudXBZPL605r/6GRd2W7lf m5U8aY887QbvmuLcmnSfz/5L4PQmHI5fAmS858iKTm2WuxLdKGp+qcKu17ioWXdD8a1s 0zzh+B+0v+8b9Bg8+EcRhmes4+qmf5Y23lT4w/XwjeIkD3v6srdz0yq0yqmTj/ujFwwx e0YZegeM1eL0OWEVE+dOA/Nb2tOa6mjvEaQokQAVWAZds86yL1mm/UuQVDPtlbss+mIi 8LHw== X-Gm-Message-State: AJIora9NmZejcFXLK4aB0LBBsH5dmOaKdRb9cqwL/HI1FnNn33DMRutM pkol5QvRGXA3qOLWtYqkmmrUBdzKYBho4FFV X-Google-Smtp-Source: AGRyM1t7XQWcJHAZR16pVI4El/tkkL0Lb4INLL9a2+zGNesem1HGAyfldntJExirN3y7DDnPM5nOIA== X-Received: by 2002:aa7:cac7:0:b0:43a:c5ba:24a6 with SMTP id l7-20020aa7cac7000000b0043ac5ba24a6mr26640316edt.84.1657995853924; Sat, 16 Jul 2022 11:24:13 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id j22-20020a170906051600b0072b36cbcdaasm3431654eja.92.2022.07.16.11.24.13 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:13 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: Date: Sat, 16 Jul 2022 20:24:12 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 494ac25fc4..d33ee4f708 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -481,7 +481,7 @@ (define-public clojure-tools-cli (define-public clojure-tools-deps-alpha (package (name "clojure-tools-deps-alpha") - (version "0.12.1104") + (version "0.14.1212") (home-page "https://github.com/clojure/tools.deps.alpha") (source (origin (method git-fetch) @@ -491,7 +491,7 @@ (define-public clojure-tools-deps-alpha (file-name (git-file-name name version)) (sha256 (base32 - "174m83n5m3arai2vbg434zjibbsr3r4pp7lz3adja8lxq7g21r80")))) + "0r8qfihii6cf95kl86x6zfldnm7wlkgda2qmq3340j1x03v244dd")))) (build-system clojure-build-system) (arguments `(#:source-dirs '("src/main/clojure" "src/main/resources") From patchwork Sat Jul 16 18:24:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40692 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 E8DBE27BBE9; Sat, 16 Jul 2022 19:33:16 +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 D142727BBEC for ; Sat, 16 Jul 2022 19:33:14 +0100 (BST) Received: from localhost ([::1]:34410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbJ-00082o-Sa for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTQ-00063R-9X for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTP-0002Vo-Tx for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTP-00036k-PT for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 4/8] gnu: clojure-tools: Update to 1.11.1.1149.--- Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799586511820 (code B ref 56604); Sat, 16 Jul 2022 18:25:03 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:25 +0000 Received: from localhost ([127.0.0.1]:46040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSm-00034a-Mn for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:24 -0400 Received: from mail-ed1-f47.google.com ([209.85.208.47]:34789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSk-00033v-Jy for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:23 -0400 Received: by mail-ed1-f47.google.com with SMTP id x91so10189884ede.1 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=9S68kCf4GUh3WlQIDj8LlMb7Xjem+HJqoA1cSlI9RDY=; b=hnMvWx9JThmdLdKz8MyruvEFsyFSjTJo0wrpDykQK0hM++uT8jBBV4wTS/dffnuCe9 cnTDPI4jdzVL41Xa10oUxnx9zRnbB1fSEUJpczLiy+pF3Hw/XuNWnGKFrnHK3BwzhklP gb4SqdSfoS85CUA+Kh6G/qOjnFw444EUjnQHz8fz96BVOBVX6UfVj5LICzpQ6ooW67V2 Npzd82H3bzPcvfY9b17114x33Rx0StcTTU8MZ4ZT7OMJlGWQDgD3s5sDm07LT8kPoxnC n6/oAH0JptRTF3xGOsw4LF0KtZGPVDMdWpdYoEKGNhCNRH9EsXYGKIEHu1ydfHfC39m5 yI1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=9S68kCf4GUh3WlQIDj8LlMb7Xjem+HJqoA1cSlI9RDY=; b=wSU6sNkRxQ1JlHNOycqX5sSErPxeavCzdIGfzmSl66qpYCheTXX1oxuhmJjeP6is6k q+kOXwhf5NP6NDuuWGodu0/ngHJyvl1RjuHrvID29ZuV6PetGDM2UbeykiHx6vdCVDrd 7xjU7xKsZXey2/LW9ocNxFm9Naam/Hw6/j/f/9htrC99ygsXx7bGJZQ4sBH4Utz0l+66 1YqdyytnA6/oeu0jctEsLyvO634kkQPlBkR2MuNnUzaCIEs3m3ZG00kSBQw2YWIv2Tnd stflSStgmJjlq00uI3lNjApFqavVbtDucFkFuRqPahO8DNHCm6zdRK93nif9QT4/0lAW S9mw== X-Gm-Message-State: AJIora9hHkX8wlI+fGx1THiJkWa4yHjvk2CzHw1yToFVKFeg+m9Yxih5 B9vxVwW04mmpiL4ZINWL4gtUb+gck0do/0O1 X-Google-Smtp-Source: AGRyM1vMp6JS9AWdzTIhwy4tZiM/mUTILv3o8Jz5vxTaGgR9tpOllJo12unap5YrgTYViwT3dmMtpg== X-Received: by 2002:a05:6402:1d51:b0:41f:cf6c:35a5 with SMTP id dz17-20020a0564021d5100b0041fcf6c35a5mr27728532edb.25.1657995856808; Sat, 16 Jul 2022 11:24:16 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id x7-20020a05640225c700b0043ac761db43sm5055468edb.55.2022.07.16.11.24.16 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:16 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: <708e46c5ec0a27793c0be8f03250289dbc42ad12.1657994905.git.roman@burningswell.com> Date: Sat, 16 Jul 2022 20:24:15 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index d33ee4f708..fa201f3110 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -153,14 +153,14 @@ (define (extract-library name) (define-public clojure-tools (package (name "clojure-tools") - (version "1.10.3.1040") + (version "1.11.1.1149") (source (origin (method url-fetch) (uri (string-append "https://download.clojure.org/install/clojure-tools-" version ".tar.gz")) - (sha256 (base32 "0xvr9nmk9q789vp32zmmzj4macv8v7y9ivnfd6lf7i8vxgg6hvgv")) + (sha256 (base32 "196wl87br8zg3npfwpr5c1q0knxd1810vzgb0b6h195hyjf6i210")) ;; Remove AOT compiled JAR. The other JAR only contains uncompiled ;; Clojure source code. (snippet From patchwork Sat Jul 16 18:24:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40690 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 89F9927BBE9; Sat, 16 Jul 2022 19:33:16 +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 5E1A827BBEA for ; Sat, 16 Jul 2022 19:33:13 +0100 (BST) Received: from localhost ([::1]:34356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbI-0007yi-Da for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTR-00063e-Bo for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTQ-0002Vv-CG for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTQ-00036r-8K for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 5/8] gnu: clojure: Update to 1.11.1.This patch updates Clojure to 1.11.1. It also adds the 'reset-class-timestamps Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799586911840 (code B ref 56604); Sat, 16 Jul 2022 18:25:04 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:29 +0000 Received: from localhost ([127.0.0.1]:46043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSr-00034u-0l for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:29 -0400 Received: from mail-ej1-f46.google.com ([209.85.218.46]:35449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSo-00034I-E2 for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:27 -0400 Received: by mail-ej1-f46.google.com with SMTP id j22so14323751ejs.2 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=87jUbURBT3Q3T03QzoFqRaiZ0rtTjz5ssH2S5ERXMLk=; b=L49qbL9qEJivOpPIstAmzHM9DFRubCYv9HFG8FcQmGNDr7WtcduOw50lkmivpqk5Su BIynbMrJKl/knafuBNwFALoKddiNJWyDiH/Kj+ukVQSV+Vwx6fuRx9mIibZ2oHbJkUCC 4KkklFzfGEcuLJtVnXJ8yCsYTxdT2yNBeTNJpo2UcQzC2TiLI5bOewKYBECkYFGZ9Z6t Poz4zAjnVUzNP/V2rRjRwGHE9R8oMypfmaPD0m7z4JVqO0xG+jSFIl96PCnU3YG3B1Y+ 99tt0HfldcvFz6IygKed7HbOK0JiDLZZlEt+ItQpdx5EtlA9G+cwZMePhbIlY5SwkvEa XoNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=87jUbURBT3Q3T03QzoFqRaiZ0rtTjz5ssH2S5ERXMLk=; b=7++V7n9/n7yu8biljW8lpkR6poRqVDH9MBWSVmusj6IxHnM/iWMZX/NQ5jrQguejeN W4VkXvTJOV58CM4vPzNd3fR9+LyLAIt6vxN1Wp4aTSM+FecO0REXVI9qrcAoYRU+FFFT hdSimP8E8oalslegQZcp+8cmBeKgS8KNKTt4/8vrGzyDSpFIuuN7gTQcMw8jznbq2XNe D8yqCMZq/acQ4EbEYLs/+u0px3DJnvOzxZIUZzgiODaUeK31S/9UCOw5+fUIpDWqy+uq X8yBnDM/A7bBt5q42AM5d7yuucOIuH85rcV9lH2mu4H18OjytMeL1qqsD+1qeeLv6tQe w2vQ== X-Gm-Message-State: AJIora8lp+cqDJOoRVoTi9syIvL4+3MO7g+CqokeBNxf2EJExIENVOrA IJAoeQU6Y3vD31l9E4idWzqYPqnyScsv9iDv X-Google-Smtp-Source: AGRyM1tOzN5BGeBA7OInz5edeiJGBue74Lfp0bTElcNkIi75FikkgyvedMe/2cRurB/DHvda6eklUg== X-Received: by 2002:a17:906:8472:b0:72b:5088:be7b with SMTP id hx18-20020a170906847200b0072b5088be7bmr19164741ejc.164.1657995860296; Sat, 16 Jul 2022 11:24:20 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id 4-20020a170906308400b0071cef6c53aesm3449909ejv.0.2022.07.16.11.24.19 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:19 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: <57f679a137761bd5954850c2cb2c5c3cd7055fac.1657994905.git.roman@burningswell.com> Date: Sat, 16 Jul 2022 20:24:18 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches This patch updates Clojure to 1.11.1. It also adds the 'reset-class-timestamps phase to the Clojure build system. This phase makes sure the timestamp of compiled class files is set to a later point in time than the timestamp of the corresponding Clojure source files. If the timestamps of the class and source files are the same, the Clojure compiler will compile the sources again which can lead to issues. This problem has been discussed here [1]. The suggested solution was to keep/adjust the timestamps of the class files. [1] https://www.mail-archive.com/clojure@googlegroups.com/msg99928.html --- gnu/packages/clojure.scm | 93 ++++++++++++++++++++++------- guix/build/clojure-build-system.scm | 53 +++++++++++++++- 2 files changed, 123 insertions(+), 23 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index fa201f3110..d51923acdb 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -43,36 +43,44 @@ (define-public clojure ;; The libraries below are needed to run the tests. (libraries `(("core-specs-alpha-src" - ,(lib "core.specs.alpha/archive/core.specs.alpha-" - "0.1.24" - "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) + ,(lib "core.specs.alpha/archive/v" + "0.2.62" + "0v6nhghsigpzm8y7dykfm318q5dvk5l8sykmn1hr0qgs1jsjqh9j")) ("data-generators-src" ,(lib "data.generators/archive/data.generators-" - "0.1.2" - "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + "1.0.0" + "0s3hf1njvs68b8igasikvzagzqxl0gbri7w2qhzsypkhfh60v2cp")) + ("java-classpath-src" + ,(lib "java.classpath/archive/java.classpath-" + "1.0.0" + "178zajjsc9phk5l61r8w9hcpk0wgc9a811pl7kjgvn7rg4l7fh7j")) ("spec-alpha-src" - ,(lib "spec.alpha/archive/spec.alpha-" - "0.1.143" - "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) + ,(lib "spec.alpha/archive/v" + "0.3.218" + "0h5nd9xlind1a2vmllr2yfhnirgj2pm5dndgqzrly78l5iwcc3wa")) ("test-check-src" - ,(lib "test.check/archive/test.check-" - "0.9.0" - "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) + ,(lib "test.check/archive/v" + "1.1.1" + "0kx8l79mhpnn94rpsgc7nac7gb222g7a47mzrycj8crfc54wf0c1")) ("test-generative-src" ,(lib "test.generative/archive/test.generative-" - "0.5.2" - "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + "1.0.0" + "0yy2vc38s4j5n94jdcjx1v7l2gdq0lywam31id1jh07sx37lv5il")) ("tools-namespace-src" ,(lib "tools.namespace/archive/tools.namespace-" - "0.2.11" - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) + "1.0.0" + "1ifpk93m33rj2xm1qnnninlsdvm1liqmsp9igr63pjjwwwjw1cnn")) + ("tools-reader-src" + ,(lib "tools.reader/archive/tools.reader-" + "1.3.2" + "1n4dhg61iyypnjbxmihhqjb7lfpc0lzfvlk4jd8w0yr6za414f3a")))) (library-names (match libraries (((library-name _) ...) library-name)))) (package (name "clojure") - (version "1.10.0") + (version "1.11.1") (source (let ((name+version (string-append name "-" version))) (origin (method git-fetch) @@ -81,18 +89,23 @@ (define-public clojure (commit name+version))) (file-name (string-append name+version "-checkout")) (sha256 - (base32 "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83"))))) + (base32 "1xbab21rm9zvhmw1i2h5lqm7612vrdkxprq0rgb2i3sbgsxcdsn4"))))) (build-system ant-build-system) (inputs `(("jre" ,icedtea))) (arguments `(#:imported-modules ((guix build clojure-utils) + (guix build clojure-build-system) (guix build guile-build-system) ,@%ant-build-system-modules) #:modules ((guix build ant-build-system) + ((guix build clojure-build-system) #:prefix clj:) (guix build clojure-utils) (guix build java-utils) (guix build utils) + (guix build syscalls) + (ice-9 match) + (ice-9 regex) (srfi srfi-26)) #:test-target "test" #:phases @@ -106,22 +119,60 @@ (define (extract-library name) "--extract" "--verbose" "--file" (assoc-ref inputs name) - "--strip-components=1")) - (copy-recursively (string-append name "/src/main/clojure/") - "src/clj/")) + "--strip-components=1"))) (for-each extract-library ',library-names) + (copy-recursively "core-specs-alpha-src/src/main/clojure" + "src/clj/") + (copy-recursively "spec-alpha-src/src/main/clojure" + "src/clj/") #t)) (add-after 'unpack-library-sources 'fix-manifest-classpath (lambda _ (substitute* "build.xml" (("") "")) #t)) + (add-after 'unpack-library-sources 'clojure-spec-skip-macros + ;; Disable spec macro instrumentation when compiling clojure.spec + ;; See: https://clojure.atlassian.net/browse/CLJ-2254 + (lambda _ + (substitute* "build.xml" + (("") + ,(string-join + '("" + "\n") + "\n"))) + #t)) + (add-after 'unpack-library-sources 'clojure-spec-compile + ;; Compile and include clojure.spec.alpha & clojure.core.specs.alpha + (lambda _ + (substitute* "build.xml" + (("") + ,(string-join + '("" + "" + "" + "" + "")))) + #t)) + (add-before 'build 'maven-classpath-properties + (lambda _ + (define (make-classpath libraries) + (string-join (map (lambda (library) + (string-append library "/src/main/clojure")) + libraries) ":")) + (with-output-to-file "maven-classpath.properties" + (lambda () + (let ((classpath (make-classpath ',library-names))) + (display (string-append "maven.compile.classpath=" classpath "\n")) + (display (string-append "maven.test.classpath=" classpath "\n"))))) + #t)) (add-after 'build 'build-javadoc ant-build-javadoc) (replace 'install (install-jars "./")) (add-after 'install-license-files 'install-doc (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (add-after 'install-doc 'install-javadoc - (install-javadoc "target/javadoc/"))))) + (install-javadoc "target/javadoc/")) + (add-after 'reset-gzip-timestamps 'reset-class-timestamps clj:reset-class-timestamps)))) (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") diff --git a/guix/build/clojure-build-system.scm b/guix/build/clojure-build-system.scm index 7d494078ea..82440e3b7a 100644 --- a/guix/build/clojure-build-system.scm +++ b/guix/build/clojure-build-system.scm @@ -22,11 +22,15 @@ (define-module (guix build clojure-build-system) ant-build)) #:use-module (guix build clojure-utils) #:use-module (guix build java-utils) + #:use-module (guix build syscalls) #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases - clojure-build)) + clojure-build + reset-class-timestamps)) ;; Commentary: ;; @@ -108,6 +112,50 @@ (define* (check #:key jar-names))) #t) +(define (regular-jar-file-predicate file stat) + "Predicate returning true if FILE is ending on '.jar' +and STAT indicates it is a regular file." + (and ((file-name-predicate "\\.jar$") file stat) + (eq? 'regular (stat:type stat)))) + +(define* (reset-class-timestamps #:key outputs #:allow-other-keys) + "Unpack all jar archives, reset the timestamp of all contained class files, +and repack them. This is necessary to ensure that archives are reproducible." + (define (repack-archive jar) + (format #t "resetting class timestamps and repacking ~a\n" jar) + (let* ((early-1980 315619200) ; 1980-01-02 UTC + (dir (mkdtemp! "jar-contents.XXXXXX")) + (manifest (string-append dir "/META-INF/MANIFEST.MF"))) + (with-directory-excursion dir + (invoke "jar" "xf" jar)) + (delete-file jar) + (for-each (lambda (file) + (let ((s (lstat file))) + (unless (eq? (stat:type s) 'symlink) + (when (string-match "^(.*)\\.class$" file) + (utime file early-1980 early-1980))))) + (find-files dir #:directories? #t)) + ;; The jar tool will always set the timestamp on the manifest file + ;; and the containing directory to the current time, even when we + ;; reuse an existing manifest file. To avoid this we use "zip" + ;; instead of "jar". It is important that the manifest appears + ;; first. + (with-directory-excursion dir + (let* ((files (find-files "." ".*" #:directories? #t)) + ;; To ensure that the reference scanner can detect all + ;; store references in the jars we disable compression + ;; with the "-0" option. + (command (if (file-exists? manifest) + `("zip" "-0" "-X" ,jar ,manifest ,@files) + `("zip" "-0" "-X" ,jar ,@files)))) + (apply invoke command))) + (utime jar 0 0))) + (for-each (match-lambda + ((output . directory) + (for-each repack-archive + (find-files directory regular-jar-file-predicate)))) + outputs)) + (define-with-docs install "Standard 'install' phase for clojure-build-system." (install-jars "./")) @@ -119,7 +167,8 @@ (define-with-docs %standard-phases (replace 'build build) (replace 'check check) (replace 'install install) - (add-after 'install-license-files 'install-doc install-doc))) + (add-after 'install-license-files 'install-doc install-doc) + (add-after 'reset-gzip-timestamps 'reset-class-timestamps reset-class-timestamps))) (define* (clojure-build #:key inputs From patchwork Sat Jul 16 18:24:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40691 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 A57DB27BBEA; Sat, 16 Jul 2022 19:33:16 +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 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 B892B27BBEB for ; Sat, 16 Jul 2022 19:33:14 +0100 (BST) Received: from localhost ([::1]:34412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbJ-00082r-Rw for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTR-00063d-Bo for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTQ-0002Vx-PI for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTQ-00036z-Lf for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 6/8] gnu: clojure-algo-generic: Fix test failing under AOT in Clojure 1.11.1. Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799587311856 (code B ref 56604); Sat, 16 Jul 2022 18:25:04 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:33 +0000 Received: from localhost ([127.0.0.1]:46046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSu-00035A-PQ for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:33 -0400 Received: from mail-ed1-f54.google.com ([209.85.208.54]:45639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSr-00034Y-I6 for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:30 -0400 Received: by mail-ed1-f54.google.com with SMTP id g1so10138497edb.12 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=gfSRV+60F8X/BIlqZZNxXgZAI5ycd9rY4NrWTLGeXTA=; b=bwqOm1wXtFaALqjry2VRhlNLSFw/akk15LZkVxqJt3ZXf6GFc7tW7o9+GBRC828dP4 GVa4ODf9eZ6oVnGvZ78l0hGNitVJWY6iVorBhbVMrp5Xl/j2i+hZb8vPnAcDEBs5Sl3W piij2CO6Jxz+U4OSWFo6dbr+41PL/gvpJ/HXzLh8RUZ6NcKGnR7/smfATZ8+J7eBNnGP JY0MU4SVVifNNzyRoYMqv1YkHrrsNk7BZ11POr/6GfFy2PUO22p8FpdEQPbBrdyQyQce qMbHgHo6oQJreO2YuEG2fB5DXQ0HRtYuoe4bzeh1GU5E1XO5B5fAZDMSqeEz12M+N7YV mI8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=gfSRV+60F8X/BIlqZZNxXgZAI5ycd9rY4NrWTLGeXTA=; b=q+pFVlPlEqyEDCMyI/6wEpOuBiaP4kNsZN6MPzqBfiHFZGGUrIqL9bD0Bu1FTXCQ5t OryN7syRSTSxXVgvpimJznrebTGcNnPvCNjnI24pEMj97N9qs/KeqHwAdzWaRXARK/Uw YQSVp/5gUih0Dh7bvu984fWD7OF7YQtU3ckXWm6SzP9Zj+ABYlvHPUF9w0T/hYLJbOsO 3wamnkKjLlH9lmrQRFHLfwN61khTiVc/OfB7yED1cI8H1xV4bKMvF/xV74hHg/ib7GSq qSc35RheIk85K4245fPGoxp5QARxTwFlQWm98AHLQ42iqfVi0aEmyTcwQnEEt8ltfr27 Jdug== X-Gm-Message-State: AJIora9LRq7VocVQcPCvqA+KD8fEzh6V+dvwFWpFE4t5jJEJfSpKfTNQ kDUYZrB/pE/T2ECQ9Qi8Fn9nP5aRsAHR7Z3F X-Google-Smtp-Source: AGRyM1u/6GK86txhMhFxfiL5pXbnjCrl5UzZgbKBxylVkTPkAolT1mit+IerbCeNDRhzgAVskwdhjg== X-Received: by 2002:a05:6402:4390:b0:43a:bc4b:8ab4 with SMTP id o16-20020a056402439000b0043abc4b8ab4mr26711619edc.283.1657995863776; Sat, 16 Jul 2022 11:24:23 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id i23-20020a056402055700b0043a2338ca10sm5040968edx.92.2022.07.16.11.24.23 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:23 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: <6fe1966d3cce8cda3f823a3a24f71ab70206a5ff.1657994905.git.roman@burningswell.com> Date: Sat, 16 Jul 2022 20:24:22 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/clojure.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index d51923acdb..36bb27013c 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -274,7 +274,15 @@ (define-public clojure-algo-generic (arguments '(#:source-dirs '("src/main/clojure/") #:test-dirs '("src/test/clojure/") - #:doc-dirs '())) + #:doc-dirs '() + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-import + (lambda _ + (substitute* + "src/main/clojure/clojure/algo/generic/math_functions.clj" + (("clojure.algo.generic.math-functions") + "clojure.algo.generic.math-functions\n(:refer-clojure :exclude [abs])"))))))) (synopsis "Generic versions of common functions") (description "Generic versions of commonly used functions, implemented as multimethods From patchwork Sat Jul 16 18:24:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40696 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 335E227BBEA; Sat, 16 Jul 2022 19:33:42 +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 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 B52EA27BBE9 for ; Sat, 16 Jul 2022 19:33:41 +0100 (BST) Received: from localhost ([::1]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbk-0000j2-Te for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTS-000642-4I for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48299) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTR-0002W1-79 for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTR-000376-2e for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 7/8] gnu: clojure-core-match: Update to 1.0.0.--- Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799587611872 (code B ref 56604); Sat, 16 Jul 2022 18:25:05 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:36 +0000 Received: from localhost ([127.0.0.1]:46049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSy-00035Q-3d for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:36 -0400 Received: from mail-ej1-f41.google.com ([209.85.218.41]:41651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSv-00034s-AU for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:34 -0400 Received: by mail-ej1-f41.google.com with SMTP id z23so14300139eju.8 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=jVsb1dRaz0/QrywReiwXyvb9703iBpJBfdB67OvdLTo=; b=gZWtEZgiFUknSS6s5+M2rW8CMP/e7uT9nUxOAh/n97J7N0y4ElAZPZM1YiMzjVp899 vnx3PNgkN9yIbSuBWMIgpbVSQKNcv82oxjsv8maB+AM4eiC1SajttmsHq7A9pc/Dp9Mj HlT0220vt6lRhXuNHW4CwxBMskcf9LJR5VEJfSYG1F92GCf2Urnf7GF8XwBr23A0dViY u60LDdf9dFXzDHWBug70t2ZW2ooL6WHrR/R6e4C8WaEhGo5zGq0Yi/2TDJwlEJpecZib hYjwc+PDUsriIU9R4NtI7Ska6GYHLe3CrSEC9bmR203hMwvi1t+i7vK2X4Uii4T/cusN e0jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=jVsb1dRaz0/QrywReiwXyvb9703iBpJBfdB67OvdLTo=; b=VD0DGGORzsMbN3tT9CGD1gsOwFagZDY0S4WQhRHg2syqBL4b9o4kQ8wwAol1HVSHMk Tz7+9cVqux0DJN3XAkW3C+w3XV+54fMuWvWIMQ3MgC3Lt9eszkxwOcpV/bzqZcEi/TMY Z1b0MtAtRbsN0pBDMcQNN7L1c+Uwv3cpNiAj9QOo6/pGmlpppDqN17Ami3bH59A21KqT cmxzz9KYYGhR49wJG3aYG6cY7d2n63/OPVOirvXR7cVHA1BQjfY6xIXWZ0RQgTzpkykJ z0H690wnoQUdJsV3QARQdz7dWTj8WwLqIfzv0XGvFVwSm9jEwiQ2Izb/d5otfKdlYBHy hJWg== X-Gm-Message-State: AJIora+9hPEQscMYMBKcV70IkUgn54KisWVHMutJD9XnkgHT6nQOuwaJ 3H8tue5ljIFa8PMIjmXk3j9Ohs1YPkRPYlZx X-Google-Smtp-Source: AGRyM1t/OpY+Npsx2oOYAjQCNdU7/ZSC0JvWKacnSrxUgtyVaCjQ9gr/gi4KJGqAiZ2RkqqqT8GuCg== X-Received: by 2002:a17:906:84f0:b0:72b:72b6:c7b2 with SMTP id zp16-20020a17090684f000b0072b72b6c7b2mr19108657ejb.642.1657995867507; Sat, 16 Jul 2022 11:24:27 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id i2-20020a170906850200b0072ac6d41207sm3488366ejx.5.2022.07.16.11.24.26 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:27 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: Date: Sat, 16 Jul 2022 20:24:25 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/clojure.scm | 46 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 36bb27013c..0c2bc1f1be 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -319,31 +319,29 @@ (define-public clojure-algo-monads (license license:epl1.0))) (define-public clojure-core-match - (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") - (revision "1")) ; this is the 1st commit buildable with clojure 1.9 - (package - (name "clojure-core-match") - (version (git-version "0.3.0-alpha5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clojure/core.match") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04bdlp5dgkrqzrz0lw3mfwmygj2218qnm1cz3dkb9wy4m0238s4d")))) - (build-system clojure-build-system) - (arguments - '(#:source-dirs '("src/main/clojure") - #:test-dirs '("src/test/clojure") - #:doc-dirs '())) - (synopsis "Optimized pattern matching for Clojure") - (description - "An optimized pattern matching library for Clojure. + (package + (name "clojure-core-match") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clojure/core.match") + (commit (string-append "core.match-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ajpxjv4yc282cm0jw8819fay2j6jqp9nfy69k7vll09q7vqsd22")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure") + #:test-dirs '("src/test/clojure") + #:doc-dirs '())) + (synopsis "Optimized pattern matching for Clojure") + (description + "An optimized pattern matching library for Clojure. It supports Clojure 1.5.1 and later as well as ClojureScript.") - (home-page "https://github.com/clojure/core.match") - (license license:epl1.0)))) + (home-page "https://github.com/clojure/core.match") + (license license:epl1.0))) (define-public clojure-data-codec (package From patchwork Sat Jul 16 18:24:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40697 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 75AD427BBEA; Sat, 16 Jul 2022 19:33:52 +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 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 F390F27BBE9 for ; Sat, 16 Jul 2022 19:33:51 +0100 (BST) Received: from localhost ([::1]:36228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCmbv-0000st-5T for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 14:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCmTS-000643-4K for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48300) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCmTR-0002WA-It for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCmTR-00037E-F6 for guix-patches@gnu.org; Sat, 16 Jul 2022 14:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56604] [PATCH 8/8] gnu: clojure-instaparse: Update to 1.4.12 (disabled AOT).This patch updates clojure-instaparse to 1.4.12. Due to the following AOT Resent-From: r0man Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 18:25:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56604@debbugs.gnu.org Received: via spool by 56604-submit@debbugs.gnu.org id=B56604.165799587811889 (code B ref 56604); Sat, 16 Jul 2022 18:25:05 +0000 Received: (at 56604) by debbugs.gnu.org; 16 Jul 2022 18:24:38 +0000 Received: from localhost ([127.0.0.1]:46052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmT0-00035h-Di for submit@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:38 -0400 Received: from mail-ej1-f41.google.com ([209.85.218.41]:33759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCmSy-000358-En for 56604@debbugs.gnu.org; Sat, 16 Jul 2022 14:24:36 -0400 Received: by mail-ej1-f41.google.com with SMTP id va17so14387670ejb.0 for <56604@debbugs.gnu.org>; Sat, 16 Jul 2022 11:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=3hFnGxWYqr2RBUW7jS6AycNcYoogTfoEuwR+Kp1KQrc=; b=kW8m8UT0tos9UY0T1MRf11cZlD8MP5iiwOPnVhR/46RfK19NHtQoCY6jrTHxV14jyt DvwMuYSYtt4+hQejEHrNC7z+lSkIwaHwMwKtEYqg7FPeijUY+eTZj/9tFaHafmtNHOH7 Ew3JUAHwSGneVnewBy2e8vsDTyOwZojsBPDWK01ullcm+GdsZGY7cT93HCJfti3mzw0x hv8cDXgSXM0jzNXV6nRtGCxDg2TurYUxrGQ3a2i10QoFAsk+XYX1u6F/p1VAXC6qEnpM I6ScPB+luUuvKfmkk4nPJIMrWMSQEfZuIkdUCjeG7ctTFsHSUiLxZfkpj/IRhnEXGpUP Wkyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=3hFnGxWYqr2RBUW7jS6AycNcYoogTfoEuwR+Kp1KQrc=; b=6R2kuYJbb3YKFrhpXR0jHcVS6yC+fD4H0VbZDf9zq7f9cwr16hUNq8kL3bm/puTVov ylTdNiB1v0i4eovRIgj6EecrElGm+GliowqOJp1Be7PY2ksRB1AJuihydwJhoXv9suJj I998fE/8C+dZFWVoGFcGmujt8CegLrXVkuxOv5nvW1NHkCT7RhqqotyNLxjF6WAKJ5RP saQmK4tOCWPK4Xt/rW9Nqq/6TjxTXgxd4JSFTLi3Khkl0oZTsrqOfGMQMU+d7Rud1841 dc3yojctS1lCGYQWaawxj61Pnnqux1vCmFl+7+tHleMBd//GFZ0RNvaOQ92P77HjXywc UmxA== X-Gm-Message-State: AJIora/cf5jVzmeWT4EElcW4fiUKQN6kuykE/nthxcUNc6xQcM9Eixa3 c8vkBt2o/4Z1ATIqdlHGQExEjflB0/ai3VLM X-Google-Smtp-Source: AGRyM1ucK/96VoB8Dtm4YyLJKKrkxANsWw/b3Zu4zzw5jYJ6lRay7BBKqWrkyos2u1XozphzeJY4zw== X-Received: by 2002:a17:907:2856:b0:72b:54bd:40eb with SMTP id el22-20020a170907285600b0072b54bd40ebmr18735327ejc.542.1657995870694; Sat, 16 Jul 2022 11:24:30 -0700 (PDT) Received: from thinkpad (tmo-117-210.customers.d1-online.com. [80.187.117.210]) by smtp.gmail.com with ESMTPSA id wj18-20020a170907051200b0072af92fa086sm3449634ejb.32.2022.07.16.11.24.29 for <56604@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 11:24:30 -0700 (PDT) From: r0man In-Reply-To: References: Message-Id: <887daad8a00bf32f20feaa23847ee0c081c2d679.1657994905.git.roman@burningswell.com> Date: Sat, 16 Jul 2022 20:24:29 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 16 Jul 2022 14:32:24 -0400 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" X-getmail-retrieved-from-mailbox: Patches This patch updates clojure-instaparse to 1.4.12. Due to the following AOT related error I disabled AOT compilation for this package. ``` starting phase `build' Execution error (IllegalArgumentException) at instaparse.auto-flatten-seq/fn$G (auto_flatten_seq.cljc:7). No implementation of method: :conj-flat of protocol: #'instaparse.auto-flatten-seq/ConjFlat found for class: instaparse.auto_flatten_seq.AutoFlattenSeq ``` This seems to be a known issue with AOT compilation. The issue has been discussed [1] and seems to be still an open issue. [1] https://github.com/Engelberg/instaparse/issues/85 --- gnu/packages/clojure.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 0c2bc1f1be..5332dd499a 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -410,8 +410,7 @@ (define-public clojure-data-xml (license license:epl1.0))) (define-public clojure-instaparse - (let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") - (version "1.4.9")) ; upstream forget to tag this release + (let ((version "1.4.12")) (package (name "clojure-instaparse") (version version) @@ -419,14 +418,27 @@ (define-public clojure-instaparse (method git-fetch) (uri (git-reference (url "https://github.com/Engelberg/instaparse") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "002mrgin4z3dqy88r1lak7smd0m7x8d22vmliw0m6w6mh5pa17lk")))) (build-system clojure-build-system) (arguments - '(#:doc-dirs '("docs/"))) + '(;; Disabled AOT, because of failing test: No implementation of + ;; method: :conj-flat of protocol: + ;; #'instaparse.auto-flatten-seq/ConjFlat found for class: + ;; instaparse.auto_flatten_seq.AutoFlattenSeq + #:aot-exclude '(#:all) + #:doc-dirs '("docs/") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-import + (lambda _ + (substitute* + "test/instaparse/defparser_test.cljc" + (("AssertionError") + "Exception"))))))) (synopsis "No grammar left behind") (description "Instaparse aims to be the simplest way to build parsers in Clojure.