From 364873b508a852579005f90ff8644122f9365568 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 17:12:19 +0100 Subject: gnu: git: Update to 2.25.1. * gnu/packages/version-control.scm (git): Update to 2.25.1. --- 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 e2a06dee59..8335e6c576 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -149,14 +149,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.25.0") + (version "2.25.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60")))) + "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -169,7 +169,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1gf8b1k6i4dlwskwq7dd2vz9bzc3m1qnknj9daq2vp39vmxpg5nk")))) + "15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From d462bf0e4941ee73881d3a449081c4347e7c966c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 17:37:27 +0100 Subject: gnu: cvs-fast-export: Update to 1.51. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (cvs-fast-export): Update to 1.51. [arguments]: Remove obsolete ‘remove-optimizations’ phase. --- gnu/packages/version-control.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8335e6c576..c5d99b6b64 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1564,26 +1564,20 @@ RCS, PRCS, and Aegis packages.") (define-public cvs-fast-export (package (name "cvs-fast-export") - (version "1.45") + (version "1.51") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/cvs-fast-export/" "cvs-fast-export-" version ".tar.gz")) (sha256 (base32 - "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z")))) + "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'remove-optimizations - (lambda _ - ;; Don't optimize for a specific processor architecture. - (substitute* "Makefile" - (("CFLAGS \\+= -march=native") "")) - #t))) - #:parallel-build? #f ; parallel a2x commands fail spectacularly + (delete 'configure)) ; no configure script + #:parallel-build? #f ; parallel a2x commands fail spectacularly #:make-flags (list "CC=gcc" (string-append "prefix?=" (assoc-ref %outputs "out"))))) (inputs `(("git" ,git))) -- cgit v1.2.3 From a894ca327b8d05cc16d4657ea3e3af167f55a37b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Feb 2020 18:09:17 +0100 Subject: gnu: cvs-fast-export: Use non-native Python 3. * gnu/packages/version-control.scm (cvs-fast-export)[native-inputs]: Remove python-2. [inputs]: Add python-wrapper. --- gnu/packages/version-control.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c5d99b6b64..24a7e3590a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1580,12 +1580,14 @@ RCS, PRCS, and Aegis packages.") #:parallel-build? #f ; parallel a2x commands fail spectacularly #:make-flags (list "CC=gcc" (string-append "prefix?=" (assoc-ref %outputs "out"))))) - (inputs `(("git" ,git))) - (native-inputs `(("asciidoc" ,asciidoc) - ;; These are needed for the tests. - ("cvs" ,cvs) - ("python" ,python-2) - ("rcs" ,rcs))) + (inputs + `(("git" ,git) + ("python" ,python-wrapper))) + (native-inputs + `(("asciidoc" ,asciidoc) + ;; These are needed for the tests. + ("cvs" ,cvs) + ("rcs" ,rcs))) (home-page "http://www.catb.org/esr/cvs-fast-export/") (synopsis "Export an RCS or CVS history as a fast-import stream") (description "This program analyzes a collection of RCS files in a CVS -- cgit v1.2.3 From fa9f5df7c439083913bc08ec926b7c799704065b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 21 Feb 2020 08:50:48 +0200 Subject: gnu: subversion: Don't build static libraries. This drops the size of the package by about 27%. * gnu/packages/version-control.scm (subversion)[arguments]: Add configure-flag to not build static libraries. --- gnu/packages/version-control.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 24a7e3590a..df160bcc53 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1432,6 +1432,7 @@ following features: (arguments '(#:parallel-tests? #f ; TODO Seems to cause test failures on ; i686-linux + #:configure-flags '("--enable-static=no") #:phases (modify-phases %standard-phases (add-after 'configure 'patch-libtool-wrapper-ls -- cgit v1.2.3 From cbe4272e6fc10787bf826434adc2a9abfe845b78 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 15:20:30 -0500 Subject: gnu: python-gitdb: Update to 4.0.2. * gnu/packages/version-control.scm (python-gitdb): Update to 4.0.2. [source]: Correct the PyPI URL to refer to the actual gitdb package, not a mirror. This mirror had a problematic setup.py install requirement that required gitdb>=4.0.1, which would cause run time errors when using snakemake. --- 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 df160bcc53..35792a0184 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -880,13 +880,13 @@ default) of the repository.") (define-public python-gitdb (package (name "python-gitdb") - (version "2.0.4") + (version "4.0.2") (source (origin (method url-fetch) - (uri (pypi-uri "gitdb2" version)) + (uri (pypi-uri "gitdb" version)) (sha256 (base32 - "0i608q9c47rdsmyac1cn6s0hzwwj7cb957y8fc9wacc5lnw8ak5v")))) + "0l113fphn6msjl3cl3kyf332b6lal7daxdd0nfma0x9ipfb013jr")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 166dbbb012e6de591c0c3f7a2ab1b74f14209f36 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 15:24:39 -0500 Subject: gnu: python-gitpython: Update to 3.1.0. * gnu/packages/version-control.scm (python-gitpython): Update to 3.1.0. --- 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 35792a0184..cc866ec888 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -937,13 +937,13 @@ allowing to handle large objects with a small memory footprint.") (define-public python-gitpython (package (name "python-gitpython") - (version "2.1.11") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "GitPython" version)) (sha256 (base32 - "1a357c28dnhgvq3saia7v29r71ynp48l2qp5xsmnc4vgzmdxqdw2")))) + "1jzllsy9lwc9yibccgv7h9naxisazx2n3zmpy21c8n5xhysw69p4")))) (build-system python-build-system) (arguments `(#:tests? #f ;XXX: Tests can only be run within the GitPython repository. -- cgit v1.2.3 From 1639e0b7b60389cf74548544a5e28f9a0b6757c7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Mar 2020 15:33:35 -0500 Subject: gnu: python-smmap: Update to version 3.0.1, deprecate python-smmap2. * gnu/packages/python-xyz.scm (python-smmap): Rename from python-smmap2, and update to version 3.0.1. (python-smmap2, python2-smmap2): Preserve original bindings, marked as deprecated. * gnu/packages/version-control.scm (python-gitdb)[propagated-inputs]: Depend on the new python-smmap package. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cc866ec888..6597844a9b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -918,7 +918,7 @@ default) of the repository.") (setenv "TRAVIS" "1") (invoke "nosetests" "-v")))))) (propagated-inputs - `(("python-smmap2" ,python-smmap2))) + `(("python-smmap" ,python-smmap))) (native-inputs `(("git" ,git) ("python-nose" ,python-nose))) -- cgit v1.2.3 From 7138257892f1189b84e06a47c7ba8540337bd7a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 15:16:28 +0100 Subject: gnu: git: Build with Python 3. * gnu/packages/version-control.scm (git)[inputs]: Replace python-2 with python. [arguments]: Replace /usr/bin/python with python3. --- 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 6597844a9b..d88d5b4036 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2014, 2016, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2015, 2018 Kyle Meyer -;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -179,7 +179,7 @@ as well as the classic centralized workflow.") ("expat" ,expat) ("openssl" ,openssl) ("perl" ,perl) - ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL + ("python" ,python) ; for git-p4 ("zlib" ,zlib) ;; Note: we keep this in inputs rather than native-inputs to work around @@ -262,7 +262,7 @@ as well as the classic centralized workflow.") (lambda _ (substitute* "Makefile" (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python"))) + (("/usr/bin/python") (which "python3"))) #t)) (add-after 'configure 'add-PM.stamp (lambda _ -- cgit v1.2.3 From 7dffb5bacea543e983de16b6d746159602acd6d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Mar 2020 15:17:45 +0100 Subject: gnu: git: Remove Python 2 from the package closure. * gnu/packages/version-control.scm (git)[native-inputs]: Replace asciidoc with asciidoc-py3. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d88d5b4036..a8cb4cc347 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -171,7 +171,7 @@ as well as the classic centralized workflow.") (base32 "15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h")))) ;; For subtree documentation. - ("asciidoc" ,asciidoc) + ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) ("xmlto" ,xmlto))) (inputs -- cgit v1.2.3 From 0a7aa6922b8ad121bfcf023346f9f9bb97099504 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Mar 2020 12:36:51 +0100 Subject: gnu: libgit2: Update to 0.99.0. * gnu/packages/patches/libgit2-avoid-python.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/version-control.scm (libgit2): Update to 0.99.0. [source](patches): Remove 'libgit2-avoid-python.patch'. [source](snippet): Preserve bundled copy of http-parser. [arguments]: Remove "-DUSE_SHA1DC" from #:configure-flags, which is no longer optional and enabled by default. Add "-DUSE_NTLMCLIENT=OFF" and "-DREGEX_BACKEND=pcre2". Add phase 'fix-pcre2-reference'. [inputs]: Remove HTTP-PARSER. [propagated-inputs]: Add PCRE2. [native-inputs]: Remove GUILE-2.2. Add PYTHON. --- gnu/packages/version-control.scm | 44 +++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a8cb4cc347..514dfe7ab7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 André -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Sou Bunnbu @@ -534,7 +534,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") - (version "0.28.4") + (version "0.99.0") (source (origin (method git-fetch) (uri (git-reference @@ -543,21 +543,37 @@ everything from small to very large projects with speed and efficiency.") (file-name (git-file-name name version)) (sha256 (base32 - "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1")) - (patches (search-patches "libgit2-avoid-python.patch" - "libgit2-mtime-0.patch")) + "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg")) + (patches (search-patches "libgit2-mtime-0.patch")) - ;; Remove bundled software. + ;; Remove bundled software. Keep "http-parser" because it + ;; contains patches that are not available in the system version. (snippet '(begin - (delete-file-recursively "deps") + (with-directory-excursion "deps" + (for-each (lambda (dir) + (delete-file-recursively dir)) + (lset-difference equal? + (scandir ".") + '("." ".." "http-parser")))) #t)) - (modules '((guix build utils))))) + (modules '((guix build utils) + (srfi srfi-1) + (ice-9 ftw))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - `(#:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + `(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this + "-DREGEX_BACKEND=pcre2") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-pcre2-reference + (lambda _ + ;; Use PCRE2 with 8-bit character support, as there is no "libpcre2.pc". + ;; See . + (substitute* "src/CMakeLists.txt" + (("\"libpcre2\"") + "\"libpcre2-8\"")) + #t)) (add-after 'unpack 'fix-hardcoded-paths (lambda _ (substitute* "tests/repo/init.c" @@ -574,14 +590,14 @@ everything from small to very large projects with speed and efficiency.") (replace 'check (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) (inputs - `(("libssh2" ,libssh2) - ("http-parser" ,http-parser))) + `(("libssh2" ,libssh2))) (native-inputs - `(("guile" ,guile-2.2) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python" ,python))) (propagated-inputs - ;; These two libraries are in 'Requires.private' in libgit2.pc. + ;; These libraries are in 'Requires.private' in libgit2.pc. `(("openssl" ,openssl) + ("pcre2" ,pcre2) ("zlib" ,zlib))) (home-page "https://libgit2.github.com/") (synopsis "Library providing Git core methods") -- cgit v1.2.3