From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8OfzC6G5wWFlVgEAgWs5BA (envelope-from ) for ; Tue, 21 Dec 2021 12:25:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6HeTB6G5wWE1BwAAB5/wlQ (envelope-from ) for ; Tue, 21 Dec 2021 11:25:21 +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 CC0E817B72 for ; Tue, 21 Dec 2021 12:25:20 +0100 (CET) Received: from localhost ([::1]:60864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzdGh-0005bh-PQ for larch@yhetil.org; Tue, 21 Dec 2021 06:25:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzdGQ-0005bA-E2 for guix-patches@gnu.org; Tue, 21 Dec 2021 06:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzdGP-0007Yo-UP for guix-patches@gnu.org; Tue, 21 Dec 2021 06:25:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzdGP-0004Dp-Q1 for guix-patches@gnu.org; Tue, 21 Dec 2021 06:25:01 -0500 Subject: bug#52699: [PATCH] gnu: Add nar-herder. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 11:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 52699 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 52699-done@debbugs.gnu.org Mail-Followup-To: 52699@debbugs.gnu.org, mail@cbaines.net, mail@cbaines.net Received: via spool by 52699-done@debbugs.gnu.org id=D52699.164008587716163 (code D ref 52699); Tue, 21 Dec 2021 11:25:01 +0000 Received: (at 52699-done) by debbugs.gnu.org; 21 Dec 2021 11:24:37 +0000 Received: from localhost ([127.0.0.1]:52565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzdG1-0004Cd-0p for submit@debbugs.gnu.org; Tue, 21 Dec 2021 06:24:37 -0500 Received: from mira.cbaines.net ([212.71.252.8]:47060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzdFz-0004CV-4x for 52699-done@debbugs.gnu.org; Tue, 21 Dec 2021 06:24:36 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 3EF5627BBE9; Tue, 21 Dec 2021 11:24:34 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 34ff25fb; Tue, 21 Dec 2021 11:24:34 +0000 (UTC) References: <20211221102711.30382-1-mail@cbaines.net> <87pmpq6x0n.fsf@gnu.org> User-agent: mu4e 1.6.6; emacs 27.2 From: Christopher Baines Date: Tue, 21 Dec 2021 11:23:29 +0000 In-reply-to: <87pmpq6x0n.fsf@gnu.org> Message-ID: <875yrii4jy.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" 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=1640085920; 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-to: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=V5V6XL/CG38E32DiF++mhwqrEFkyum0kXXoYlTPnKEM=; b=coKlDOd2MYrzFQ8M6dq+P3L1oPRTpEnmKGFnPwRYFmCQs4VuE1Ks9sGajlzUgARDLb/ele 3IsL8JjJiRB1+2j5dCpAUsVeHLH7878gQc4TdFrUQcc95wOMrboAV6QxmNN12kxgt5I7r+ zxEXUS6gzIYv9nCNURvXLfiL6Y9A4i6Ey+kSJSx34/dFW7latci6XeADqHEq6AjCr4h+wR /sdWzOjmZLmVXLJmu0eUqb3UJ81MmTtVor0Ya/AKFj2FT02o6/1BvG/cQkYUqnutObvYe1 /WnlfZx7vNAKAVqcDKQ24BsdqFC8grygfXiVbsoq5BnuFQAf7s0lw7fNiwZJwg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640085920; a=rsa-sha256; cv=none; b=cqPPaQbrB6aOfG5KX2L/Wbp2NaIGCRkmI2YW4vzEQfMs/U1wWwceSLmmoG3AifgLcGOfcp RQ3LLncnAv6b1zUg0cHAz9X8U1wWKG5fsKa/QEWpjQkGeVZ9L42I+ILKeKCrkVHDQgCblW da2wpR0jT3AeGxkIIWoler5sAeG57LpQrn6PUG/PyITotrDMA4p6Wy+gLfP83bj7ZfVBzE Ks22yLySu7CaVeiMikxcvKCTs7pygSTlw/PpASe8n+RoEuQFDMLL5ljMdOhpFteF08vg0a 61l1S27OMd2ATC0aTU8vaffkEBSdCmZXjVVwjf+aHcz+3lmcooj8JirvtIJK2g== 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" X-Migadu-Spam-Score: -6.13 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" X-Migadu-Queue-Id: CC0E817B72 X-Spam-Score: -6.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: TQzXiJUHI+SY --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello! > > Christopher Baines skribis: > >> * gnu/packages/package-management.scm (nar-herder): New variable. > > [...] > >> + (add-before 'build 'set-GUILE_AUTO_COMPILE >> + (lambda _ >> + ;; To avoid warnings relating to 'guild'. >> + (setenv "GUILE_AUTO_COMPILE" "0") >> + #t)) > > You can omit trailing #t=E2=80=99s. > >> + (add-after 'install 'wrap-executable >> + (lambda* (#:key inputs outputs target #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin")) >> + (guile (assoc-ref inputs "guile")) >> + (version (target-guile-effective-version)) >> + (scm (string-append out "/share/guile/site/" vers= ion)) >> + (go (string-append out "/lib/guile/" version "/s= ite-ccache"))) >> + (for-each >> + (lambda (file) >> + (simple-format (current-error-port) "wrapping: ~A\n= " file) >> + (let ((guile-inputs (list >> + "guile-json" >> + "guile-gcrypt" >> + "guix" >> + "guile-lib" >> + "guile-sqlite3" >> + "gnutls" >> + "guile-fibers"))) >> + (wrap-program file >> + `("GUILE_LOAD_PATH" ":" prefix >> + (,scm ,(string-join >> + (map (lambda (input) >> + (simple-format >> + #f "~A/share/guile/site/~A" >> + (assoc-ref inputs input) >> + version)) >> + guile-inputs) >> + ":"))) >> + `("GUILE_LOAD_COMPILED_PATH" ":" prefix >> + (,go ,(string-join >> + (map (lambda (input) >> + (simple-format >> + #f "~A/lib/guile/~A/site-ccach= e" >> + (assoc-ref inputs input) >> + version)) >> + guile-inputs) >> + ":")))))) > > I=E2=80=99d use =E2=80=98string-append=E2=80=99 rather than =E2=80=98form= at=E2=80=99. > > (It=E2=80=99d be nice to have a streamlined solution to wrap those Guile > executables=E2=80=A6) > >> + (license license:gpl3+)))) > > I believe it=E2=80=99s =E2=80=98agpl3+=E2=80=99 (though GPLv3+ would make= it easier to share > code with Guix; something worth considering). > > Otherwise LGTM, thanks! Thanks for taking a look! I've pushed as 6f76678cb7575072395198c343a9fecc52839513 with the changes you mentioned above. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmHBuXFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfMbxAAlXR6KswJNksbBlyOU2D73l16gR++jOjp ri3Aej8AhnSdJEItOhiYehWjAauA31Id+PtdiVAyXDpA7TMrWh4GqWIJZzm5ZBHA /I4pFw2JCw7vvcGyCHnrw3rKuhkN6T9ETsxazh6qTESTZpqnaAYAVBnKdSCWtzdv 35PITd0s7Nywp8+fBvGmD++rshUDnu+EeljvyhcGP79yqaoulesyUYmgQuQxI7Nb 4d+H+xC5svFLN1D9/JraSFFbh7w7ZtfkMCrwShn3CuUEMJJIESNjExsJxu3iUhz7 7Envb32cCv9SOJok4k5V4dqchua0ZiED5u8O2Fo0xx17x5bjSGVdhKGxp2UDzDi8 swKIW2aLNZsVoPlALrA1U8KmXXIfhd2ZNiqDn/PXp0RS9sz7Az1WQjNOWqKM3Hqn K+sBuNYaEtOf9LscYZrimu3HQqE0Jpicj+uunkWZHue4XQpVeXVPZKURPNr5YOZz 9RBuruEeJ6NP8yHKaPY9u+DxKWwpBei+8ZUTNqx76ya8jMNWFijp4WiDs9rpsWZ3 msX1LjVdBMQOlaPplvTpu041JmNX69Ri47/FOcXRAQC/5cKBpYr7/5io3//akHuG 5fc6THcwzskGHhvIxKrsP0w1YEcFk8xaNpT9Qj+IuuoboCSCLSa96n/fs40CMoYL W4eIFkS5cQk= =KL2n -----END PGP SIGNATURE----- --=-=-=--