nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: opam: Upgrade to 1.2.2. 

* gnu/packages/ocaml.scm (opam): Upgrade to 1.2.2.
[arguments]: define SHELL in #:make-flags.  Build dependencies in
'pre-build phase.
[inputs]: Add camlp4.
This commit is contained in:
Eric Bavier 2016-08-22 12:28:09 -05:00
parent 2385cab164
commit 4533cd73ef
No known key found for this signature in database
GPG Key ID: 1EBBD204781F962C
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/ocaml.scm
View File

@ -149,7 +149,7 @@ functional, imperative and object-oriented styles of programming.")
(define-public opam (define-public opam
(package (package
(name "opam") (name "opam")
(version "1.1.1") (version "1.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Use the '-full' version, which includes all the dependencies. ;; Use the '-full' version, which includes all the dependencies.
@ -161,7 +161,7 @@ functional, imperative and object-oriented styles of programming.")
) )
(sha256 (sha256
(base32 (base32
"1frzqkx6yn1pnyd9qz3bv3rbwv74bmc1xji8kl41r1dkqzfl3xqv")))) "004gwn6rbpcb53y3rpb3v23vk39rp2xmf0liyd5iy12ij8bigrhm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; Sometimes, 'make -jX' would fail right after ./configure with '(;; Sometimes, 'make -jX' would fail right after ./configure with
@ -169,7 +169,10 @@ functional, imperative and object-oriented styles of programming.")
#:parallel-build? #f #:parallel-build? #f
;; For some reason, 'ocp-build' needs $TERM to be set. ;; For some reason, 'ocp-build' needs $TERM to be set.
#:make-flags '("TERM=screen") #:make-flags `("TERM=screen"
,(string-append "SHELL="
(assoc-ref %build-inputs "bash")
"/bin/sh"))
#:test-target "tests" #:test-target "tests"
;; FIXME: There's an obscure test failure: ;; FIXME: There's an obscure test failure:
@ -182,7 +185,9 @@ functional, imperative and object-oriented styles of programming.")
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
(substitute* "src/core/opamSystem.ml" (substitute* "src/core/opamSystem.ml"
(("\"/bin/sh\"") (("\"/bin/sh\"")
(string-append "\"" bash "/bin/sh\"")))))) (string-append "\"" bash "/bin/sh\"")))
;; Build dependencies
(zero? (apply system* "make" "lib-ext" make-flags)))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
@ -190,7 +195,8 @@ functional, imperative and object-oriented styles of programming.")
(system "git config --global user.name Guix"))))))) (system "git config --global user.name Guix")))))))
(native-inputs (native-inputs
`(("git" ,git) ;for the tests `(("git" ,git) ;for the tests
("python" ,python))) ;for the tests ("python" ,python) ;for the tests
("camlp4" ,camlp4)))
(inputs (inputs
`(("ocaml" ,ocaml) `(("ocaml" ,ocaml)
("ncurses" ,ncurses) ("ncurses" ,ncurses)