From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evreP-0002Yf-OK for guix-patches@gnu.org; Tue, 13 Mar 2018 17:40:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evreM-0004hh-Lo for guix-patches@gnu.org; Tue, 13 Mar 2018 17:40:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evreM-0004ha-II for guix-patches@gnu.org; Tue, 13 Mar 2018 17:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1evreM-0008EO-9W for guix-patches@gnu.org; Tue, 13 Mar 2018 17:40:02 -0400 Subject: [bug#30809] [PATCH 2/2] WIP: gitolite package changes to make the service work. Resent-Message-ID: From: Christopher Baines Date: Tue, 13 Mar 2018 21:39:33 +0000 Message-Id: <20180313213933.11268-2-mail@cbaines.net> In-Reply-To: <20180313213933.11268-1-mail@cbaines.net> References: <20180313213933.11268-1-mail@cbaines.net> 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: 30809@debbugs.gnu.org --- gnu/packages/version-control.scm | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a3f4a4dd4..4af41b37e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -958,9 +958,9 @@ also walk each side of a merge and test those changes individually.") ;; Avoid references to the store in authorized_keys. ;; This works because gitolite-shell is in the PATH. - (substitute* "src/triggers/post-compile/ssh-authkeys" - (("\\$glshell \\$user") - "gitolite-shell $user")) + ;; (substitute* "src/triggers/post-compile/ssh-authkeys" + ;; (("\\$glshell \\$user") + ;; "gitolite-shell $user")) #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -975,9 +975,36 @@ also walk each side of a merge and test those changes 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") + "/share/gitolite/gitolite-shell") + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "git") + "/bin")))) + (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") + ,(string-append (assoc-ref inputs "findutils") + "/bin") + ,(string-append (assoc-ref inputs "openssh") + "/bin") + ,(string-append (assoc-ref inputs "git") + "/bin") + ,(string-append (assoc-ref inputs "inetutils") + "/bin"))))))))) (inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("git" ,git) + ("openssh" ,openssh) + ("coreutils" ,coreutils) + ("findutils" ,findutils) + ("inetutils" ,inetutils))) ;; git and openssh are propagated because trying to patch the source via ;; regexp matching is too brittle and prone to false positives. (propagated-inputs -- 2.16.2