diff mbox

[8/9] gnu: coq: Update to 8.5pl2.

Message ID 20161203104213.8135-8-david@craven.ch
State New
Headers show

Commit Message

David Craven Dec. 3, 2016, 10:42 a.m. UTC
* gnu/packages/ocaml.scm (coq): Update to 8.5pl2.
  [arguments]: Configure script takes single hyphen arguments.
---
 gnu/packages/ocaml.scm | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

Comments

Leo Famulari Dec. 3, 2016, 8:09 p.m. UTC | #1
On Sat, Dec 03, 2016 at 11:42:12AM +0100, David Craven wrote:
> * gnu/packages/ocaml.scm (coq): Update to 8.5pl2.
>   [arguments]: Configure script takes single hyphen arguments.

>      (source (origin
>                (method url-fetch)
> -              (uri (string-append "https://coq.inria.fr/distrib/V" version
> -                                  "/files/" name "-" version ".tar.gz"))
> +              (uri (string-append
> +                    "https://coq.inria.fr/distrib"
> +                    "/V" version "/files/"
> +                    "coq-" version ".tar.gz"))

The URI is unchanged, right? If so, I'd leave this hunk out of the
commit.

Otherwise LGTM.
diff mbox

Patch

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f1b4bdb..b9b3d4a 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -329,14 +329,16 @@  written in Objective Caml.")
 (define-public coq
   (package
     (name "coq")
-    (version "8.4pl6")
+    (version "8.5pl2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://coq.inria.fr/distrib/V" version
-                                  "/files/" name "-" version ".tar.gz"))
+              (uri (string-append
+                    "https://coq.inria.fr/distrib"
+                    "/V" version "/files/"
+                    "coq-" version ".tar.gz"))
               (sha256
                (base32
-                "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55"))))
+                "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("texlive" ,texlive)
@@ -348,24 +350,24 @@  written in Objective Caml.")
      `(#:phases
        (modify-phases %standard-phases
          (replace 'configure
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    (let* ((out (assoc-ref outputs "out"))
-                           (mandir (string-append out "/share/man"))
-                           (browser "icecat -remote \"OpenURL(%s,new-tab)\""))
-                      (zero? (system* "./configure"
-                                      "--prefix" out
-                                      "--mandir" mandir
-                                      "--browser" browser)))))
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (mandir (string-append out "/share/man"))
+                    (browser "icecat -remote \"OpenURL(%s,new-tab)\""))
+               (zero? (system* "./configure"
+                               "-prefix" out
+                               "-mandir" mandir
+                               "-browser" browser)))))
          (replace 'build
-                  (lambda _
-                    (zero? (system* "make" "-j" (number->string
-                                                 (parallel-job-count))
-                                    "world"))))
+           (lambda _
+             (zero? (system* "make" "-j" (number->string
+                                          (parallel-job-count))
+                             "world"))))
          (delete 'check)
          (add-after 'install 'check
-                    (lambda _
-                      (with-directory-excursion "test-suite"
-                        (zero? (system* "make"))))))))
+           (lambda _
+             (with-directory-excursion "test-suite"
+               (zero? (system* "make"))))))))
     (home-page "https://coq.inria.fr")
     (synopsis "Proof assistant for higher-order logic")
     (description