Received: (at 74973) by debbugs.gnu.org; 26 Dec 2024 14:42:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 09:42:33 2024
Received: from localhost ([127.0.0.1]:40580 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tQp4K-0001Ce-HX
for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 09:42:33 -0500
Received: from mail-qt1-f178.google.com ([209.85.160.178]:55380)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <rostislav.svoboda@HIDDEN>) id 1tQp4G-0001CM-Cu
for 74973 <at> debbugs.gnu.org; Thu, 26 Dec 2024 09:42:29 -0500
Received: by mail-qt1-f178.google.com with SMTP id
d75a77b69052e-46788c32a69so79807571cf.2
for <74973 <at> debbugs.gnu.org>; Thu, 26 Dec 2024 06:42:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1735224083; x=1735828883; darn=debbugs.gnu.org;
h=content-transfer-encoding:cc:to:subject:message-id:date:from
:in-reply-to:references:mime-version:from:to:cc:subject:date
:message-id:reply-to;
bh=XY2wiO5BxO+Rd9/sIj/M7XydBltp+XBCSW3oFs6n/Ik=;
b=RDhXSDnguNJnVKqcgIF9i+ZOPt4HX8rj10EyyFwy4DnW3qCiAy6aK35+FrrZQVaRpK
EGCvX/esEA+67dqhpPM44UFMC2/50Lhz1wGoLUAFn1qZeefSeS4SrzkyFi0lj7dCcQON
iAqA92JEVwDNvbcurObctqYCwnhf3QN36dn0OEnEhaXsdbzbF8N8bbAAK5KtBr0izPqm
APkVyVuEAZUFtEZWCGSQkF8GDVrCqr6DYcQrvyIWV7mROj4e2FZ71e3cpVsu/63WEV3K
sTBH+azP5YnHP8/yCDURKZuCTgi8zofd3i+USP8nHYv5+2QZKejreL1YHC8kSraVPTlA
Zpcw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1735224083; x=1735828883;
h=content-transfer-encoding:cc:to:subject:message-id:date:from
:in-reply-to:references:mime-version:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=XY2wiO5BxO+Rd9/sIj/M7XydBltp+XBCSW3oFs6n/Ik=;
b=mihJwIVola0/zor77vwCPbDNwieq/EvM4JqGBFhSBHzFHnpUdbq28k2Has/9VKW0X3
zy3IUO1xcvw414Pc1Puzkf6Z5O/vohsD0IfuBkr7pzZ+nVwhDA5GKkow6iM6rUqPnEKt
j2uDqY7n73gK+w2YkOteTIdQUJbl7Z75lwTohe1YVgLFNZEHwYkx3dPJh1+yIimA1bW8
tbOp+4MpCxanFKHCH5hPWXfT39jy/s9Da5WVpqFbu3ucGu+TvunpdUZuihkQZz46vIfB
n5gULnSXiHvH0Hv3AFdoKN345QXC6Gj4KE48EDHWkKOhp6Zi2XOkBRhS/7PZymh5PBaj
S+CA==
X-Gm-Message-State: AOJu0Yxs8MU4pzBM3l6xsECrl+cEyINrZApXKSMdiMqUAjUCtiNhPzCc
h3CMOLdQInJ04pPnrofdTBhtaHeYRFhAQmo3x4+UO2uDtZk9ws9Pdu2vbm15nkQjrq+8V0tcLtD
5D328h2LPWNAXhC18RyW6SE9jt1w=
X-Gm-Gg: ASbGncvhopzP4Sn1lrEUskm87DUkkdsfEuQ99BNumYFQCwbOpRXp4z/ffuw9STPXZUS
a48NoqmKSYosj+4iymLvQMJH6Edh7ePBtXJA840rpDWL7wCrsFMJVBp9U/j2lRSGZScevX43c
X-Google-Smtp-Source: AGHT+IE1xiPjiwXX/rEqwndrmYLWV2gpTGNj1D4QQjcy/1jDbfvjYecQe7QFUSc+DKTRayChiLSIW4mw4mcT529XdSM=
X-Received: by 2002:a05:622a:20c:b0:469:647:6318 with SMTP id
d75a77b69052e-46a4a8eb78emr395474751cf.32.1735224081982; Thu, 26 Dec 2024
06:41:21 -0800 (PST)
MIME-Version: 1.0
References: <71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@HIDDEN>
<87h66r2zr3.fsf@HIDDEN>
In-Reply-To: <87h66r2zr3.fsf@HIDDEN>
From: Rostislav Svoboda <rostislav.svoboda@HIDDEN>
Date: Thu, 26 Dec 2024 15:40:45 +0100
Message-ID: <CAEtmmex9BPyXgPM+0B+GHL-K5-tHivrL-mixAfgdkpPyTJDeSQ@HIDDEN>
Subject: Re: [bug#74973] [PATCH] gnu: Fix clojure-tools.
To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74973
Cc: amorenompls@HIDDEN, 74973 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hello Ludo=E2=80=99
> Could we keep this snippet and instead find a way to ensure that this jar=
is built from source and installed?
Uff, we're diving into the rabbit hole here. The clojure-tools-*.jar
is built using itself and relies on a considerable number of
configuration settings and jar files. (See below.)
Cheers,
Bost
bost@ecke /tmp$ git clone https://github.com/clojure/brew-install
Clonage dans 'brew-install'...
remote: Enumerating objects: 6984, done.
remote: Counting objects: 100% (1280/1280), done.
remote: Compressing objects: 100% (89/89), done.
remote: Total 6984 (delta 1196), reused 1244 (delta 1171), pack-reused
5704 (from 1)
R=C3=A9ception d'objets: 100% (6984/6984), 854.54 Kio | 6.62 Mio/s, fait.
R=C3=A9solution des deltas: 100% (3418/3418), fait.
bost@ecke /tmp$ cd brew-install/
bost@ecke /tmp/brew-install$ clj -Sverbose -T:build release
version =3D 1.12.0.1488
install_dir =3D /gnu/store/s7basyx1rffp9bnacnr90v6zscx3ch72-clojure-tools-=
1.12.0.1488/lib/clojure
config_dir =3D /home/bost/.config/clojure
config_paths =3D /gnu/store/s7basyx1rffp9bnacnr90v6zscx3ch72-clojure-tools-=
1.12.0.1488/lib/clojure/deps.edn
/home/bost/.config/clojure/deps.edn deps.edn
cache_dir =3D .cpcache
cp_file =3D .cpcache/519643847.cp
Refreshing classpath
clojure-tools/
clojure-tools/clj
clojure-tools/clojure.1
clojure-tools/clj.1
clojure-tools/example-deps.edn
clojure-tools/install.sh
clojure-tools/exec.jar
clojure-tools/tools.edn
clojure-tools/clojure
clojure-tools/deps.edn
clojure-tools/clojure-tools-1.12.0.1488.jar
bost@ecke /tmp/brew-install$ clj -Stree
org.clojure/clojure 1.12.0
. org.clojure/spec.alpha 0.5.238
. org.clojure/core.specs.alpha 0.4.74
org.clojure/tools.deps 0.21.1460
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-spi 1.8.2
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-impl 1.8.2
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-spi 1.8.2
. org.apache.maven.resolver/maven-resolver-named-locks 1.8.2
. org.slf4j/slf4j-api 1.7.36
. org.apache.maven.resolver/maven-resolver-util 1.8.2
. org.apache.commons/commons-lang3 3.12.0
. javax.annotation/javax.annotation-api 1.3.2
. org.slf4j/slf4j-api 1.7.36
. org.apache.maven.resolver/maven-resolver-util 1.8.2
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-connector-basic 1.8.2
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-spi 1.8.2
. org.apache.maven.resolver/maven-resolver-util 1.8.2
. org.slf4j/slf4j-api 1.7.36
. org.apache.maven.resolver/maven-resolver-transport-file 1.8.2
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-spi 1.8.2
. org.slf4j/slf4j-api 1.7.36
. org.apache.maven.resolver/maven-resolver-transport-http 1.8.2
. org.apache.maven.resolver/maven-resolver-api 1.8.2
. org.apache.maven.resolver/maven-resolver-spi 1.8.2
. org.apache.maven.resolver/maven-resolver-util 1.8.2
. org.apache.httpcomponents/httpclient 4.5.13
X org.apache.httpcomponents/httpcore 4.4.13 :older-version
. commons-codec/commons-codec 1.11
. org.apache.httpcomponents/httpcore 4.4.15
. org.slf4j/jcl-over-slf4j 1.7.36
. org.slf4j/slf4j-api 1.7.36
. org.slf4j/slf4j-api 1.7.36
. org.apache.maven/maven-resolver-provider 3.8.8
. org.apache.maven/maven-model 3.8.8
. org.codehaus.plexus/plexus-utils 3.3.1
. org.apache.maven/maven-model-builder 3.8.8
. org.codehaus.plexus/plexus-utils 3.3.1
. org.codehaus.plexus/plexus-interpolation 1.26
. javax.inject/javax.inject 1
. org.apache.maven/maven-model 3.8.8
. org.apache.maven/maven-artifact 3.8.8
. org.apache.maven/maven-builder-support 3.8.8
. org.eclipse.sisu/org.eclipse.sisu.inject 0.3.5
. org.apache.maven/maven-repository-metadata 3.8.8
. org.codehaus.plexus/plexus-utils 3.3.1
X org.apache.maven.resolver/maven-resolver-api 1.6.3 :older-version
X org.apache.maven.resolver/maven-resolver-spi 1.6.3 :older-version
X org.apache.maven.resolver/maven-resolver-util 1.6.3 :older-version
X org.apache.maven.resolver/maven-resolver-impl 1.6.3 :older-version
X org.codehaus.plexus/plexus-utils 3.3.1 :superseded
. javax.inject/javax.inject 1
. org.apache.maven/maven-core 3.8.8
. org.apache.maven/maven-model 3.8.8
. org.apache.maven/maven-settings 3.8.8
. org.codehaus.plexus/plexus-utils 3.3.1
. org.apache.maven/maven-settings-builder 3.8.8
. org.apache.maven/maven-builder-support 3.8.8
. javax.inject/javax.inject 1
. org.codehaus.plexus/plexus-interpolation 1.26
. org.codehaus.plexus/plexus-utils 3.3.1
. org.apache.maven/maven-settings 3.8.8
. org.codehaus.plexus/plexus-sec-dispatcher 2.0
. org.codehaus.plexus/plexus-utils 3.4.1 :newer-version
. org.codehaus.plexus/plexus-cipher 2.0
. javax.inject/javax.inject 1
. javax.inject/javax.inject 1
. org.apache.maven/maven-builder-support 3.8.8
. org.apache.maven/maven-repository-metadata 3.8.8
. org.apache.maven/maven-artifact 3.8.8
. org.codehaus.plexus/plexus-utils 3.3.1
X org.apache.commons/commons-lang3 3.8.1 :older-version
. org.apache.maven/maven-plugin-api 3.8.8
. org.apache.maven/maven-model 3.8.8
. org.apache.maven/maven-artifact 3.8.8
. org.eclipse.sisu/org.eclipse.sisu.plexus 0.3.5
. org.codehaus.plexus/plexus-utils 3.3.1
. org.codehaus.plexus/plexus-classworlds 2.6.0
. org.apache.maven/maven-model-builder 3.8.8
. org.apache.maven/maven-resolver-provider 3.8.8
X org.apache.maven.resolver/maven-resolver-impl 1.6.3 :older-version
X org.apache.maven.resolver/maven-resolver-api 1.6.3 :older-version
X org.apache.maven.resolver/maven-resolver-spi 1.6.3 :older-version
X org.apache.maven.resolver/maven-resolver-util 1.6.3 :older-version
. org.apache.maven.shared/maven-shared-utils 3.3.4
. org.eclipse.sisu/org.eclipse.sisu.plexus 0.3.5
X javax.annotation/javax.annotation-api 1.2 :older-version
. org.eclipse.sisu/org.eclipse.sisu.inject 0.3.5
X org.codehaus.plexus/plexus-component-annotations 1.5.5 :older-versi=
on
X org.codehaus.plexus/plexus-classworlds 2.5.2 :older-version
X org.codehaus.plexus/plexus-utils 3.0.24 :older-version
. org.eclipse.sisu/org.eclipse.sisu.inject 0.3.5
. com.google.inject/guice$no_aop 4.2.2
. javax.inject/javax.inject 1
. aopalliance/aopalliance 1.0
X com.google.guava/guava 25.1-android :excluded
. javax.inject/javax.inject 1
. org.codehaus.plexus/plexus-utils 3.3.1
. org.codehaus.plexus/plexus-classworlds 2.6.0
. org.codehaus.plexus/plexus-interpolation 1.26
. org.codehaus.plexus/plexus-component-annotations 2.1.0
X org.apache.commons/commons-lang3 3.8.1 :older-version
. org.slf4j/slf4j-api 1.7.36
. org.clojure/data.xml 0.2.0-alpha9
. org.clojure/tools.gitlibs 2.5.197
. org.clojure/tools.cli 1.1.230
. com.cognitect.aws/api 0.8.692
. org.clojure/data.json 2.5.0
. org.clojure/tools.logging 1.2.4
. com.cognitect/http-client 1.0.127
. org.clojure/core.async 1.6.681
X org.eclipse.jetty/jetty-client 9.4.53.v20231009 :excluded
X org.eclipse.jetty/jetty-http 9.4.53.v20231009 :excluded
X org.eclipse.jetty/jetty-util 9.4.53.v20231009 :excluded
X org.clojure/data.xml 0.2.0-alpha8 :older-version
. org.clojure/core.async 1.6.681
. org.clojure/tools.analyzer.jvm 1.2.3
. org.clojure/tools.analyzer 1.1.1
. org.clojure/core.memoize 1.0.253
. org.clojure/core.cache 1.0.225
. org.clojure/data.priority-map 1.1.0
. org.ow2.asm/asm 9.2
. org.clojure/tools.reader 1.3.6
. org.eclipse.jetty/jetty-http 9.4.53.v20231009
. org.eclipse.jetty/jetty-util 9.4.53.v20231009
. org.eclipse.jetty/jetty-io 9.4.53.v20231009
. org.eclipse.jetty/jetty-util 9.4.53.v20231009
. org.eclipse.jetty/jetty-client 9.4.53.v20231009
. org.eclipse.jetty/jetty-http 9.4.53.v20231009
. org.eclipse.jetty/jetty-io 9.4.53.v20231009
. com.cognitect.aws/endpoints 1.1.12.718
. com.cognitect.aws/s3 868.2.1580.0
. javax.inject/javax.inject 1
org.slf4j/slf4j-nop 1.7.36
. org.slf4j/slf4j-api 1.7.36
guix-patches@HIDDEN:bug#74973; Package guix-patches.
Full text available.Received: (at 74973) by debbugs.gnu.org; 25 Dec 2024 21:56:40 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 25 16:56:39 2024 Received: from localhost ([127.0.0.1]:39237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tQZMt-000319-I1 for submit <at> debbugs.gnu.org; Wed, 25 Dec 2024 16:56:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tQZMs-00030u-11 for 74973 <at> debbugs.gnu.org; Wed, 25 Dec 2024 16:56:38 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tQZMm-0000lg-0I; Wed, 25 Dec 2024 16:56:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=PoIcU4ZWyqmqpjUtb+IhyUXjb/zoeatFXtxFKf6+aAs=; b=sC7YqazPrlUm20/L5385 nFnx6WSi+LnJaTrQaszuK0PpPJWKonVIrN65zvElPiRQGTnnzm5JtddeHs4CaZ7dx44zLJVZLyXRD oxrxBD6wKuIKgOgD5e3cuDEi3kUUYUFPgFsQ8VVw2NhMaWIWwR3Camt2hWKWGJYVl7vKR60ZiTBMe JtjVRo4ucMPhT4oq/SSlGoQf4G4JbyknSHWAGkc3v/8NLVbXfqbFRV29QL4Y6t0eDdUrilWkiDUix aGjfx9NM/mQ2+zg6eMmR3V1w/2U2ol4joGqD9ZHgZJx7vcFsMEdCK53qRdZbc35YtyLny0WuQdhLh Wdyy/aRpdoNAyg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Rostislav Svoboda <rostislav.svoboda@HIDDEN> Subject: Re: [bug#74973] [PATCH] gnu: Fix clojure-tools. In-Reply-To: <71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@HIDDEN> (Rostislav Svoboda's message of "Thu, 19 Dec 2024 15:22:27 +0100") References: <71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@HIDDEN> Date: Wed, 25 Dec 2024 22:56:16 +0100 Message-ID: <87h66r2zr3.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74973 Cc: amorenompls@HIDDEN, 74973 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi Rostislav, Rostislav Svoboda <rostislav.svoboda@HIDDEN> skribis: > * gnu/packages/clojure.scm (clojure-tools): The AOT compiled JAR must be > included and used by the bin/clojure script. > > See also > https://yhetil.org/guix-user/CAOXoXz0fKD+3B+b_y6A8MPYxZcSRDusby6VWTUy8Nnp= 4Y0fAzQ@HIDDEN/ > > Change-Id: I3a8221fd415631f191cbf6ddcb0e8ecbd94e389f [...] > (source > (origin > (method url-fetch) > (uri (string-append "https://download.clojure.org/install/clojure= -tools-" > version > ".tar.gz")) > - (sha256 (base32 "1q0z71ifdxwvyy9gvq8mx8jbygf8cszrlhb3h22walfamnis= bhwk")) > - ;; Remove AOT compiled JAR. The other JAR only contains uncompil= ed > - ;; Clojure source code. > - (snippet > - `(delete-file ,(string-append "clojure-tools-" version ".jar")))= )) > + (sha256 (base32 "0hh78b22shj530armm9850cqr85wqdxyqfzx4qf45w5y200b= w6dw")))) The problem is that in general we don=E2=80=99t want to keep pre-built bina= ries like this one. Could we keep this snippet and instead find a way to ensure that this jar is built from source and installed? Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#74973; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 14:23:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 09:23:07 2024
Received: from localhost ([127.0.0.1]:38005 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOHQh-0002FN-9w
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 09:23:07 -0500
Received: from lists.gnu.org ([209.51.188.17]:57880)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <rostislav.svoboda@HIDDEN>) id 1tOHQf-0002FF-5u
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 09:23:05 -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 <rostislav.svoboda@HIDDEN>)
id 1tOHQd-0001Zl-K8
for guix-patches@HIDDEN; Thu, 19 Dec 2024 09:23:03 -0500
Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <rostislav.svoboda@HIDDEN>)
id 1tOHQb-0007HZ-QM
for guix-patches@HIDDEN; Thu, 19 Dec 2024 09:23:03 -0500
Received: by mail-ej1-x636.google.com with SMTP id
a640c23a62f3a-aa696d3901bso146092866b.1
for <guix-patches@HIDDEN>; Thu, 19 Dec 2024 06:23:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734618179; x=1735222979; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=X3K9y7IWmktqkgZjnQD/Y09eOlFreL6ysOK/y7YxyJ4=;
b=byQIEGDbWSconq8uShdSLqlM9OGLOCQo8+Dc+6InI7AOB8LtNJsTKfUJx16A1PwkR+
SKfHFi4DullBN1ZBNhpOcE4FnXCdbqJYteXiLYoRf1bY/C5UU/lj+5QQ+Q40yV95xbCD
aXug0sUdhH98yaFDFsKMsg4+CBmL8iRO+yzh9MRiCfy+hFG8Bmb3CIVPIJWySINoVMyM
AmOg+pxGk8ZG2quvzGUaCUEoVvadZqIYMJCRh9rh4jojfVdmjM1JvtWItC+p9HVqphcK
NmfGoMjYQkli/qZjx+xJuZ0s3dDhH3RZruLuXjBUXoaqJC/tYC/Xlr4Fnf2VAvDlTK7A
R2tA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734618179; x=1735222979;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=X3K9y7IWmktqkgZjnQD/Y09eOlFreL6ysOK/y7YxyJ4=;
b=Sjq+TCtUsvzVW+8nl+57qO5ZMiPCk6EEAZ7UvNIkfjBeCsMUoCxkJ9Qb6x2UbSRDB4
1i7tA+UUb781s1pFSaRUlzRYhjYW4LKcKf7gaK4w2KlZ2fQVCGT+HZIoZIdOly6E+Rsf
scH7VFAmqmqeU3DmeAmSdPEnat2muPcaSRl7P9Jh9vxwSjEf0C/Ru/ByIjbYhQXz54Nl
Gvo8OBTDAqcq+Q1y9Cv+l2goljGqocCt2xsJ0kwcOpphvXSvxs7ZukHYU81OIJtZzLQ3
m5mg9owtSPNFzmMDER2T573GYLUmOLozQYbIoXLZEXHUkUV6GCAvKBS88LbLxJJYs1hT
0tZA==
X-Gm-Message-State: AOJu0Yyep4Ym8G096nPQK2gpxot4qVfmTusoqY0ts6443hxA7MeVMutw
4Vbib7/K7gXUXFgDrbbUR3ZvdREB/t/6oMJabZgpyVCZiFfiaDMVfXcyww==
X-Gm-Gg: ASbGncvLgCwt4C9zYrpLDJ0RB8LTmAgNlR9hEU1MyVX65DaoVYzkWn7ZL1gFqaojA0B
RKpEbKgRz8YdAWik+T+fKT4cNBTBh/uaLiiQaluhr4hF0k0Y4NhJroGcFsQbiEev0kzkie9pD42
oUjNsAsTnBaxx4UhFcjRelj7rYmo/Ha6SPFsr3VBOiIXEoLjiKzJN5fIh/OnHY4Qw5MTxkO+7xu
QC1SrkvK6rAACBkpFPeCjDvg4O0Ft5Vck/gaXG6zApGWEmQ8MKbM3q0dVSDLoRPzd9K+ggOKFBY
XX1GB0n+WLvz4D3W/3e/uV9yiGJQt/ku0O1ZYFFZaEO5qjPCwLeJ1wf7dfjk4xuu2c1bS4jlv+K
/fYaq6Lo=
X-Google-Smtp-Source: AGHT+IFb7xJHQ6hV9XE3f65Sd9cxyUWPPAWRyIkCLtjNQTtw7ZW/S5Gj0ijhFoh14ftDwm7iJxEA5Q==
X-Received: by 2002:a17:906:328d:b0:aa6:79fa:b483 with SMTP id
a640c23a62f3a-aabf44af144mr602372766b.0.1734618179083;
Thu, 19 Dec 2024 06:22:59 -0800 (PST)
Received: from ecke.fritz.box
(dynamic-2a02-3100-66ac-1f00-befc-6c9c-2f6c-f05f.310.pool.telefonica.de.
[2a02:3100:66ac:1f00:befc:6c9c:2f6c:f05f])
by smtp.googlemail.com with ESMTPSA id
a640c23a62f3a-aac0e82f1d2sm71091066b.11.2024.12.19.06.22.58
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 19 Dec 2024 06:22:58 -0800 (PST)
From: Rostislav Svoboda <rostislav.svoboda@HIDDEN>
X-Google-Original-From: Rostislav Svoboda <Rostislav.Svoboda@HIDDEN>
To: guix-patches@HIDDEN,
amorenompls@HIDDEN
Subject: [PATCH] gnu: Fix clojure-tools.
Date: Thu, 19 Dec 2024 15:22:27 +0100
Message-ID: <71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::636;
envelope-from=rostislav.svoboda@HIDDEN; helo=mail-ej1-x636.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: Rostislav Svoboda <Rostislav.Svoboda@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
* gnu/packages/clojure.scm (clojure-tools): The AOT compiled JAR must be
included and used by the bin/clojure script.
See also
https://yhetil.org/guix-user/CAOXoXz0fKD+3B+b_y6A8MPYxZcSRDusby6VWTUy8Nnp4Y0fAzQ@HIDDEN/
Change-Id: I3a8221fd415631f191cbf6ddcb0e8ecbd94e389f
---
gnu/packages/clojure.scm | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index 09674f541e..6146b38753 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -204,18 +204,14 @@ (define-public clojure
(define-public clojure-tools
(package
(name "clojure-tools")
- (version "1.11.1.1413")
+ (version "1.12.0.1488")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.clojure.org/install/clojure-tools-"
version
".tar.gz"))
- (sha256 (base32 "1q0z71ifdxwvyy9gvq8mx8jbygf8cszrlhb3h22walfamnisbhwk"))
- ;; Remove AOT compiled JAR. The other JAR only contains uncompiled
- ;; Clojure source code.
- (snippet
- `(delete-file ,(string-append "clojure-tools-" version ".jar")))))
+ (sha256 (base32 "0hh78b22shj530armm9850cqr85wqdxyqfzx4qf45w5y200bw6dw"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
@@ -223,6 +219,7 @@ (define-public clojure-tools
("example-deps.edn" "lib/clojure/")
("tools.edn" "lib/clojure/")
("exec.jar" "lib/clojure/libexec/")
+ (,(string-append "clojure-tools-" version ".jar") "lib/clojure/libexec/")
("clojure" "bin/")
("clj" "bin/"))
#:modules ((guix build copy-build-system)
@@ -237,17 +234,7 @@ (define-public clojure-tools
(("PREFIX") (string-append (assoc-ref outputs "out") "/lib/clojure")))
(substitute* "clj"
(("BINDIR") (string-append (assoc-ref outputs "out") "/bin"))
- (("rlwrap") (which "rlwrap")))))
- (add-after 'fix-paths 'copy-tools-deps-alpha-jar
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "clojure"
- (("\\$install_dir/libexec/clojure-tools-\\$version\\.jar")
- (string-join
- (append-map (match-lambda
- ((label . dir)
- (find-files dir "\\.jar$")))
- inputs)
- ":"))))))))
+ (("rlwrap") (which "rlwrap"))))))))
(inputs (list rlwrap
clojure
clojure-tools-deps
base-commit: 5634bc206d82a867850c86044c423b0a8700f34e
--
2.46.0
Rostislav Svoboda <rostislav.svoboda@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#74973; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.