From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhj2n-0007UJ-E1 for guix-patches@gnu.org; Mon, 23 Jul 2018 18:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhj2k-0003h5-5m for guix-patches@gnu.org; Mon, 23 Jul 2018 18:11:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49401) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhj2j-0003gz-W2 for guix-patches@gnu.org; Mon, 23 Jul 2018 18:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fhj2j-0001JO-Pw for guix-patches@gnu.org; Mon, 23 Jul 2018 18:11:01 -0400 Subject: [bug#30809] [PATCH 1/2] gnu: Modify the gitolite package to support the Guix service. Resent-Message-ID: References: <87woyfzmir.fsf@cbaines.net> <20180714062855.18705-1-mail@cbaines.net> <87wotmq54x.fsf@lassieur.org> From: Christopher Baines In-reply-to: <87wotmq54x.fsf@lassieur.org> Date: Mon, 23 Jul 2018 23:10:26 +0100 Message-ID: <87d0vdwqlp.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: 30809@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cl=C3=A9ment Lassieur writes: >> (replace 'install >> (lambda* (#:key outputs #:allow-other-keys) >> (let* ((output (assoc-ref outputs "out")) >> @@ -1045,9 +1075,28 @@ also walk each side of a merge and test those cha= nges individually.") >> (symlink (string-append sharedir "/= " script) >> (string-append bindir "/" = script))) >> '("gitolite" "gitolite-shell")) >> - #t)))))) >> + #t))) >> + (add-after 'install 'wrap-scripts >> + (lambda* (#:key inputs outputs #:allow-other-keys) >> + (wrap-program (string-append (assoc-ref outputs "= out") >> + "/bin/gitolite") >> + `("PATH" ":" prefix >> + (,(string-append (assoc-ref outputs "out") >> + "/bin") >> + ,(string-append (assoc-ref inputs "coreutils= ") >> + "/bin") >> + ;; find is used in quite a few places >> + ,(string-append (assoc-ref inputs "findutils= ") >> + "/bin") >> + ,(string-append (assoc-ref inputs "git") >> + "/bin")))) > > Here you can avoid some repetitions like this: > > (let ((out (assoc-ref outputs "out")) > (coreutils (assoc-ref inputs "coreutils")) > (findutils (assoc-ref inputs "findutils")) > (git (assoc-ref inputs "git"))) > (wrap-program (string-append out "/bin/gitolite") > `("PATH" ":" prefix > ,(map (lambda (dir) > (string-append dir "/bin")) > (list out coreutils findutils git)))) > #t) Thanks, I've used this in the updated patch now. >> + >> + #t))))) >> (inputs >> - `(("perl" ,perl))) >> + `(("perl" ,perl) >> + ("coreutils" ,coreutils) >> + ("findutils" ,findutils) >> + ("inetutils" ,inetutils))) >> ;; git and openssh are propagated because trying to patch the sourc= e via >> ;; regexp matching is too brittle and prone to false positives. >> (propagated-inputs > > Otherwise, LGTM, thank you! Great :) I've made quite a few changes in the most recent update, so if you have some time to look at those, that would be useful. The system test is more rigorous now, pushing to the repository to test the hooks, and I've rewritten most of the activation code. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAltWUlJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfLBg//csgcqJuSldNfM3FOaD31LW/QoH/vgPllv/R1zEbum5oRVYc1yiQCuzjh L1ZWoHlURra3vMy6Ceu5w/cldkQy/0ZB45xw4f1IFPI+sTOuKlguXxBTIeLE0YXe 6y3WqFvZLFLqY3fgbRnaCrrwylLiuJLAAUbQ77FKz6Khu0Qj+Ca7nmppp0EImML6 68RtSi7LD35EOVFnxa3HiR29n6b1/nGT7lcxFkFZbwYfpp5xcwOVVy5WkCKwYqyq 5AvDw+pvkm60JxOKvrileP/cTvw/Y/iIwK2r+hECbhCcLIXIvZphhDkDYqTZZ2uH t3Pk7BPyYTYE2ReBjvTCVkasuFEBgD4KcogvLVYsb2YcpxNYPtDKkDeJHicR1T7X kDsyDdRuYSRE4dZCtTLwvjK4jtwReFE0au5vz51qeVunuL/A6cd0njLNh+wkT0VD krcDD7VOr6DdvTBkIaVF05wDoHbq5TrzisTyricsAf0kPv+d8cOB3QK4poZoCIp8 BrC8AexWpSspiU+cTrUTSe3W6kqZmofiHa+IZSj2MfkLdHJyUwHs9cIknMoGHNpx gJatSNdqrH/6jYiAQidkWVk4HB0nyeda8KRt4dlVyAcKsZorCjm5oYnxCOxHXRwR xrA15+c4g60OyW+uZeSd+vekwboYmYp+HQ0+sf3eQpgSSNzYMjc= =Uc6/ -----END PGP SIGNATURE----- --=-=-=--