From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qIwRN8ctZGfLcwAAe85BDQ:P1 (envelope-from ) for ; Thu, 19 Dec 2024 14:29:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id qIwRN8ctZGfLcwAAe85BDQ (envelope-from ) for ; Thu, 19 Dec 2024 15:29:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="SO/fkf0d"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=byQIEGDb; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734618567; 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=X3K9y7IWmktqkgZjnQD/Y09eOlFreL6ysOK/y7YxyJ4=; b=TqhGexEo2IDxyr4186CIbnYob9LZYSN7azletgQ23G9zJEcCpNlpOXTDVTvWglFjO5f/7h FcRILkq0qLHQ92m0AcN+1R6RxF6fOnKa9RhUYwvhi4Q3qSn511veYa9E4/8jOeF44893cY 8kBwPYO2UsYRQU+zUvUPrM+lS+tsR7rFDzasxXqagByzjE9AKJgcpLxy9WHZ7Anof+IU9j oIw4CzbOyOkK5dR4/Kdw9K0KAiZPDb3OPcK4vegT5WYhYyeFrtwT/iTE+4KSSTeqd/odjw BV4uAvNohUO47w4M4H8DKLsGT7KuMi4baATFLCRs5d2GeZ52QeQ5e4zPkwsKDA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="SO/fkf0d"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=byQIEGDb; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734618567; a=rsa-sha256; cv=none; b=BzyA3pBmSjBh3xGB26h9VSokknFxrGNMxOAl2Z2qt/hljxoyMp9p3a2Nrf9IxrH4zJE8Ki xdHDYrAJCdnfo7uOR1WSJ069CCEXwcRkYvwB/kSsMqL8g+UknsoOqrqOdrNp1hFv1vliOR W5xQu7MhdWLZpoNrbIzf4lc8209GwGxwMo7I8blo2UZcyf+J6fU3lwF/gTUpS1GvMC9+Kq UiaQ/T1ol+fTSYVo408esZj8jtn4P4yzHmh2PxOcE0xhKD7olDQi+8Vsj0BgLelcvRnbSP rM3KSHyQ4vbIPw7nKc3hEAeO/JFHqToGFf8pWiTgUWo/hA+Fa4g7fn4yKSP6hA== 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 623B9538EA for ; Thu, 19 Dec 2024 15:29:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOHWC-000207-67; Thu, 19 Dec 2024 09:28:51 -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 1tOHRa-0001df-Qy for guix-patches@gnu.org; Thu, 19 Dec 2024 09:24: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 1tOHRa-0007NK-Gi for guix-patches@gnu.org; Thu, 19 Dec 2024 09:24:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=X3K9y7IWmktqkgZjnQD/Y09eOlFreL6ysOK/y7YxyJ4=; b=SO/fkf0d3O6gUVcvAjdQyf4tzGo39EMKicjKCjSZz2mmvxypHvEYW0TjkODWLkIXoIkXqKNdoqwi+uvsMofHPprgd+JSoLLiH0UWX2z2aE6J76joYm1pvrQg1J05awPWFN5vo46kT59om5vTD4hcboSEXdqv7LQF+FuNzOjvygTiNzSk3Anp5PJyBSlm2gvfDYoIJJLLw3WJSAFeSq6xJh0/Es1YDUQX6mFywhqECtk0SLTS1qw9IOifnftz1sR4M2GLLNw6OhVl3RoQQJDoejQ/nY5afjLHemNlxChikC4tQVnPM8V1BdagnXTknKKnMhjgZEFT6BVBqeunxQeftw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOHRa-0002Gd-43 for guix-patches@gnu.org; Thu, 19 Dec 2024 09:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74973] [PATCH] gnu: Fix clojure-tools. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 14:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74973 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74973@debbugs.gnu.org, amorenompls@gmail.com Cc: Rostislav Svoboda X-Debbugs-Original-To: guix-patches@gnu.org, amorenompls@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.17346181878645 (code B ref -1); Thu, 19 Dec 2024 14:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 14:23:07 +0000 Received: from localhost ([127.0.0.1]:38005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOHQh-0002FN-9w for submit@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 ) id 1tOHQf-0002FF-5u for submit@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 ) id 1tOHQd-0001Zl-K8 for guix-patches@gnu.org; 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 ) id 1tOHQb-0007HZ-QM for guix-patches@gnu.org; Thu, 19 Dec 2024 09:23:03 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-aa696d3901bso146092866b.1 for ; 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 X-Google-Original-From: Rostislav Svoboda Date: Thu, 19 Dec 2024 15:22:27 +0100 Message-ID: <71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@gmail.com> 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@gmail.com; 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-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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.53 X-Spam-Score: -3.53 X-Migadu-Queue-Id: 623B9538EA X-TUID: b7bKhW9dLJrH * 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@mail.gmail.com/ 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