diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-03-22 12:57:37 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-03-22 12:57:37 +0200 |
| commit | 378de69c59ee0700c67b10b38592c213821b41f2 (patch) | |
| tree | ee9b6465430077a79cace3cb8fab1a85a8c1e4c5 /gnu/packages/version-control.scm | |
| parent | 049e02eaa258942515260a58c8d9ddfc4e7caffe (diff) | |
| parent | d8be338f16c7da4acfa55f29f58beaf908d3ad60 (diff) | |
| download | guix-378de69c59ee0700c67b10b38592c213821b41f2.tar guix-378de69c59ee0700c67b10b38592c213821b41f2.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index aee424fbc9..71e499085f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -112,14 +112,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.12.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q")))) + "18mdlg4ws78s4asfrn6licm9v6qw4wp9m0kdjq0y2r5pci1nf4fv")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -132,7 +132,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "0ws7h04ijqr2l0pp9qbds65v9cd70v0qfpnhqncn9zqfspw5d0wb")))))) + "1km0sbrqgni0q88abh4zb1m7xa9ld3d4qi36095b11a3vr6w7xgv")))))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -451,11 +451,7 @@ to lock down your entire repository.") #t))))))) (native-inputs ;; For building manpage. - `(("asciidoc" ,asciidoc) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("xmllint" ,libxml2) - ("xsltprot" ,libxslt))) + `(("asciidoc" ,asciidoc))) (inputs `(("git:src" ,(package-source git@2.9)) ("openssl" ,openssl) @@ -857,10 +853,6 @@ RCS, PRCS, and Aegis packages.") (list "CC=gcc" (string-append "prefix?=" (assoc-ref %outputs "out"))))) (inputs `(("git" ,git))) (native-inputs `(("asciidoc" ,asciidoc) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("xmllint" ,libxml2) - ("xsltproc" ,libxslt) ;; These are needed for the tests. ("cvs" ,cvs) ("python" ,python-2) |