From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id kHfFMq5aX2XOwQAAauVa8A:P1 (envelope-from ) for ; Thu, 23 Nov 2023 14:59:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id kHfFMq5aX2XOwQAAauVa8A (envelope-from ) for ; Thu, 23 Nov 2023 14:59:10 +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 87BA942CED for ; Thu, 23 Nov 2023 14:59:10 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1700747950; a=rsa-sha256; cv=none; b=GT87H1xws07vT7ZTk+rkYsPVWJoPbiDo9YqvpzGhcBCb+L/kH/6Ezyb4MxRFqxK9NP8frV yKFz1a+jl9Kk5iC1EMT159MZGRz7hFExB5lEHn67Gl20KQuIilshyIlGIVSD80b7f8MBTr bQYQdY2MRn89Ss42TpfPJN0i49yzj4cL8ybC0EzxfgZIhtecV+XaYPK14g7K8OFVuRLXYR kdLEPjpAcnmPUX0nSwzPU9cW3tpv6/rBy+HTYAYBiEFRn2SCcLPgD7htTqb4veta2uu1ES 8k0RdOArOjAbBRfGCyOcxL0QAwCpesDD25dB5WkdFhLXAsSnOMUWyghF58+AzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700747950; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=v0GkSzf3CWH0YC/qDGngWYjJlJubcI9xUGndDtNgw5o=; b=EaCb0G/lz/hJurRO6qRRtDpUXfApWJTScDJjgI2jw3R4ZI2m1MHb/mgCfiQKZHf1ilbTJx D0OEsSY2YbMQobn2TbMFQig1xcp4cKKiRe+43PH142EMdKMHaf6J9juiQ4mXUf0VfTNngb nuBi072jf5FNfWVuuxmKf0CyGV1GFAiveEUIeraXDQFP0tERpy4gkz9COhVwKKy/3MgEA9 bppBMrVmR6/gqiLJTSLaNSQzYjTlbk8NhB8PHHSr/FCbM8ZqID84qwRsB5ZxSqZi8O9kv7 f6HSb0yZbu5ZkI1M1IOG2dcMQrBTAoB9w5eARAqLJzrYw24Oqvsyj6cntzCTAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6AEO-0001fF-TP; Thu, 23 Nov 2023 08:59: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 1r6AEM-0001eS-R3 for guix-patches@gnu.org; Thu, 23 Nov 2023 08:58: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 1r6AEM-0001zR-IH for guix-patches@gnu.org; Thu, 23 Nov 2023 08:58:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6AEQ-0002zj-Cy for guix-patches@gnu.org; Thu, 23 Nov 2023 08:59:02 -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: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Nov 2023 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67328 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: eugen.stan@netdava.com Cc: 67328@debbugs.gnu.org Received: via spool by 67328-submit@debbugs.gnu.org id=B67328.170074792211476 (code B ref 67328); Thu, 23 Nov 2023 13:59:02 +0000 Received: (at 67328) by debbugs.gnu.org; 23 Nov 2023 13:58:42 +0000 Received: from localhost ([127.0.0.1]:32919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6AE5-0002z2-DD for submit@debbugs.gnu.org; Thu, 23 Nov 2023 08:58:41 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:34675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6AE2-0002yq-7k for 67328@debbugs.gnu.org; Thu, 23 Nov 2023 08:58:39 -0500 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id CCCF027BBE2; Thu, 23 Nov 2023 13:58:33 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 83802e4e; Thu, 23 Nov 2023 13:58:33 +0000 (UTC) References: <20231120200909.126545-1-eugen.stan@netdava.com> User-agent: mu4e 1.10.7; emacs 29.1 From: Christopher Baines Date: Thu, 23 Nov 2023 13:52:28 +0000 In-reply-to: <20231120200909.126545-1-eugen.stan@netdava.com> Message-ID: <87fs0wvaew.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -7.72 X-Migadu-Queue-Id: 87BA942CED X-Migadu-Spam-Score: -7.72 X-TUID: MUnhckqSKLa2 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable eugen.stan@netdava.com writes: > 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 "1lg97waqfcgzr3dz5426fbc4kqcsavpbqil2iyjm1dw3zrfa= 8ysi")) > + (sha256 (base32 "1q0z71ifdxwvyy9gvq8mx8jbygf8cszrlhb3h22walfamnis= bhwk")) > ;; Remove AOT compiled JAR. The other JAR only contains uncompil= ed > ;; 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/t= est_cljs.clj")))))) > + (lambda _ > + (delete-file "src/test/resources/clojure/data/xml/cljs_test= suite.clj") > + (delete-file "src/test/clojure/clojure/data/xml/test_cljs.c= lj")))))) > (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 w= riting > @@ -572,7 +572,72 @@ (define-public clojure-tools-cli > work with command-line arguments.") > (license license:epl1.0))) >=20=20 > +(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 ClojureScrip= t, > + ;; which is very difficult to package due to dependencies on Ja= va > + ;; libraries with non-standard build systems. Instead of actual= ly > + ;; 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") Upstream of Guix is the publishers of the software that Guix packages, so "upstream" in this case is probably the Clojure project. I don't think there's any particular concerns for those upstream or downstream of Guix in replacing clojure-tools-deps-alpha with clojure-tools-deps. The other thing with this change is that it should probably be two commits, separating the version change of clojure-tools from the other changes (even if the other changes cause clojure-tools to break before it's upgraded). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmVfWodfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfvBg//ZhtSSlZ/zbAuFQ3FHBN1Lfpl9p/f3Wt/ wxH78ocLyu67D6vvSLuJuAukmo5lLAmWE0aHGt+ggBbMwmk3SOHnsGQgLVV7W4IO x8kqXMH1CHnwG6i46I2UbzyVUSWtvSHGdpMxex96XYKVYKNlqmpaU6fj9x3utpde SeAULaf1tayIHeZh6mlVbhtiuPRj2CXz6tthoDoxtDSfOf/XyLhBkeut2d1rKQCZ ZMVrMctnuAamlc51C3w7QD/RvtiCiI6L6RMSebuIUaIN5/Sh6lX6IIvTrl+Pe5n5 fuG24puGeXLaEY3KfmfCSjqEVwykrfF1kpYyUmixo/CUf6kVNbEmyi8RUTGVV36M D3X1F/K2V8JoHtF45pxgWL6L6MQ/U4ZKBndDfyDxy8pMbB3qGwFHkIWrnFrxfmGB 4Cb5cyY4Iyen5gp3iwzffFJTb5a9b0lDZr+3n2Uwyvj8rYMECq6Vsd7gN6C7YfWP zWXot8uRmkDefHI9zk5u7Y0n6P8T0Uf9RowCyHfFaKqhg0MUOcA+jQycVCf9WVSd o8gw5sBnGd186NrRTlFfK9Zms2PEL/XmVoDf5loJZoAJKzmtxeWwAihR+J5wIZbm WeRTa9hiAliwjI9BCinRUZyataOzQ9CT6pY9V//9zkV5RGl8oTbRoepeNKkipd4u 38svrLveqkc= =KRE0 -----END PGP SIGNATURE----- --=-=-=--