From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id MOKvBn7MXGXZGAEAauVa8A:P1 (envelope-from ) for ; Tue, 21 Nov 2023 16:27:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MOKvBn7MXGXZGAEAauVa8A (envelope-from ) for ; Tue, 21 Nov 2023 16:27:58 +0100 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 9E884223B2 for ; Tue, 21 Nov 2023 16:27:57 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=netdava.com header.s=zohodkim header.b=Ic4PGjLd; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700580478; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=doi6T8xmXTAz5Hx5vYP+02v95Lb2fKJz6sM2jFZAEXQ=; b=nSjA9eaLRa0cANAzPsfzd6nLiW9omKfPA5HCPS2VM9SwxBtf0eNPYAp7VnE5ol2C4wj55y PfFkLdnk9d1baR4OrcPnUCrAOSI7ZX5ZZ/DNeIKgE3WPxfFKeBUtQY+oBkD1P6AObIx1nh GzrOzpZ/+vBFSnhuCrJWuaSdKYOLfcnUuGnX/HQxN3hpbp4HNCQ5LFEcPY22eMQ9IHNjF5 HjPujhIhF5VX9dFkMkA8XBebO96nibXGeCMvqPstRRQ/JvIbMa6wkbNQr0RqLWeqtIMasd WjYkMvLnL+C0cHk8dEhB90uKLmCHtbPkJ7dt5M65aazlH4r0188xLs0WpMMa8g== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=netdava.com header.s=zohodkim header.b=Ic4PGjLd; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}") ARC-Seal: i=2; s=key1; d=yhetil.org; t=1700580478; a=rsa-sha256; cv=fail; b=i1XEbQ3clGUZ++ibRQbzjwepvG48AfJKQ3ZzuRLbvBaTgKUlxtXzJuHMtZyxSmpGWxE6n/ MUoJfFOFqJM6JjiVIvAyz838a6j6xANSteYfdXBibi0SJ/Wu1Igv8kwiasm8kN34bMGtZ3 XGjuFI05i6mciUByNHctdhCX3n8yU0Bux8PQ8oziY8Yv3Zu/lYnW4YwElNs7zz5EEGH+Vp 4ZwQcZ+x++PWVWuiG4VcBto4eVAb7xkKL7oWKngAlD0OXcqkQfsfdvg45tVuMwbkhhW3y8 HdBSHGA1ELo0AO3YwarOcQjFM0eeo+lh/EissYaQrTCUt2rpcYY8t7eigT360A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5Sf7-0008WG-H7; Tue, 21 Nov 2023 10:27:41 -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 1r5RYj-0006tR-LO for guix-patches@gnu.org; Tue, 21 Nov 2023 09:17:02 -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 1r5RYj-00020w-DA for guix-patches@gnu.org; Tue, 21 Nov 2023 09:17:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r5RYm-0000xp-2G for guix-patches@gnu.org; Tue, 21 Nov 2023 09:17:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67328] [PATCH] Upgrade clojure-tools to 1.11.1.1413 + clojure-tools-deps transition Resent-From: eugen.stan@netdava.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Nov 2023 14:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67328 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67328@debbugs.gnu.org Cc: Eugen Stan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17005762123628 (code B ref -1); Tue, 21 Nov 2023 14:17:03 +0000 Received: (at submit) by debbugs.gnu.org; 21 Nov 2023 14:16:52 +0000 Received: from localhost ([127.0.0.1]:55543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5RYZ-0000wQ-Ce for submit@debbugs.gnu.org; Tue, 21 Nov 2023 09:16:52 -0500 Received: from lists.gnu.org ([2001:470:142::17]:33658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5AaQ-0005m2-IX for submit@debbugs.gnu.org; Mon, 20 Nov 2023 15:09:40 -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 1r5AaI-0001am-U1 for guix-patches@gnu.org; Mon, 20 Nov 2023 15:09:30 -0500 Received: from sender3-of-o57.zoho.com ([136.143.184.57]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5AaG-0002Tn-Rn for guix-patches@gnu.org; Mon, 20 Nov 2023 15:09:30 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1700510959; cv=none; d=zohomail.com; s=zohoarc; b=GCO9XJxFFEFVgNnpfVQNtiwdr7fjkXLbNWUKJVIdox8WeHVZtscgWONgA3UzZf6PxUPL4rSDtDZ4sox+Ct4wHHXGjyxeCIQaXxXAsr/a6k8KpAEm9r7NB+j3ui2oIvHrntSguXVI8wUppFawPVwKtVm4IA94BqLkKW+/IVs9P4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700510959; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=doi6T8xmXTAz5Hx5vYP+02v95Lb2fKJz6sM2jFZAEXQ=; b=dtbfsjYgQ6OJAfIFzQ5L9W3U7lKgZ49rn3c9APa35ZqJxp/NY5BFAww25i5zqCQ+fk1yQulpgmoMUPj9xtf91lO/cB0OoAR5lWHk/eF5xAcFuthafZM540S6aLcCDxosi1mMz2PjAE3Cub6uoRFBPr6uUDf7aeqTzEdLw22qUYU= 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=1700510959; 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=doi6T8xmXTAz5Hx5vYP+02v95Lb2fKJz6sM2jFZAEXQ=; b=Ic4PGjLdr0unW24aq5lYih80fAoxqE+E8iNzO2elWRIhVioJhJiBpQIJZWP5U12w t/sFQYOIGrNjlE7tTl38REcYhZYhATzu4oNS6PlR7sZVNiEokgOVeB0Q4XX/h08U+h6 zQ1e2OHh6fP39m30m6XQQiPDRxD3wpfw4f4rNrzc= Received: from daos-495.. (84.232.142.73 [84.232.142.73]) by mx.zohomail.com with SMTPS id 1700510956957861.5438124606105; Mon, 20 Nov 2023 12:09:16 -0800 (PST) From: eugen.stan@netdava.com Date: Mon, 20 Nov 2023 22:09:09 +0200 Message-Id: <20231120200909.126545-1-eugen.stan@netdava.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.184.57; envelope-from=eugen.stan@netdava.com; helo=sender3-of-o57.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-Mailman-Approved-At: Tue, 21 Nov 2023 09:16:42 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 21 Nov 2023 10:27:40 -0500 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.61 X-Spam-Score: -2.61 X-Migadu-Queue-Id: 9E884223B2 X-Migadu-Scanner: mx10.migadu.com X-TUID: tDZ4ubpz7Moe From: Eugen Stan * clojure-tools-deps-alpha was superserded by clojure-tools-deps --- gnu/packages/clojure.scm | 77 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 6 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index e28998b570..ee9cd19b0e 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 @@ -572,7 +572,72 @@ (define-public clojure-tools-cli work with command-line arguments.") (license license:epl1.0))) +(define-public clojure-tools-deps + (package + (name "clojure-tools-deps") + (version "0.18.1354") + (home-page "https://github.com/clojure/tools.deps") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ls5nixhsjjhf3qz8kbyhmks5lw7a25zxl46yrizbw7vba3mzrpl")))) + (build-system clojure-build-system) + (arguments + `(#:source-dirs '("src/main/clojure" "src/main/resources") + #:test-dirs '("src/test/clojure") + #:doc-dirs '() + ;; FIXME: Could not initialize class org.eclipse.aether.transport.http.SslSocketFactory + #:tests? #f + #:phases + (modify-phases %standard-phases + ;; FIXME: Currently, the S3 transporter depends on ClojureScript, + ;; which is very difficult to package due to dependencies on Java + ;; libraries with non-standard build systems. Instead of actually + ;; packaging these libraries, we just remove the S3 transporter that + ;; depends on them. + (add-after 'unpack 'remove-s3-transporter + (lambda _ + (for-each delete-file + (list + (string-append + "src/main/clojure/clojure/" + "tools/deps/util/s3_aws_client.clj") + (string-append + "src/main/clojure/clojure/" + "tools/deps/util/s3_transporter.clj") + (string-append + "src/test/clojure/clojure/" + "tools/deps/util/test_s3_transporter.clj"))) + (substitute* + "src/main/clojure/clojure/tools/deps/util/maven.clj" + (("clojure.tools.deps.util.s3-transporter") + ""))))))) + (propagated-inputs (list maven-resolver-api + maven-resolver-spi + maven-resolver-impl + maven-resolver-util + maven-resolver-connector-basic + maven-resolver-provider + maven-core + maven-resolver-transport-http + maven-resolver-transport-file + clojure-tools-gitlibs + clojure-tools-cli + clojure-data-xml)) + (synopsis "Clojure library supporting clojure-tools") + (description "This package provides a functional API for transitive +dependency graph expansion and the creation of classpaths.") + (license license:epl1.0))) + (define-public clojure-tools-deps-alpha + ;; this was superseded by clojure-tools-deps + ;; https://github.com/clojure/tools.deps.alpha + ;; Keeping it to give upstream packages a chance to upgrade (package (name "clojure-tools-deps-alpha") (version "0.14.1212") -- 2.39.2