diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-01-19 05:27:06 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-01-19 13:19:33 +0100 |
commit | 5bb12e1462c4ecfbed829b09ed011853dd74209d (patch) | |
tree | 75955d5cd58fe3de48fca690146d378e1ce0cc8e /gnu/packages/ninja.scm | |
parent | 5d0bd1fbbf00c3f8a06fc64b29f801780f4d46b2 (diff) | |
download | guix-5bb12e1462c4ecfbed829b09ed011853dd74209d.tar guix-5bb12e1462c4ecfbed829b09ed011853dd74209d.tar.gz |
gnu: ninja: Update to 1.8.2.
* gnu/packages/ninja.scm (ninja): Update to 1.8.2.
[source]: Remove upstreamed patch.
[arguments]: Substitute INVOKE for SYSTEM*. Use standard indentation.
* gnu/packages/patches/ninja-zero-mtime.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/ninja.scm')
-rw-r--r-- | gnu/packages/ninja.scm | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 2a53a3f5b3..adb236484f 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,7 @@ (define-public ninja (package (name "ninja") - (version "1.7.2") + (version "1.8.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/martine/ninja/" @@ -37,38 +38,33 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1n8n3g26ppwh7zwrc37n3alkbpbj0wki34ih53s3rkhs8ajs1p9f")) - (patches (search-patches "ninja-zero-mtime.patch")))) + "1x66q6494ml1p1f74mxzik1giakl4zj7rxig9jsc50087l671f46")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) (arguments '(#:phases (modify-phases %standard-phases - (replace - 'configure - (lambda _ - (substitute* "src/subprocess-posix.cc" - (("/bin/sh") (which "sh"))) - #t)) - (replace - 'build - (lambda _ - (zero? (system* "./configure.py" "--bootstrap")))) - (replace - 'check - (lambda _ - (and (zero? (system* "./configure.py")) - (zero? (system* "./ninja" "ninja_test")) - (zero? (system* "./ninja_test"))))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/ninja"))) - (install-file "ninja" bin) - (install-file "doc/manual.asciidoc" doc) - #t)))))) + (replace 'configure + (lambda _ + (substitute* "src/subprocess-posix.cc" + (("/bin/sh") (which "sh"))) + #t)) + (replace 'build + (lambda _ + (invoke "./configure.py" "--bootstrap"))) + (replace 'check + (lambda _ + (invoke "./configure.py") + (invoke "./ninja" "ninja_test") + (invoke "./ninja_test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/ninja"))) + (install-file "ninja" bin) + (install-file "doc/manual.asciidoc" doc) + #t)))))) (home-page "https://ninja-build.org/") (synopsis "Small build system") (description |