diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
| commit | 3cb61ca85a634db2dcc2badaf3492440bf621d92 (patch) | |
| tree | 72561a5f7056aa29cec7d50fb8b960b32b44a585 /gnu/packages/version-control.scm | |
| parent | a60370727a77d1658307698276239c153d8279e8 (diff) | |
| parent | f92854fea150f0d47c4984f87bf21bd5f8051820 (diff) | |
| download | guix-3cb61ca85a634db2dcc2badaf3492440bf621d92.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5467099a15..5c3c40d680 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages groff) + #:use-module (gnu packages guile) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) @@ -535,7 +536,8 @@ everything from small to very large projects with speed and efficiency.") (sha256 (base32 "0swk2dyq5a4p1jn5wvbcsrxckhh808vifxz5y8w663avg541188c")) - (patches (search-patches "libgit2-mtime-0.patch")) + (patches (search-patches "libgit2-avoid-python.patch" + "libgit2-mtime-0.patch")) ;; Remove bundled software. (snippet '(begin @@ -561,10 +563,10 @@ everything from small to very large projects with speed and efficiency.") (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) (inputs `(("libssh2" ,libssh2) - ("http-parser" ,http-parser) - ("python" ,python-wrapper))) + ("http-parser" ,http-parser))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("guile" ,guile-2.2) + ("pkg-config" ,pkg-config))) (propagated-inputs ;; These two libraries are in 'Requires.private' in libgit2.pc. `(("openssl" ,openssl) |