From 8a4608b4bf4f13766b4e3d11577c61f398034544 Mon Sep 17 00:00:00 2001 From: "John D. Boy" Date: Mon, 6 Apr 2020 16:14:56 +0200 Subject: gnu: fossil: Update to 2.10. * gnu/packages/version-control.scm (fossil): Update to 2.10. [source]: Remove obsolete alternate URL. Signed-off-by: Leo Famulari --- gnu/packages/version-control.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8af54c6e35..8dc59d0439 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2105,21 +2105,16 @@ by rclone usable with git-annex.") (define-public fossil (package (name "fossil") - (version "2.8") + (version "2.10") (source (origin (method url-fetch) - ;; Older downloads are moved to another URL. - (uri (list - (string-append - "https://www.fossil-scm.org/index.html/uv/download/" - "fossil-src-" version ".tar.gz") - (string-append + (uri (string-append "https://www.fossil-scm.org/index.html/uv/" - "fossil-src-" version ".tar.gz"))) + "fossil-src-" version ".tar.gz")) (sha256 (base32 - "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka")) + "041bs4fgk52fw58p7s084pxk9d9vs5v2f2pjbznqawz75inpg8yq")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 158b8600c9d49ba6954a6ac824a7880cc3344b70 Mon Sep 17 00:00:00 2001 From: Nicolò Balzarotti Date: Thu, 2 Apr 2020 11:54:15 +0200 Subject: gnu: libgit2: Use system http-parser. * gnu/packages/version-control.scm (libgit2)[source]: Update snippet. [arguments]: Add configure-flag to use system http-parser. [inputs]: Add http-parser. Signed-off-by: Efraim Flashner --- gnu/packages/version-control.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8dc59d0439..ac88515c25 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -612,25 +612,15 @@ on @command{git}, and use any regular Git hosting service.") (base32 "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg")) (patches (search-patches "libgit2-mtime-0.patch")) - - ;; Remove bundled software. Keep "http-parser" because it - ;; contains patches that are not available in the system version. (snippet '(begin - (with-directory-excursion "deps" - (for-each (lambda (dir) - (delete-file-recursively dir)) - (lset-difference equal? - (scandir ".") - '("." ".." "http-parser")))) - #t)) - (modules '((guix build utils) - (srfi srfi-1) - (ice-9 ftw))))) + (delete-file-recursively "deps") #t)) + (modules '((guix build utils))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments `(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this - "-DREGEX_BACKEND=pcre2") + "-DREGEX_BACKEND=pcre2" + "-DUSE_HTTP_PARSER=system") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-pcre2-reference @@ -657,7 +647,8 @@ on @command{git}, and use any regular Git hosting service.") (replace 'check (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) (inputs - `(("libssh2" ,libssh2))) + `(("libssh2" ,libssh2) + ("http-parser" ,http-parser))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From 912b6ab01c405f693470ccb0c86a5e652674529a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Apr 2020 11:08:40 +0300 Subject: gnu: libgit2: Upgrade to 1.0.0. * gnu/packages/version-control.scm (libgit2): Upgrade to 1.0.0. [source]: Download using url-fetch. [arguments]: Remove 'fix-pcre2-reference, 'make-git-checkout-writable custom phases. [home-page]: Update home-page. --- gnu/packages/version-control.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ac88515c25..fdbfab2fa4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -601,16 +601,15 @@ on @command{git}, and use any regular Git hosting service.") (define-public libgit2 (package (name "libgit2") - (version "0.99.0") + (version "1.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libgit2/libgit2.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/libgit2/libgit2/" + "releases/download/v" version + "/libgit2-" version ".tar.gz")) (sha256 (base32 - "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg")) + "1d09ni0v3vammk8zqmmwks92fh3wwnsxpyrh4s5wwdb3gxma27va")) (patches (search-patches "libgit2-mtime-0.patch")) (snippet '(begin (delete-file-recursively "deps") #t)) @@ -623,14 +622,6 @@ on @command{git}, and use any regular Git hosting service.") "-DUSE_HTTP_PARSER=system") #: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" @@ -639,10 +630,6 @@ on @command{git}, and use any regular Git hosting service.") (("/bin/cp") (which "cp")) (("/bin/rm") (which "rm"))) #t)) - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) ;; Run checks more verbosely. (replace 'check (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) @@ -657,7 +644,7 @@ on @command{git}, and use any regular Git hosting service.") `(("openssl" ,openssl) ("pcre2" ,pcre2) ("zlib" ,zlib))) - (home-page "https://libgit2.github.com/") + (home-page "https://libgit2.org/") (synopsis "Library providing Git core methods") (description "Libgit2 is a portable, pure C implementation of the Git core methods -- cgit v1.2.3