From 3a099d179ae654917045bbfab8ce8945500894c4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Mar 2016 22:27:05 +0200 Subject: gnu: libgit2: Update to 0.24.0. * gnu/packages/version-control.scm (libgit2): Update to 0.24.0. [inputs]: Switch python to python-wrapper. --- 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 316ac23395..29b1ef5bdb 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -324,7 +324,7 @@ (define-public git-manpages (define-public libgit2 (package (name "libgit2") - (version "0.23.4") + (version "0.24.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -332,7 +332,7 @@ (define-public libgit2 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0aa0i5bvmzrrirqk5w13pm0qmblkk57x24w0hxz4vg0x73by5xf7")))) + "1c5jx0pcpz83x7s36jimfz5bj0vy7vwpchq9p4sgdqxy8gwr6rhw")))) (build-system cmake-build-system) (arguments `(#:phases @@ -351,7 +351,7 @@ (define-public libgit2 (inputs `(("libssh2" ,libssh2) ("libcurl" ,curl) - ("python" ,python) + ("python" ,python-wrapper) ("openssl" ,openssl))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b65195c2ccecb396f08233d73d378ec8e47620ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Mar 2016 23:16:56 +0200 Subject: gnu: shflags: Update to 1.2.0. * gnu/packages/version-control.scm (shflags): Update to 1.2.0. [source]: Switch to github. [home-page]: Project moved to github. --- gnu/packages/version-control.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 29b1ef5bdb..37e1b53d29 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -367,14 +367,14 @@ (define-public libgit2 (define-public shflags (package (name "shflags") - (version "1.0.3") + (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append "https://shflags.googlecode.com/files/" - "shflags-" version ".tgz")) + (uri (string-append "https://github.com/kward/shflags/archive/v" + version ".tar.gz")) (sha256 (base32 - "08laxhf1hifh3w4j0hri5ppcklaqz0mnkmbaz8j0wxih29vi8slm")))) + "0zxw12haylaq60a335xlqcs4afw2zrgwqymmpw0m21r51w6irdmr")))) (build-system trivial-build-system) (native-inputs `(("tar" ,tar) ("gzip" ,gzip))) @@ -396,7 +396,7 @@ (define-public shflags (copy-file "src/shflags" (string-append srcdir "/shflags")) #t))))) - (home-page "https://code.google.com/p/shflags/") + (home-page "https://github.com/kward/shflags") (synopsis "Command-line flags library for shell scripts") (description "Shell Flags (shFlags) is a library written to greatly simplify the -- cgit v1.2.3 From 20109e07bde4be526df684f8606a189b1378cb52 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 15 Mar 2016 07:03:39 +0200 Subject: gnu: gitolite: Update to 3.6.5. * gnu/packages/version-control.scm (gitolite): Update to 3.6.5. [source]: Remove patch. * gnu/packages/patches/gitolite-openssh-6.8-compat.patch: Remove file. * gnu-system.am (dist_patch_DATA): Remove it. --- gnu-system.am | 1 - .../patches/gitolite-openssh-6.8-compat.patch | 25 ---------------------- gnu/packages/version-control.scm | 7 ++---- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/gitolite-openssh-6.8-compat.patch (limited to 'gnu/packages/version-control.scm') diff --git a/gnu-system.am b/gnu-system.am index e198793a87..634093ab6e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -484,7 +484,6 @@ dist_patch_DATA = \ gnu/packages/patches/geoclue-config.patch \ gnu/packages/patches/ghostscript-CVE-2015-3228.patch \ gnu/packages/patches/ghostscript-runpath.patch \ - gnu/packages/patches/gitolite-openssh-6.8-compat.patch \ gnu/packages/patches/glib-networking-ssl-cert-file.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ diff --git a/gnu/packages/patches/gitolite-openssh-6.8-compat.patch b/gnu/packages/patches/gitolite-openssh-6.8-compat.patch deleted file mode 100644 index d7fc2e6b12..0000000000 --- a/gnu/packages/patches/gitolite-openssh-6.8-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ed807a40c6683960e357bc995b3acf721ec088b4 Mon Sep 17 00:00:00 2001 -From: Sitaram Chamarty -Date: Thu, 19 Mar 2015 05:17:59 +0530 -Subject: [PATCH] openssh 6.8 compat - ---- - src/triggers/post-compile/ssh-authkeys | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys -index 84dda73..d5f5d8b 100755 ---- a/src/triggers/post-compile/ssh-authkeys -+++ b/src/triggers/post-compile/ssh-authkeys -@@ -115,7 +115,7 @@ sub fp_file { - my $f = shift; - my $fp = `ssh-keygen -l -f '$f'`; - chomp($fp); -- _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/; -+ _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/ or $fp =~ m(SHA256:([A-ZA-z0-9+/]+)); - $fp = $1; - return $fp; - } --- -2.2.1 - diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 37e1b53d29..d0cc1459c5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -489,19 +489,16 @@ (define-public git-test-sequence (define-public gitolite (package (name "gitolite") - (version "3.6.2") + (version "3.6.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/sitaramc/gitolite/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) - ;; Commit ed807a4 upstream - (patches - (list (search-patch "gitolite-openssh-6.8-compat.patch"))) (sha256 (base32 - "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01")))) + "0xpqg04gyr4dhdhxx5lbk61lwwd5ml32530bigg2qy663icngwqm")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3