* [PATCH 2/9] gnu: Add ghc-fsnotify.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 19:59 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 3/9] gnu: Add ghc-tasty-rerun David Craven
` (7 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-fsnotify): New variable.
---
gnu/packages/haskell.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index cbcce17..b2f28f6 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -8015,4 +8015,32 @@ feature, allowing applications to subscribe to notifications when a file is
accessed or modified.")
(license license:bsd-3)))
+(define-public ghc-fsnotify
+ (package
+ (name "ghc-fsnotify")
+ (version "0.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/fsnotify/"
+ "fsnotify-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-text" ,ghc-text)
+ ("ghc-async" ,ghc-async)
+ ("ghc-unix-compat" ,ghc-unix-compat)
+ ("ghc-hinotify" ,ghc-hinotify)
+ ("ghc-tasty" ,ghc-tasty)
+ ("ghc-tasty-hunit" ,ghc-tasty-hunit)
+ ("ghc-temporary-rc" ,ghc-temporary-rc)))
+ (home-page "https://github.com/haskell-fswatch/hfsnotify")
+ (synopsis "Cross platform library for file change notification.")
+ (description "Cross platform library for file creation, modification, and
+deletion notification. This library builds upon existing libraries for platform
+specific Windows, Mac, and Linux filesystem event notification.")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/9] gnu: Add ghc-tasty-rerun.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
2016-12-03 10:42 ` [PATCH 2/9] gnu: Add ghc-fsnotify David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 20:00 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 4/9] gnu: Add ghc-ieee754 David Craven
` (6 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-tasty-rerun): New variable.
---
gnu/packages/haskell.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index b2f28f6..ed2ade1 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -8043,4 +8043,33 @@ deletion notification. This library builds upon existing libraries for platform
specific Windows, Mac, and Linux filesystem event notification.")
(license license:bsd-3)))
+(define-public ghc-tasty-rerun
+ (package
+ (name "ghc-tasty-rerun")
+ (version "1.1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/tasty-rerun/"
+ "tasty-rerun-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ycxg7whabgcxyzy6gr536x8ykzx45whh1wrbsc7c58zi862fczd"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-mtl" ,ghc-mtl)
+ ("ghc-optparse-applicative" ,ghc-optparse-applicative)
+ ("ghc-reducers" ,ghc-reducers)
+ ("ghc-split" ,ghc-split)
+ ("ghc-stm" ,ghc-stm)
+ ("ghc-tagged" ,ghc-tagged)
+ ("ghc-tasty" ,ghc-tasty)))
+ (home-page "http://github.com/ocharles/tasty-rerun")
+ (synopsis "Run tests by filtering the test tree")
+ (description "This package adds the ability to run tests by filtering the
+test tree based on the result of a previous test run. You can use this to run
+only those tests that failed in the last run, or to only run the tests that have
+been added since previous test run.")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 4/9] gnu: Add ghc-ieee754.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
2016-12-03 10:42 ` [PATCH 2/9] gnu: Add ghc-fsnotify David Craven
2016-12-03 10:42 ` [PATCH 3/9] gnu: Add ghc-tasty-rerun David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 20:01 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 5/9] gnu: Add ghc-terminal-size David Craven
` (5 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-ieee754): New variable.
---
gnu/packages/haskell.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index ed2ade1..c5d586d 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -8072,4 +8072,24 @@ only those tests that failed in the last run, or to only run the tests that have
been added since previous test run.")
(license license:bsd-3)))
+(define-public ghc-ieee754
+ (package
+ (name "ghc-ieee754")
+ (version "0.7.8")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/ieee754/"
+ "ieee754-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1zvfnnd5nm5kgr60214cdyks0kqdqyzpwk5sdh0s60yr8b7fyjny"))))
+ (build-system haskell-build-system)
+ (home-page "http://github.com/patperry/hs-ieee754")
+ (synopsis "Utilities for dealing with IEEE floating point numbers")
+ (description "Utilities for dealing with IEEE floating point numbers,
+ported from the Tango math library; approximate and exact equality comparisons
+for general types.")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 4/9] gnu: Add ghc-ieee754.
2016-12-03 10:42 ` [PATCH 4/9] gnu: Add ghc-ieee754 David Craven
@ 2016-12-03 20:01 ` Leo Famulari
2016-12-10 10:15 ` David Craven
0 siblings, 1 reply; 22+ messages in thread
From: Leo Famulari @ 2016-12-03 20:01 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Sat, Dec 03, 2016 at 11:42:08AM +0100, David Craven wrote:
> * gnu/packages/haskell.scm (ghc-ieee754): New variable.
> +(define-public ghc-ieee754
> + (package
> + (name "ghc-ieee754")
> + (version "0.7.8")
Same issue about the GitHub page appearing out of date, since it doesn't
seem to have a 0.7.8 release tag.
> + (license license:bsd-3)))
I also noticed a 'LICENSE.Tango' file. Can you check if we need to
mention that license as well?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 4/9] gnu: Add ghc-ieee754.
2016-12-03 20:01 ` Leo Famulari
@ 2016-12-10 10:15 ` David Craven
0 siblings, 0 replies; 22+ messages in thread
From: David Craven @ 2016-12-10 10:15 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Hi Leo!
> Same issue about the GitHub page appearing out of date, since it doesn't
> seem to have a 0.7.8 release tag.
So I checked the github pages and the version string was updated, so
the url's are still up to date. I opened an issue regarding release
tagging https://github.com/patperry/hs-ieee754/issues/18
> I also noticed a 'LICENSE.Tango' file. Can you check if we need to
> mention that license as well?
The files in the cbits subfolder are dual licensed, but bsd-3 is the
superset that applies to all files in the package. I'm not sure it's
worth bothering. WDYT?
Thank you for your feedback.
David
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 5/9] gnu: Add ghc-terminal-size.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
` (2 preceding siblings ...)
2016-12-03 10:42 ` [PATCH 4/9] gnu: Add ghc-ieee754 David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 20:01 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 6/9] gnu: ghc-trifecta: Update to 1.6 David Craven
` (4 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-terminal-size): New variable.
---
gnu/packages/haskell.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index c5d586d..c9d8234 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -8092,4 +8092,23 @@ ported from the Tango math library; approximate and exact equality comparisons
for general types.")
(license license:bsd-3)))
+(define-public ghc-terminal-size
+ (package
+ (name "ghc-terminal-size")
+ (version "0.3.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/terminal-size/"
+ "terminal-size-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm"))))
+ (build-system haskell-build-system)
+ (home-page "http://hackage.haskell.org/package/terminal-size")
+ (synopsis "Get terminal window height and width")
+ (description "Get terminal window height and width without ncurses
+dependency.")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 6/9] gnu: ghc-trifecta: Update to 1.6.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
` (3 preceding siblings ...)
2016-12-03 10:42 ` [PATCH 5/9] gnu: Add ghc-terminal-size David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 20:02 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 7/9] gnu: idris: Update to 0.12.3 David Craven
` (3 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-trifecta): Update to 1.6.
[inputs]: Add ghc-doctest and ghc-quickcheck.
[arguments]: Enable tests.
---
gnu/packages/haskell.scm | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index c9d8234..0efb407 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -2316,36 +2316,34 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s
(define-public ghc-trifecta
(package
(name "ghc-trifecta")
- (version "1.5.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://hackage.haskell.org/package/trifecta/trifecta-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "0fjhnsbafl3yw34pyhcsvrqy6a2mnhyqys6gna3rrlygs8ck7hpb"))))
+ (version "1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/trifecta/"
+ "trifecta-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0rbhv9m17k7l1zr70i0yw5da0qjgxmfh1da8brj0zdzwjn9ac0mk"))))
(build-system haskell-build-system)
- (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy
- ; -package ansi-terminal-0.6.2.3"
(inputs
- `(("ghc-charset" ,ghc-charset)
- ("ghc-comonad" ,ghc-comonad)
- ("ghc-lens" ,ghc-lens)
- ("ghc-profunctors" ,ghc-profunctors)
- ("ghc-reducers" ,ghc-reducers)
+ `(("ghc-reducers" ,ghc-reducers)
("ghc-semigroups" ,ghc-semigroups)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
+ ("ghc-charset" ,ghc-charset)
+ ("ghc-comonad" ,ghc-comonad)
+ ("ghc-doctest" ,ghc-doctest)
("ghc-fingertree" ,ghc-fingertree)
("ghc-hashable" ,ghc-hashable)
+ ("ghc-lens" ,ghc-lens)
("ghc-mtl" ,ghc-mtl)
("ghc-parsers" ,ghc-parsers)
+ ("ghc-profunctors" ,ghc-profunctors)
+ ("ghc-quickcheck" ,ghc-quickcheck)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-utf8-string" ,ghc-utf8-string)))
(home-page "https://github.com/ekmett/trifecta/")
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 7/9] gnu: idris: Update to 0.12.3.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
` (4 preceding siblings ...)
2016-12-03 10:42 ` [PATCH 6/9] gnu: ghc-trifecta: Update to 1.6 David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 20:03 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 8/9] gnu: coq: Update to 8.5pl2 David Craven
` (2 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (idris): Update to 0.12.3.
[origin]: Remove snippet.
[inputs]: Add ghc-aeson, ghc-async, ghc-fsnotify, ghc-regex-tdfa,
ghc-tasty-golden, ghc-tasty-rerun and ghc-terminal-size.
[arguments]: Disable tests.
---
gnu/packages/haskell.scm | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 0efb407..2e0ed18 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6672,32 +6672,28 @@ constant-time:
(define-public idris
(package
(name "idris")
- (version "0.9.19.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://hackage.haskell.org/package/idris-"
- version "/idris-" version ".tar.gz"))
- (sha256
- (base32
- "10641svdsjlxbxmbvylpia04cz5nn9486lpiay8ibqcrc1792qgc"))
- (modules '((guix build utils)))
- (snippet
- '(substitute* "idris.cabal"
- ;; Package description file has a too-tight version restriction,
- ;; rendering it incompatible with GHC 7.10.2. This is fixed
- ;; upstream. See
- ;; <https://github.com/idris-lang/Idris-dev/issues/2734>.
- (("vector < 0.11") "vector < 0.12")))))
+ (version "0.12.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/"
+ "idris-" version "/idris-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ijrbgzaahw9aagn4al55nqcggrg9ajlrkq2fjc1saq3xdd3v7rs"))))
(build-system haskell-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'configure 'patch-cc-command
- (lambda _
- (setenv "CC" "gcc"))))))
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'patch-cc-command
+ (lambda _
+ (setenv "CC" "gcc"))))))
(inputs
`(("gmp" ,gmp)
("ncurses" ,ncurses)
+ ("ghc-aeson" ,ghc-aeson)
+ ("ghc-async" ,ghc-async)
("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
@@ -6706,12 +6702,19 @@ constant-time:
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-cheapskate" ,ghc-cheapskate)
("ghc-fingertree" ,ghc-fingertree)
+ ("ghc-fsnotify" ,ghc-fsnotify)
+ ("ghc-ieee754" ,ghc-ieee754)
("ghc-mtl" ,ghc-mtl)
("ghc-network" ,ghc-network)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-parsers" ,ghc-parsers)
+ ("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-safe" ,ghc-safe)
("ghc-split" ,ghc-split)
+ ("ghc-tasty" ,ghc-tasty)
+ ("ghc-tasty-golden" ,ghc-tasty-golden)
+ ("ghc-tasty-rerun" ,ghc-tasty-rerun)
+ ("ghc-terminal-size" ,ghc-terminal-size)
("ghc-text" ,ghc-text)
("ghc-trifecta" ,ghc-trifecta)
("ghc-uniplate" ,ghc-uniplate)
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 7/9] gnu: idris: Update to 0.12.3.
2016-12-03 10:42 ` [PATCH 7/9] gnu: idris: Update to 0.12.3 David Craven
@ 2016-12-03 20:03 ` Leo Famulari
2016-12-03 20:26 ` David Craven
0 siblings, 1 reply; 22+ messages in thread
From: Leo Famulari @ 2016-12-03 20:03 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Sat, Dec 03, 2016 at 11:42:11AM +0100, David Craven wrote:
> * gnu/packages/haskell.scm (idris): Update to 0.12.3.
> [origin]: Remove snippet.
> [inputs]: Add ghc-aeson, ghc-async, ghc-fsnotify, ghc-regex-tdfa,
> ghc-tasty-golden, ghc-tasty-rerun and ghc-terminal-size.
> [arguments]: Disable tests.
Why do we need to skip the tests?
LGTM with that question answered.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 7/9] gnu: idris: Update to 0.12.3.
2016-12-03 20:03 ` Leo Famulari
@ 2016-12-03 20:26 ` David Craven
2016-12-03 21:06 ` Leo Famulari
0 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 20:26 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
> Why do we need to skip the tests?
First idris is not found, then after adding dist/build/idris to PATH,
the idris libraries aren't found. So I set IDRIS_LIBRARY_PATH to libs.
Then the idris runtime system isn't found, so I added rts to
C_INCLUDE_PATH and LIBRARY_PATH. Half of the tests still fail with
blah not found. I think that runhaskell Setup.hs test doesn't set the
working directory correctly. I spent some time trying to track down
the issue further, but couldn't figure out how to build a Haskell
project locally:
guix environment idris
ghc-pkg --package-db=package.conf.d recache
GHC_PACKAGE_PATH= runhaskell Setup.hs configure --package-db=package.conf.d
That's the point when I gave up. If someone knows how I can build a
Haskell project without too much hassle. IDRIS_LIBRARY_PATH currently
only takes one path. To package idris libraries it would be nice to
extend IDRIS_LIBRARY_PATH to a colon separated list, but without a
simple way to build the project (incrementally) it looks like too much
of a hassle...
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 7/9] gnu: idris: Update to 0.12.3.
2016-12-03 20:26 ` David Craven
@ 2016-12-03 21:06 ` Leo Famulari
0 siblings, 0 replies; 22+ messages in thread
From: Leo Famulari @ 2016-12-03 21:06 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Sat, Dec 03, 2016 at 09:26:02PM +0100, David Craven wrote:
> > Why do we need to skip the tests?
>
> First idris is not found, then after adding dist/build/idris to PATH,
> the idris libraries aren't found. So I set IDRIS_LIBRARY_PATH to libs.
> Then the idris runtime system isn't found, so I added rts to
> C_INCLUDE_PATH and LIBRARY_PATH. Half of the tests still fail with
> blah not found. I think that runhaskell Setup.hs test doesn't set the
> working directory correctly. I spent some time trying to track down
> the issue further, but couldn't figure out how to build a Haskell
> project locally:
>
> guix environment idris
> ghc-pkg --package-db=package.conf.d recache
> GHC_PACKAGE_PATH= runhaskell Setup.hs configure --package-db=package.conf.d
>
> That's the point when I gave up. If someone knows how I can build a
> Haskell project without too much hassle. IDRIS_LIBRARY_PATH currently
> only takes one path. To package idris libraries it would be nice to
> extend IDRIS_LIBRARY_PATH to a colon separated list, but without a
> simple way to build the project (incrementally) it looks like too much
> of a hassle...
Okay, I think you should summarize this in a code comment :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 8/9] gnu: coq: Update to 8.5pl2.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
` (5 preceding siblings ...)
2016-12-03 10:42 ` [PATCH 7/9] gnu: idris: Update to 0.12.3 David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 20:09 ` Leo Famulari
2016-12-03 10:42 ` [PATCH 9/9] gnu: Add ocaml-menhir David Craven
2016-12-03 19:58 ` [PATCH 1/9] gnu: Add ghc-hinotify Leo Famulari
8 siblings, 1 reply; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* 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(-)
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
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 9/9] gnu: Add ocaml-menhir.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
` (6 preceding siblings ...)
2016-12-03 10:42 ` [PATCH 8/9] gnu: coq: Update to 8.5pl2 David Craven
@ 2016-12-03 10:42 ` David Craven
2016-12-03 19:56 ` Leo Famulari
2016-12-03 20:12 ` Leo Famulari
2016-12-03 19:58 ` [PATCH 1/9] gnu: Add ghc-hinotify Leo Famulari
8 siblings, 2 replies; 22+ messages in thread
From: David Craven @ 2016-12-03 10:42 UTC (permalink / raw)
To: guix-devel
* gnu/packages/ocaml.scm (ocaml-menhir): New variable.
---
gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index b9b3d4a..e93e730 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -456,6 +456,36 @@ assistant to write formal mathematical proofs using a variety of theorem
provers.")
(license gpl2+)))
+(define-public ocaml-menhir
+ (package
+ (name "ocaml-menhir")
+ (version "20161115")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://gallium.inria.fr/~fpottier/menhir/"
+ "menhir-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("ocaml" ,ocaml)))
+ (arguments
+ `(#:parallel-build? #f ; Parallel build causes failure
+ #:tests? #f ; No check target
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (setenv "PREFIX" out))
+ #t)))))
+ (home-page "http://gallium.inria.fr/~fpottier/menhir")
+ (synopsis "Parser generator")
+ (description "")
+ (license #f)))
+
(define-public lablgtk
(package
(name "lablgtk")
--
2.9.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 9/9] gnu: Add ocaml-menhir.
2016-12-03 10:42 ` [PATCH 9/9] gnu: Add ocaml-menhir David Craven
@ 2016-12-03 19:56 ` Leo Famulari
2016-12-03 20:12 ` Leo Famulari
1 sibling, 0 replies; 22+ messages in thread
From: Leo Famulari @ 2016-12-03 19:56 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Sat, Dec 03, 2016 at 11:42:13AM +0100, David Craven wrote:
> * gnu/packages/ocaml.scm (ocaml-menhir): New variable.
> + (synopsis "Parser generator")
> + (description "")
This description is a bit too short ;)
> + (license #f)))
According the the 'LICENSE' file, it appears to use GPL2 (I didn't check
for "or later) for the library, and the Q Public License for the
"generator".
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 9/9] gnu: Add ocaml-menhir.
2016-12-03 10:42 ` [PATCH 9/9] gnu: Add ocaml-menhir David Craven
2016-12-03 19:56 ` Leo Famulari
@ 2016-12-03 20:12 ` Leo Famulari
1 sibling, 0 replies; 22+ messages in thread
From: Leo Famulari @ 2016-12-03 20:12 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Sat, Dec 03, 2016 at 11:42:13AM +0100, David Craven wrote:
> * gnu/packages/ocaml.scm (ocaml-menhir): New variable.
> + #:phases
> + (modify-phases %standard-phases
> + (replace 'configure
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out")))
> + (setenv "PREFIX" out))
> + #t)))))
This is skipping the configure phase and reusing it to set the PREFIX
variable, right?
If so, I think it's better to delete the configure phase and set the
variable in its own set-env phase, or with #:configure-flags or
#:make-flags (if they are respected by this build system).
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/9] gnu: Add ghc-hinotify.
2016-12-03 10:42 [PATCH 1/9] gnu: Add ghc-hinotify David Craven
` (7 preceding siblings ...)
2016-12-03 10:42 ` [PATCH 9/9] gnu: Add ocaml-menhir David Craven
@ 2016-12-03 19:58 ` Leo Famulari
8 siblings, 0 replies; 22+ messages in thread
From: Leo Famulari @ 2016-12-03 19:58 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Sat, Dec 03, 2016 at 11:42:05AM +0100, David Craven wrote:
> * gnu/packages/haskell.scm (ghc-hinotify): New variable.
> + (version "0.3.8.1")
0.3.9 was *just* released a few minutes ago. Please use that if it works
for you.
> + (home-page "https://github.com/kolmodin/hinotify.git")
> + (synopsis "Haskell binding to inotify")
> + (description "This library provides a wrapper to the Linux Kernel's inotify
I recommend s/Kernel/kernel
^ permalink raw reply [flat|nested] 22+ messages in thread