From patchwork Fri Nov 24 05:43:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Stan X-Patchwork-Id: 56791 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 1550D27BBE9; Fri, 24 Nov 2023 05:45:07 +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=-1.2 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_SORBS_WEB,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 951C227BBE2 for ; Fri, 24 Nov 2023 05:45:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Ozs-0007hQ-Mv; Fri, 24 Nov 2023 00:45:00 -0500 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 1r6Ozq-0007gA-Qh for guix-patches@gnu.org; Fri, 24 Nov 2023 00:44:58 -0500 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 1r6Ozq-0004Ld-BB for guix-patches@gnu.org; Fri, 24 Nov 2023 00:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6Ozu-0005nn-I4 for guix-patches@gnu.org; Fri, 24 Nov 2023 00:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67426] [PATCH] Switch clojure-tools to using clojure-tools-deps Resent-From: eugen.stan@netdava.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Nov 2023 05:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67426 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67426@debbugs.gnu.org Cc: mail@cbaines.net, Eugen Stan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170080466422233 (code B ref -1); Fri, 24 Nov 2023 05:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Nov 2023 05:44:24 +0000 Received: from localhost ([127.0.0.1]:35502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6OzI-0005mX-5s for submit@debbugs.gnu.org; Fri, 24 Nov 2023 00:44:24 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6OzG-0005mJ-5w for submit@debbugs.gnu.org; Fri, 24 Nov 2023 00:44:22 -0500 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 1r6Oz6-0007ee-1s for guix-patches@gnu.org; Fri, 24 Nov 2023 00:44:12 -0500 Received: from sender4-of-o50.zoho.com ([136.143.188.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Oz4-00040s-4J for guix-patches@gnu.org; Fri, 24 Nov 2023 00:44:11 -0500 Delivered-To: eugen.stan@netdava.com ARC-Seal: i=1; a=rsa-sha256; t=1700804644; cv=none; d=zohomail.com; s=zohoarc; b=IAre2XD0tk9yUIYYfe4nWijmnUvousNVf/iToSSh5WXg2i/GRMYxO52iNkvUSfGEv/7L9/FeoLZTlBGqPLaqB7UkVLNnBtT7+bUilKcyohY0Pq5o8eQtxoCrk7jy3xcZpsodJYUNQsrbJQvr92GG/k8m4jnNQQG72X/uCQcJ0vA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700804644; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=zmnaroplg3D2lcUeiaLBqZ5czG+fdpyiRwYcPQ5/NPw=; b=WXG5ab5C2AfiO2Yie+yQBK2PemTJUEtG4w+9Q1b7FeEYszbuEWqD1cmOOnvrPkvWsAc7pfNbr2fQwz5LCkG95et0uO2DBsgVYdRKqALuaM2ZuqaioZu7a8y8kSdT5iRL/Aa6nWAnUlktWNkr4UhVC1HmubAMDKkH8g1wEXs+69Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=netdava.com; spf=pass smtp.mailfrom=eugen.stan@netdava.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1700804644; s=zohodkim; d=netdava.com; i=eugen.stan@netdava.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=zmnaroplg3D2lcUeiaLBqZ5czG+fdpyiRwYcPQ5/NPw=; b=eIMo8yHf+p8sD9f1W383mafQvOjKHgJPty+2mKQxVQGtb+ihDLTpkHYhuI9oVGXF pRd59u2OcfvnD6h6Nds+tDlAPZuf43GHZ+DJYUD/H3UX5H5teRc0m+JGZk37qNsAzJk gtNfCV/7DMI16acwJbCD+SbTLxLLo/YVNNb4k1oQ= Received: from daos-495.. (84.232.142.73 [84.232.142.73]) by mx.zohomail.com with SMTPS id 1700804643183180.68775380393527; Thu, 23 Nov 2023 21:44:03 -0800 (PST) From: eugen.stan@netdava.com Date: Fri, 24 Nov 2023 07:43:47 +0200 Message-Id: <20231124054347.290021-1-eugen.stan@netdava.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.50; envelope-from=eugen.stan@netdava.com; helo=sender4-of-o50.zoho.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Eugen Stan --- gnu/packages/clojure.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index b9296b3e78..2dff11f238 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -203,14 +203,14 @@ (define (make-classpath libraries) (define-public clojure-tools (package (name "clojure-tools") - (version "1.11.1.1165") + (version "1.11.1.1413") (source (origin (method url-fetch) (uri (string-append "https://download.clojure.org/install/clojure-tools-" version ".tar.gz")) - (sha256 (base32 "1lg97waqfcgzr3dz5426fbc4kqcsavpbqil2iyjm1dw3zrfa8ysi")) + (sha256 (base32 "1q0z71ifdxwvyy9gvq8mx8jbygf8cszrlhb3h22walfamnisbhwk")) ;; Remove AOT compiled JAR. The other JAR only contains uncompiled ;; Clojure source code. (snippet @@ -249,7 +249,7 @@ (define-public clojure-tools ":")))))))) (inputs (list rlwrap clojure - clojure-tools-deps-alpha + clojure-tools-deps java-commons-logging-minimal)) (home-page "https://clojure.org/releases/tools") (synopsis "CLI tools for the Clojure programming language") @@ -419,9 +419,9 @@ (define-public clojure-data-xml #:phases (modify-phases %standard-phases (add-before 'build 'delete-cljs-tests - (lambda _ - (delete-file "src/test/resources/clojure/data/xml/cljs_testsuite.clj") - (delete-file "src/test/clojure/clojure/data/xml/test_cljs.clj")))))) + (lambda _ + (delete-file "src/test/resources/clojure/data/xml/cljs_testsuite.clj") + (delete-file "src/test/clojure/clojure/data/xml/test_cljs.clj")))))) (propagated-inputs (list clojure-data-codec)) (synopsis "Clojure library for reading and writing XML data") (description "@code{data.xml} is a Clojure library for reading and writing