From 8c65863fb34a73cd6d52debeb9ff9ed8c99faf2f Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 3 Sep 2016 12:48:36 +0200 Subject: gnu: git: Update to 2.10.0. * gnu/packages/version-control.scm (git): Update to 2.10.0. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 34cfedf4ed..9ff9801997 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -111,14 +111,14 @@ (define-public bazaar (define-public git (package (name "git") - (version "2.9.3") + (version "2.10.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z")))) + "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -131,7 +131,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "0kabsmjfbvq4y1vlwq0yl2y4033a90rnwsq01d7np3cvy55fiq0l")))))) + "1y92v1bxk67ilsizqnjba6hqvrsy2zvmipyd9nnz865s21yrj5ry")))))) (inputs `(("curl" ,curl) ("expat" ,expat) -- cgit v1.2.3 From 4e835710f1f45ceffb432fa19cc3cfbbdaf0919b Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 5 Sep 2016 14:19:05 +0200 Subject: gnu: Add git@2.9 * gnu/packages/version-control.scm (git@2.9): New variable. * gnu/packages/version-control.scm (cgit)[inputs]: Replace git with git@2.9 --- gnu/packages/version-control.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9ff9801997..d77cca0e10 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -293,6 +293,20 @@ (define-public git (license license:gpl2) (home-page "http://git-scm.com/"))) +;; Some dependent packages directly access internal interfaces which +;; have changed in 2.10 +(define-public git@2.9 + (package + (inherit git) + (version "2.9.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/software/scm/git/git-" + version ".tar.xz")) + (sha256 + (base32 + "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z")))))) + (define-public libgit2 (package (name "libgit2") @@ -387,7 +401,7 @@ (define-public cgit ("xmllint" ,libxml2) ("xsltprot" ,libxslt))) (inputs - `(("git:src" ,(package-source git)) + `(("git:src" ,(package-source git@2.9)) ("openssl" ,openssl) ("zlib" ,zlib))) (home-page "https://git.zx2c4.com/cgit/") -- cgit v1.2.3 From 50feff817bd891c07549c9926a176c1fe8f85fcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Sep 2016 22:27:09 +0300 Subject: gnu: tig: Update to 2.2. * gnu/packages/version-control.scm (tig): Update to 2.2. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d77cca0e10..9d9f849485 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1049,7 +1049,7 @@ (define-public reposurgeon (define-public tig (package (name "tig") - (version "2.1.1") + (version "2.2") (source (origin (method url-fetch) (uri (string-append @@ -1057,7 +1057,7 @@ (define-public tig version ".tar.gz")) (sha256 (base32 - "0bw5wivswwh7vx897q8xc2cqgkqhdzk8gh6fnav2kf34sngigiah")))) + "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) -- cgit v1.2.3 From d0e11e8b52a27fee4c04e0e063edf54b4724b330 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Sep 2016 22:29:59 +0300 Subject: gnu: tig: Add search completion and history support. * gnu/packages/version-control.scm (tig)[inputs]: Add readline. --- gnu/packages/version-control.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9d9f849485..c342b938c2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -59,6 +59,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages readline) #:use-module (gnu packages databases) #:use-module (gnu packages admin) #:use-module (gnu packages xml) @@ -1060,7 +1061,8 @@ (define-public tig "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg")))) (build-system gnu-build-system) (inputs - `(("ncurses" ,ncurses))) + `(("ncurses" ,ncurses) + ("readline" ,readline))) (arguments `(#:tests? #f)) ; tests require access to /dev/tty ;;`(#:test-target "test")) -- cgit v1.2.3 From 2203e4c2798b91915ec6fc34b1222f8eee9a89c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Sep 2016 22:36:51 +0300 Subject: gnu: tig: Install man pages. * gnu/packages/version-control.scm (tig)[native-inputs]: Add asciidoc, xmlto. --- gnu/packages/version-control.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c342b938c2..29559bd9b3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1060,11 +1060,19 @@ (define-public tig (base32 "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg")))) (build-system gnu-build-system) + (native-inputs + `(("asciidoc" ,asciidoc) + ("xmlto" ,xmlto))) (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) (arguments - `(#:tests? #f)) ; tests require access to /dev/tty + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (zero? (system* "make" "install-doc"))))) + #:tests? #f)) ; tests require access to /dev/tty ;;`(#:test-target "test")) (home-page "http://jonas.nitro.dk/tig/") (synopsis "Ncurses-based text user interface for Git") -- cgit v1.2.3 From b411517a1939612517378987ff2675b809b7074c Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Tue, 27 Sep 2016 15:38:51 +0200 Subject: gnu: git: Add input perl-term-readkey for 'git-svn'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git)[inputs]: Add perl-term-readkeys. [arguments]: Add perl-term-readkeys to the PERL5LIB of `git-svn'. Signed-off-by: 宋文武 --- gnu/packages/version-control.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 29559bd9b3..ef65a03451 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -143,6 +143,7 @@ (define-public git ;; For 'git-svn'. ("subversion" ,subversion) + ("perl-term-readkey" ,perl-term-readkey) ;; For 'git-send-email' ("perl-authen-sasl" ,perl-authen-sasl) @@ -227,14 +228,15 @@ (define-public git (list gitk git-gui git-cit git-se git-svn) (list gitk* git-gui* git-cit* git-se* git-svn*)) - ;; Tell 'git-svn' where Subversion is. + ;; Tell 'git-svn' where Subversion and perl-term-readkey are. (wrap-program git-svn* `("PATH" ":" prefix (,(string-append (assoc-ref inputs "subversion") "/bin"))) `("PERL5LIB" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/lib/perl5/site_perl"))) + ,(map (lambda (i) (string-append (assoc-ref inputs i) + "/lib/perl5/site_perl")) + '("subversion" "perl-term-readkey"))) ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so ;; help it find 'libsvn_client-1.so'. -- cgit v1.2.3