From patchwork Tue Oct 8 03:31:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 36665 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0483827BBE2; Mon, 6 Jan 2025 01:31:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5833A27BBE2 for ; Mon, 6 Jan 2025 01:31:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUbxU-0000OX-Rf; Sun, 05 Jan 2025 20:31:08 -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 1tUbxP-0000No-Vi for guix-patches@gnu.org; Sun, 05 Jan 2025 20:31:04 -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 1tUbxP-0001rL-L1 for guix-patches@gnu.org; Sun, 05 Jan 2025 20:31:03 -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:In-Reply-To:From:To:References:Subject; bh=cdibrNKha1/ItOQt6Tm3aI33gJc2DMjfkEq8UOR12Ws=; b=gq/KMXxaiKFokBbweTtK8SpZdLGq2AD2UCEGE4kNd0/qOw3Q4XeLVu1kpPLasf3I+VcfR1DXyQb+9uFTXqr2T484AKIJEfJcAFlqZ5Nbc34bhw8Q+rK/CIEpL9R55nHV/O6q20585maMGNnTgO06mAKrlCCnSWKB+27k+UgFH9uEaVxEMgkBydLwVeOrqpBzG5Sv3eDrT8RKnAtgFQ52d12Z9o9xBPOozTXoSB9G8gVouBV3rAGvDVhX3XdKrg0P3Ihsr0Ig0gfYRYmmoEY5eZjRjGpIjyaWFCLV/ms6NPTE/PoSokZYBcUMf4c58DZ39buisOSvqYewiJPiour1Vg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUbxN-00016G-SB; Sun, 05 Jan 2025 20:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75394] [PATCH v14 1/2] gnu: Add jpm package. References: Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2025 01:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75394@debbugs.gnu.org Cc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 75394-submit@debbugs.gnu.org id=B75394.17361270144151 (code B ref 75394); Mon, 06 Jan 2025 01:31:01 +0000 Received: (at 75394) by debbugs.gnu.org; 6 Jan 2025 01:30:14 +0000 Received: from localhost ([127.0.0.1]:36051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUbwb-00014s-Um for submit@debbugs.gnu.org; Sun, 05 Jan 2025 20:30:14 -0500 Received: from mail-qv1-xf41.google.com ([2607:f8b0:4864:20::f41]:52617) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUbwa-000101-2g for 75394@debbugs.gnu.org; Sun, 05 Jan 2025 20:30:13 -0500 Received: by mail-qv1-xf41.google.com with SMTP id 6a1803df08f44-6dd16e1cfa1so120712236d6.1 for <75394@debbugs.gnu.org>; Sun, 05 Jan 2025 17:30:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736127006; x=1736731806; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=cdibrNKha1/ItOQt6Tm3aI33gJc2DMjfkEq8UOR12Ws=; b=V6CcceQWoHjmBdOjS7wq684cOXN2K3mykgMxZrRfJlNBwtnMiz0lQ1h0c0DwOnhCbH BI/WmNomxnmmkCK0ed2Z7yjDm/ByAa0KZho36owOEct6KuFPtrw0GJ7XnuQRF0DF4ZtA VuGN3orLIGuJAFh70oKkbjvDzMpM3xoF6NIkdXRWvwnmWmZqaZB+X6vCulUkecZ/l1ee 0c0GvyZ9ZPgC7ATTGTfVwphcGV7U9mfXWEiabhcAHxAJIqPn1urlM5WRxOpaXGjc1OOu erWunUYD5ZKTG9eLvQtCBHd+ebOJ8n4QzvhUbB5Pwla10VOXq+YIznKFYEMlwrrnWwwb ArBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736127006; x=1736731806; h=content-transfer-encoding:mime-version:message-id:date:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cdibrNKha1/ItOQt6Tm3aI33gJc2DMjfkEq8UOR12Ws=; b=p7qYU9ObMs5JYV5SBp8/gu1a49vgfTNfM33aG4HnKWbmcQFY2oxbxDzgnJy9aMpMIK /EtY60J0BDIqLI2F2rOHX1BpZQqwf6pYW12ySTnrxTxbjw1JRLpDcaOSDAGXB6zxZAb1 obXPUcgEdhyWxBfBiFUjEyyWuUKcEJYm1IB/xN3EpeQgsoLKMc1vyV4I9JQfUzN09QxP nPP140/sFdWsZqwuSHZAejzAFBSkkIFkaZ4u30HSjy+KuTJA6lnGu802wf9B1xGEYXE2 H3DhMMNoBntsB/P/d/YVTC7nc7hm/B4hNdIVYox1+naQJtm//76TNVrfuzlLGYAc6Dfy s+eA== X-Gm-Message-State: AOJu0YwUtV0p0KtZ8BRujLxXZI47c1TwPScCacDnDXrqOEXJjJjobXg3 Qd/MvQGVqL8Fy3rmcxjTp8cjvuStOCjikpCTjPnP6WERgF3NBmHVXKuOZzN8 X-Gm-Gg: ASbGncvAz7LeQlx9b54jI1Cec3rikadSbuOBz2Skiikiv+46ySEKbhDdVOr7jjTXurU O/tTuYGLLblP1uYbNkgmKvfzIypEpI5Of6DHBzZ6wlJpmnAIqlkGs76VD9Cfb0fbRhzh3D+1nam AUDpH7unXsL4m43kzlosWn2LTunggKfGSrb8ugE3V1GLeDmFQDDKWT2A5VKp6eRvis82glqO/Db VbqRc4aF6T1F2siiUT9S444lek60UyvuGLfdzy3dH2/qe3KbALM3TCad1MwZmGxqZD52OBYi3BU jN/KYZ9z8SaQL+xNVw== X-Google-Smtp-Source: AGHT+IHgjj+RX43CoaYCniRWuZAgSS/pFbf9dqF5yi4zFbXKLM3dK8hrhk0UjtKzDf5vH4cRl2zrrQ== X-Received: by 2002:ad4:5d61:0:b0:6d8:accb:5a3d with SMTP id 6a1803df08f44-6dd23397b68mr989086956d6.34.1736127003990; Sun, 05 Jan 2025 17:30:03 -0800 (PST) Received: from gnus (mtrlpq0776w-70-26-179-129.dsl.bell.ca. [70.26.179.129]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dd18110450sm165938066d6.44.2025.01.05.17.30.02 for <75394@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 17:30:03 -0800 (PST) From: "Suhail Singh" In-Reply-To: Date: Mon, 7 Oct 2024 23:31:57 -0400 Message-Id: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lisp.scm (jpm): New variable. Change-Id: I9f5ab89a38622689b5d3545abe5d87906dc61f3b Signed-off-by: Suhail --- gnu/packages/lisp.scm | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 9cc630eec2..f99ad68828 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2024 Andreas Enge ;;; Copyright © 2024 bigbug ;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024 Omar Bassam ;;; Copyright © 2024 David Pflug ;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; @@ -64,6 +65,7 @@ (define-module (gnu packages lisp) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -919,6 +921,77 @@ (define-public janet assembler, PEG) is less than 1MB.") (license license:expat))) +(define-public jpm + (package + (name "jpm") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janet-lang/jpm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05rdxigmiy7vf93s16a8n2029lq33073jccz1rjl4iisxj6piw4l")))) + (build-system copy-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configs/linux_config.janet" + (("/usr/local") + #$output) + (("\"cc\"") + (string-append "\"" + (search-input-file inputs "/bin/gcc") + "\"")) + (("\"c\\+\\+\"") + (string-append "\"" + (search-input-file inputs "/bin/g++") + "\"")) + (("\"git\"") + (string-append "\"" + (search-input-file inputs "/bin/git") + "\"")) + (("\"curl\"") + (string-append "\"" + (search-input-file inputs "/bin/curl") + "\""))) + (substitute* "jpm/shutil.janet" + (("cp") + (string-append (search-input-file inputs "/bin/cp")))) + (setenv "PREFIX" + #$output))) + (replace 'install + (lambda _ + (for-each (lambda (dir) + (mkdir-p (string-append #$output "/" dir))) + '("lib/janet/jpm" "share/man/man1")) + (invoke "janet" "bootstrap.janet" + "configs/linux_config.janet") + (wrap-program (string-append #$output "/bin/jpm") + `("JANET_HEADERPATH" ":" = + (,(string-append #$janet "/include/janet"))) + `("JANET_LIBPATH" ":" = + (,(string-append #$janet "/lib"))))))))) + (inputs (list bash-minimal + coreutils-minimal + curl + gcc + git-minimal/pinned)) + (propagated-inputs (list janet)) + (native-search-paths + (list $SSL_CERT_DIR $SSL_CERT_FILE)) + (home-page "https://janet-lang.org/") + (synopsis "Janet Project Manager for the Janet programming language") + (description + "@code{jpm} is the Janet Project Manager tool. It is a build +tool and its main uses are installing dependencies, compiling C/C++ to native +libraries, and other management tasks for Janet projects.") + (license license:expat))) + (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") From patchwork Tue Oct 8 03:22:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 36664 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7632E27BBEA; Mon, 6 Jan 2025 01:31:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E7EEF27BBE2 for ; Mon, 6 Jan 2025 01:31:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUbxU-0000OF-8q; Sun, 05 Jan 2025 20:31:08 -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 1tUbxP-0000Nn-VC for guix-patches@gnu.org; Sun, 05 Jan 2025 20:31:04 -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 1tUbxO-0001rI-Il for guix-patches@gnu.org; Sun, 05 Jan 2025 20:31:03 -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:In-Reply-To:From:To:References:Subject; bh=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=f9eb3xFz2p2ffQZ0te9j+D6LovxcMqbp0+owWV5Ib0F/8PmcBVQVcsCBOUqA6A62xgvkqycf33NQi+AIsNjDc7v65/kGRhc2BL9iwz8NVLztOIFJbFCTNy1iX1p4lWDiu2bvbevo2uu/ukW2L0FlKdrj+Vd6SSuMXKqP5PBBVIadMdfXPUYnXS5uJB2iozBnxg60+B1MLswcW3Aey5A7rD+IIAMgBj+tQ/ugpX9+ifI/nCKBi03XTNzJmJNiuoKXOTUMKqd3gptP0aDbae0i5k6XYX2Z/+zefLMyveyRL+SacS7W8KwQxq7NxzXi0uzgzXHb+6NfOsDO2r94OnDHHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUbxO-00016P-CU; Sun, 05 Jan 2025 20:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75394] [PATCH v14 2/2] gnu: Improve user-experience for jpm. References: Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2025 01:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75394@debbugs.gnu.org Cc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 75394-submit@debbugs.gnu.org id=B75394.17361270504211 (code B ref 75394); Mon, 06 Jan 2025 01:31:02 +0000 Received: (at 75394) by debbugs.gnu.org; 6 Jan 2025 01:30:50 +0000 Received: from localhost ([127.0.0.1]:36054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUbxB-00015p-KH for submit@debbugs.gnu.org; Sun, 05 Jan 2025 20:30:50 -0500 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:55772) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUbx8-00015Z-LT for 75394@debbugs.gnu.org; Sun, 05 Jan 2025 20:30:47 -0500 Received: by mail-qk1-x741.google.com with SMTP id af79cd13be357-7b85d5cc39eso1503090885a.3 for <75394@debbugs.gnu.org>; Sun, 05 Jan 2025 17:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736127040; x=1736731840; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=Fazo4q0pbKRQEtiBvtT9ooBPcd4EmjqmISJhuSIqVha5w2BGrPNqnKVtILFEUwjDiI jkwsleeSPrPymklIGLtUjMkMPdwZG8B0+xbXMYhyO08ehY1Cjp1dcXW0YA7E/bed5PA7 NHeWOm0WQLb1KYwrRTkzayXiuzS9FTzznE04QWf4mFBgNLOtZEFfBNLeJybxzeYW+C5X 2wFB49ITokGpvekK4rGBPJdYgElJq1rhp1k6BogVV+dwTYN/P1v3j53KJri/JyZiJ5QM ydeV9ZDcBaYwZgpFROBHZQxKdED3fYquiGGvczCk1IytO/VH65Xi8Sez2WcPTkMjRxQS VRpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736127040; x=1736731840; h=content-transfer-encoding:mime-version:message-id:date:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=w/fAdyV1Be66WW4WzQb8KeqZIlQ2MobLhLkDUSbzCrCPdYI26xcmgExNhHqH0mvrnE 0siQgLvJVZXRB8PZachdU1rcyGQQeCqls88SueZfBq2RtcW9O/IsO7qPUuW1+tJuW9mY En3nTfBWsKLK47cai0HDuShRhbgZJEN+va09AWrsvYs2WI/oVniky7RgD923scQJL9MY T1vzKh1e3A81HS7eAPht36N8fLOOOaOrIJkf33eVrLZk1g7i/IRD2s7hR6Nozv1n14YS yGV01lqAqBib5R1vhzzY4ckBLzYvz2Yj3jSeBsXftAB1HAIOcEw70n6zx0mu1DWHkiXg XLRA== X-Gm-Message-State: AOJu0Yzca9vcuqipUHdfYoR00tmdU26xbjOfGBgedcD5R4/EtVYydtfU z0O94EV1tR7GY9IZ733VKSyJB3aJ90xUk0gUfShIgqFif6KVoQMlLsFyvEnt X-Gm-Gg: ASbGncuzAOvakYuSk5oWw/+15eetZrzqvFqvjWn4Wl9Z3RdPqSaJoFaaGGmIYHuwM3C AFqzbfUzA21GGQ4WOsdgkhGC8DXVlcEY4FmjL6LRCuBmvo03SeCylVrtvrPh45Q6y/ELVkhAbPH cxW6+NIQ7b6Ha1j1qwsDBWONTsWopc9I7DasOqwpnpdi1FNRswbu0H6m8I+mL37XFXxi9oCUKne 9WfkTxPg4PTU/t3pgka3LQhINudLWmDcf0tv5E1oDk1KruGHKw4vwUOUkBBfqnAn0v5+VGlAd6x z2t7qIPideV595AK+Q== X-Google-Smtp-Source: AGHT+IHUoljsRIir3r/sOQTRr1mYtpN9BLV/uSMRa8R2mhdExQflqTAyY66AfLdUqFKuqBNEW0Y0kw== X-Received: by 2002:a05:620a:2a14:b0:7b6:f219:9dd9 with SMTP id af79cd13be357-7b9ba852abbmr10690446285a.55.1736127040440; Sun, 05 Jan 2025 17:30:40 -0800 (PST) Received: from gnus (mtrlpq0776w-70-26-179-129.dsl.bell.ca. [70.26.179.129]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac4ee8b0sm1463385385a.124.2025.01.05.17.30.39 for <75394@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 17:30:40 -0800 (PST) From: "Suhail Singh" In-Reply-To: Date: Mon, 7 Oct 2024 23:22:13 -0400 Message-Id: <68d09c78846a198ba4499f89f53e4b3782208c9d.1736126524.git.suhail@bayesians.ca> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lisp.scm (jpm): Ensure jpm respects JANET_HEADERPATH and JANET_LIBPATH if set by user. Ensure gcc/g++ is able to find header files and compilation-related utilities. Change-Id: Ic7218dbd10e6fabddded50894b82492de8cabc88 --- gnu/packages/lisp.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f99ad68828..eb3063d3d9 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2024 bigbug ;;; Copyright © 2024 Ashish SHUKLA ;;; Copyright © 2024 Omar Bassam +;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 David Pflug ;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; @@ -965,22 +966,39 @@ (define-public jpm (setenv "PREFIX" #$output))) (replace 'install - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (dir) (mkdir-p (string-append #$output "/" dir))) '("lib/janet/jpm" "share/man/man1")) (invoke "janet" "bootstrap.janet" "configs/linux_config.janet") - (wrap-program (string-append #$output "/bin/jpm") - `("JANET_HEADERPATH" ":" = - (,(string-append #$janet "/include/janet"))) - `("JANET_LIBPATH" ":" = - (,(string-append #$janet "/lib"))))))))) + (let ((gcc-toolchain (assoc-ref inputs "gcc-toolchain")) + (core-min (assoc-ref inputs "coreutils-minimal"))) + (wrap-program (string-append #$output "/bin/jpm") + `("JANET_HEADERPATH" ":" prefix + (,(string-append #$janet "/include/janet"))) + `("JANET_LIBPATH" ":" prefix + (,(string-append #$janet "/lib"))) + `("C_INCLUDE_PATH" ":" prefix + (,(string-append gcc-toolchain "/include"))) + `("CPLUS_INCLUDE_PATH" ":" prefix + (,(string-append gcc-toolchain "/include/c++") + ,(string-append gcc-toolchain "/include"))) + `("LIBRARY_PATH" ":" prefix + (,(string-append gcc-toolchain "/lib") + ,(string-append gcc-toolchain "/lib64"))) + `("PATH" ":" prefix + (,(string-append gcc-toolchain "/bin") + ,(string-append core-min "/bin")))))))))) (inputs (list bash-minimal coreutils-minimal curl gcc - git-minimal/pinned)) + git-minimal/pinned + ;; Lazily resolve the gcc-toolchain to avoid a circular + ;; dependency. + (module-ref (resolve-interface '(gnu packages commencement)) + 'gcc-toolchain))) (propagated-inputs (list janet)) (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE))