From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eA8aE8oAxWFI4AAAgWs5BA (envelope-from ) for ; Fri, 24 Dec 2021 00:05:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id UHncDsoAxWGWdAAAB5/wlQ (envelope-from ) for ; Thu, 23 Dec 2021 23:05:46 +0000 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 11C1E32CAF for ; Fri, 24 Dec 2021 00:05:46 +0100 (CET) Received: from localhost ([::1]:42976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0X9d-0004r4-1v for larch@yhetil.org; Thu, 23 Dec 2021 18:05:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0X96-0004ps-FV for guix-patches@gnu.org; Thu, 23 Dec 2021 18:05:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0X91-0003d4-0i for guix-patches@gnu.org; Thu, 23 Dec 2021 18:05:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0X90-0003Z5-SJ for guix-patches@gnu.org; Thu, 23 Dec 2021 18:05:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48735] [PATCH v2 10/10] gnu: clojure: Remove wrapper in favor of using Resent-From: Reily Siegel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 23:05:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48735@debbugs.gnu.org Received: via spool by 48735-submit@debbugs.gnu.org id=B48735.164030070313649 (code B ref 48735); Thu, 23 Dec 2021 23:05:06 +0000 Received: (at 48735) by debbugs.gnu.org; 23 Dec 2021 23:05:03 +0000 Received: from localhost ([127.0.0.1]:35201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0X8x-0003Xu-0j for submit@debbugs.gnu.org; Thu, 23 Dec 2021 18:05:03 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:43552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0X8s-0003X0-Gs for 48735@debbugs.gnu.org; Thu, 23 Dec 2021 18:04:59 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [80.241.60.233]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4JKm451LnZzQl7b for <48735@debbugs.gnu.org>; Fri, 24 Dec 2021 00:04:53 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=reilysiegel.com; s=MBO0001; t=1640300693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=g0FrhNki7XQUqTXI117qgCoTC4l+JoIv0ujiV0zfXNc=; b=johDIAFKxefK7kdW6QklZIKrs0/hYifjQTClYDhTTVLfUTkvy+9nb+pI0e1e46zoGz65QU RghYBgZVqb1dRK+CgdE9SrBYokO/7MlMEdPnxAS4OuVvPG/t3zR9oxE2tzn4lGG9q/wVlk SRQMzHG1QczZx9H19XiLNuUrB9g8bz6bdgDO5YE12gyJKdJRPTC34casXwf5LmLqR1eiUp guyB33jE6gwtzYWIb8qNmOZGzvIWdFYlxuHjrkePkfWoMCVIj6LUowVioQzLUmPLbhSJf5 cUUO07UuaflPy/ziWc6YBK6njR8nXeri5d09CfDDtyjQ7Obp+cBAHqrjaL4lhg== From: Reily Siegel In-Reply-To: References: Message-Id: Date: Thu, 23 Dec 2021 18:04:50 -0500 MIME-Version: 1.0 Content-Type: text/plain 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640300746; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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: dkim-signature; bh=g0FrhNki7XQUqTXI117qgCoTC4l+JoIv0ujiV0zfXNc=; b=QKlxFF8iBi25qcdkobY4ks0gJjuJZCHnDO4TwNrYE+qIoWZYSeIG+u29+drdyezb80hogV h3XfTrKXM4gsht2m07uMvoudeQyBZO+jrJVNanRRfMYlR71EkU1UeHQP2vI2V4yGB1HQFP UjmmhUEkc/57CwUqUPMcp3XcQdS5f4KWTwcHdvjk8ZrRbf93MXuZ50z6ffEUrGpoE6ot7C Dssvr3O7DdFAW+oDsEiRSHV25a3eS6P33omUsRFUDuu9zaStMolj8kr3MZg/Phqsn7/dQX 1Ares8bsb7ueMKCwJqJWtFp78+LKUffCrXMI2MIQHOU9vZQbMiFdVeJw2xR9nA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640300746; a=rsa-sha256; cv=none; b=nzQIYdJAMb84dB8yz7jhktkFhcSQEYIs4L1Ir4AHQ3fi2iNiXDrufQYAvg4YhS1HagE/q2 Vw1KcTq2PhSKG9Ew1/C7NkRScsFlDM6+O0LhAIVH2PpbYSpivLW9G2SgkXHVJH0yMOOmXg i/0JvCPfBhFkK3rKe3a9nHRpI2OOcbotv3Ls2B/Z7zhG5YRNS2nx3HpSG+nzNQEisaTaJD TA8S3aK6FC+cgZXjPjuLmk1RXsy1C2Z6LBv8wB2iMxrMA9fMAsI7FjgeUoSUSOJIAmfJ7P n5IIxS90pqGpH72SNJGTuqjwtV1yZEHdQmGvS5eOHC4BJ2hxrgQOqVNB23Y/dQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=reilysiegel.com header.s=MBO0001 header.b=johDIAFK; 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" X-Migadu-Spam-Score: -1.85 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=reilysiegel.com header.s=MBO0001 header.b=johDIAFK; 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" X-Migadu-Queue-Id: 11C1E32CAF X-Spam-Score: -1.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: vBZz2Mz9gx4/ * gnu/packages/clojure.scm (clojure): Remove generated wrapper around clojure.jar, as it conflicts with the clojure-tools package. --- gnu/packages/clojure.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index b091f31eca..71e5e22937 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -122,23 +122,7 @@ (define (extract-library name) (add-after 'install-license-files 'install-doc (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (add-after 'install-doc 'install-javadoc - (install-javadoc "target/javadoc/")) - (add-after 'install 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (wrapper (string-append out "/bin/clojure"))) - (mkdir-p (string-append out "/bin")) - (with-output-to-file wrapper - (lambda _ - (display - (string-append - "#!" - (which "sh") - "\n\n" - (assoc-ref inputs "jre") "/bin/java -jar " - out "/share/java/clojure.jar \"$@\"\n")))) - (chmod wrapper #o555)) - #t))))) + (install-javadoc "target/javadoc/"))))) (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") -- 2.34.0