From f63981de14796d0a0814b4e22ec0b901f671d649 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:46:35 +0100 Subject: gnu: Add ghc-hinotify. * gnu/packages/haskell.scm (ghc-hinotify): New variable. --- gnu/packages/haskell.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7a7d6bab87..f83c873ece 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2015, 2016 Ricardo Wurmus +;;; Copyright © 2016 David Craven ;;; ;;; This file is part of GNU Guix. ;;; @@ -7994,4 +7995,24 @@ helper functions for Lists, Maybes, Tuples, Functions.") 3D plots using gnuplot.") (license license:bsd-3))) +(define-public ghc-hinotify + (package + (name "ghc-hinotify") + (version "0.3.8.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hinotify/" + "hinotify-" version ".tar.gz")) + (sha256 + (base32 + "03c1f4d7x805zdiq2w26kl09xrfjw19saycdkhnixzv2qcr6xm1p")))) + (build-system haskell-build-system) + (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 +feature, allowing applications to subscribe to notifications when a file is +accessed or modified.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From b7f96285a5dcb69028344ee448ef1054a0287cd4 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:48:32 +0100 Subject: gnu: Add ghc-fsnotify. * gnu/packages/haskell.scm (ghc-fsnotify): New variable. --- gnu/packages/haskell.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f83c873ece..4a69dc3eb9 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 -- cgit v1.2.3 From f7e624b639c24c5d4a374ff92b134375ecfdee92 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:52:38 +0100 Subject: gnu: Add ghc-tasty-rerun. * gnu/packages/haskell.scm (ghc-tasty-rerun): New variable. --- gnu/packages/haskell.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4a69dc3eb9..7b46aad340 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 -- cgit v1.2.3 From 5e6cafe157ce354d478fd280c3c5e33b105a706f Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:53:43 +0100 Subject: gnu: Add ghc-ieee754. * gnu/packages/haskell.scm (ghc-ieee754): New variable. --- gnu/packages/haskell.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7b46aad340..2f1652f8db 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 -- cgit v1.2.3 From 4e05c326eff341d273f926ff93b3868b56de14d6 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:54:46 +0100 Subject: gnu: Add ghc-terminal-size. * gnu/packages/haskell.scm (ghc-terminal-size): New variable. --- gnu/packages/haskell.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2f1652f8db..f9a50cd061 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 -- cgit v1.2.3 From 3ea25176f0154b0cc3df4fc869350929760ccb98 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:55:48 +0100 Subject: gnu: ghc-trifecta: Update to 1.6. * 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(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f9a50cd061..f0c27cea6d 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/") -- cgit v1.2.3 From 60bc622b1d7e70bbc208bf1af356d1157196ae57 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sat, 5 Nov 2016 18:58:41 +0100 Subject: gnu: idris: Update to 0.12.3. * 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 | 62 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 21 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f0c27cea6d..8e5927a00b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6670,34 +6670,47 @@ constant-time: (license license:bsd-3))) (define-public idris + ;; TODO: IDRIS_LIBRARY_PATH only accepts a single path and not a colon + ;; separated list. + ;; TODO: When installing idris the location of the standard libraries + ;; cannot be specified. + ;; NOTE: Creating an idris build system: + ;; Idris packages can be packaged and installed using a trivial + ;; build system. + ;; (zero? (system* (string-append idris "/bin/idris") + ;; "--ibcsubdir" + ;; (string-append out "/idris/libs/lightyear") + ;; "--install" "lightyear.ipkg") + ;; (native-search-paths + ;; (list (search-path-specification + ;; (variable "IDRIS_LIBRARY_PATH") + ;; (files '("idris/libs"))))) (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 - ;; . - (("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")))))) + `(;; FIXME: runhaskell Setup.hs test doesn't set paths required by test + ;; suite. + #: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 +6719,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) -- cgit v1.2.3 From 3b3b60d0370f0a93be075341152b623d58632fa2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Jan 2017 01:30:46 +0100 Subject: gnu: Use HTTPS for all sourceforge.net home pages. * gnu/packages/admin.scm (mingetty, clusterssh)[home-page]: Use HTTPS. * gnu/packages/audio.scm (libbs2b, soxr)[home-page]: Likewise. * gnu/packages/bioinformatics.scm (bless)[home-page]: Likewise. * gnu/packages/display-managers.scm (slim)[home-page]: Likewise. * gnu/packages/games.scm (extremetuxracer)[home-page]: Likewise. * gnu/packages/ghostscript.scm (gs-fonts)[home-page]: Likewise. * gnu/packages/haskell.scm (ghc-regex-base, ghc-regex-posix, ghc-regex-compat)[home-page]: Likewise. * gnu/packages/image.scm (imlib2)[home-page]: Likewise. * gnu/packages/libreoffice.scm (librevenge, libcmis, libodfgen, libmwaw) [home-page]: Likewise. * gnu/packages/linux.scm (hdparm, acpid, libavc1394, rng-tools) [home-page]: Likewise. * gnu/packages/mail.scm (esmtp)[home-page]: Likewise. * gnu/packages/mp3.scm (ripperx)[home-page]: Likewise. * gnu/packages/onc-rpc.scm (libtirpc)[home-page]: Likewise. * gnu/packages/perl.scm (perl-czplib)[home-page]: Likewise. * gnu/packages/python.scm (python-pyasn1-modules)[home-page]: Likewise. * gnu/packages/xdisorg.scm (xosd)[home-page]: Likewise. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8e5927a00b..8dd9dd41d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2200,7 +2200,7 @@ removed. Both IPv4 and IPv6 are supported.") (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page - "http://sourceforge.net/projects/lazy-regex") + "https://sourceforge.net/projects/lazy-regex") (synopsis "Replaces/Enhances Text.Regex") (description "@code{Text.Regex.Base} provides the interface API for regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") @@ -2223,7 +2223,7 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "http://sourceforge.net/projects/lazy-regex") + (home-page "https://sourceforge.net/projects/lazy-regex") (synopsis "POSIX regular expressions for Haskell") (description "This library provides the POSIX regex backend used by the Haskell library @code{regex-base}.") @@ -2247,7 +2247,7 @@ Haskell library @code{regex-base}.") (inputs `(("ghc-regex-base" ,ghc-regex-base) ("ghc-regex-posix" ,ghc-regex-posix))) - (home-page "http://sourceforge.net/projects/lazy-regex") + (home-page "https://sourceforge.net/projects/lazy-regex") (synopsis "Replaces/Enhances Text.Regex") (description "This library provides one module layer over @code{regex-posix} to replace @code{Text.Regex}.") -- cgit v1.2.3 From 2d2388e243d31f00b31b36b8ada76876b6fdacf2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 4 Jan 2017 00:23:58 +0100 Subject: gnu: Add ghc-language-c. * gnu/packages/haskell.scm (ghc-language-c): New variable. --- gnu/packages/haskell.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8dd9dd41d7..eea2ed127a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8129,4 +8129,31 @@ for general types.") dependency.") (license license:bsd-3))) +(define-public ghc-language-c + (package + (name "ghc-language-c") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/language-c/language-c-" + version + ".tar.gz")) + (sha256 + (base32 + "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6")))) + (build-system haskell-build-system) + (inputs `(("ghc-syb" ,ghc-syb))) + (native-inputs + `(("ghc-happy" ,ghc-happy) + ("ghc-alex" ,ghc-alex))) + (home-page "http://visq.github.io/language-c/") + (synopsis "Analysis and generation of C code") + (description + "Language C is a haskell library for the analysis and generation of C code. +It features a complete, well tested parser and pretty printer for all of C99 +and a large set of GNU extensions.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From de793e9a5a26d610285c3b0521f433c753bf7d44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Jan 2017 11:40:32 +0100 Subject: gnu: ghc-language-c: Fix up. * gnu/packages/haskell.scm (ghc-language-c): Fix up indentation and description. --- gnu/packages/haskell.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eea2ed127a..9029f3ebd8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8131,29 +8131,27 @@ dependency.") (define-public ghc-language-c (package - (name "ghc-language-c") - (version "0.5.0") - (source + (name "ghc-language-c") + (version "0.5.0") + (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/language-c/language-c-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "language-c/language-c-" version ".tar.gz")) (sha256 - (base32 - "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6")))) - (build-system haskell-build-system) - (inputs `(("ghc-syb" ,ghc-syb))) - (native-inputs + (base32 + "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6")))) + (build-system haskell-build-system) + (inputs `(("ghc-syb" ,ghc-syb))) + (native-inputs `(("ghc-happy" ,ghc-happy) ("ghc-alex" ,ghc-alex))) - (home-page "http://visq.github.io/language-c/") - (synopsis "Analysis and generation of C code") - (description - "Language C is a haskell library for the analysis and generation of C code. -It features a complete, well tested parser and pretty printer for all of C99 + (home-page "http://visq.github.io/language-c/") + (synopsis "Analysis and generation of C code") + (description + "Language C is a Haskell library for the analysis and generation of C code. +It features a complete, well-tested parser and pretty printer for all of C99 and a large set of GNU extensions.") - (license license:bsd-3))) + (license license:bsd-3))) ;;; haskell.scm ends here -- cgit v1.2.3 From c0d5b6452bbc063afe3a3b2ddc9c86f1637890df Mon Sep 17 00:00:00 2001 From: David Craven Date: Mon, 2 Jan 2017 14:36:58 +0100 Subject: gnu: Order module imports in (gnu packages haskell) alphabetically. * gnu/packages/haskell.scm: Order module imports alphabetically. --- gnu/packages/haskell.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9029f3ebd8..4e3868f5a4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -25,33 +25,33 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages haskell) - #:use-module (ice-9 regex) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build-system gnu) - #:use-module (guix build-system haskell) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages perl) + #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) #:use-module (gnu packages elf) - #:use-module (gnu packages gl) - #:use-module (gnu packages sdl) - #:use-module (gnu packages bootstrap) - #:use-module (gnu packages zip) #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) - #:use-module (gnu packages libffi) + #:use-module (gnu packages gl) #:use-module (gnu packages libedit) + #:use-module (gnu packages libffi) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) - #:use-module (gnu packages python) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages zip) + #:use-module (guix build-system gnu) + #:use-module (guix build-system haskell) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (ice-9 regex)) (define ghc-bootstrap-x86_64-7.8.4 (origin -- cgit v1.2.3 From c7a7129c5a3c02bd000be73ea7c7c26189c370b7 Mon Sep 17 00:00:00 2001 From: David Craven Date: Wed, 14 Dec 2016 14:42:32 +0100 Subject: gnu: idris: Update to 0.99. * gnu/packages/haskell.scm (idris): Update to 0.99. --- gnu/packages/haskell.scm | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4e3868f5a4..eda3a7b72d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2015, 2016 Ricardo Wurmus -;;; Copyright © 2016 David Craven +;;; Copyright © 2016, 2017 David Craven ;;; ;;; This file is part of GNU Guix. ;;; @@ -6670,24 +6670,9 @@ constant-time: (license license:bsd-3))) (define-public idris - ;; TODO: IDRIS_LIBRARY_PATH only accepts a single path and not a colon - ;; separated list. - ;; TODO: When installing idris the location of the standard libraries - ;; cannot be specified. - ;; NOTE: Creating an idris build system: - ;; Idris packages can be packaged and installed using a trivial - ;; build system. - ;; (zero? (system* (string-append idris "/bin/idris") - ;; "--ibcsubdir" - ;; (string-append out "/idris/libs/lightyear") - ;; "--install" "lightyear.ipkg") - ;; (native-search-paths - ;; (list (search-path-specification - ;; (variable "IDRIS_LIBRARY_PATH") - ;; (files '("idris/libs"))))) (package (name "idris") - (version "0.12.3") + (version "0.99") (source (origin (method url-fetch) (uri (string-append @@ -6695,17 +6680,8 @@ constant-time: "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "1ijrbgzaahw9aagn4al55nqcggrg9ajlrkq2fjc1saq3xdd3v7rs")))) + "1sd4vy5rx0mp32xj99qijhknkgw4d2rxvz6wiy3pym6kaqmc497i")))) (build-system haskell-build-system) - (arguments - `(;; FIXME: runhaskell Setup.hs test doesn't set paths required by test - ;; suite. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-cc-command - (lambda _ - (setenv "CC" "gcc")))))) (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) @@ -6741,6 +6717,31 @@ constant-time: ("ghc-vector" ,ghc-vector) ("ghc-zip-archive" ,ghc-zip-archive) ("ghc-zlib" ,ghc-zlib))) + (arguments + `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox. + #:configure-flags + (list (string-append "--datasubdir=" + (assoc-ref %outputs "out") "/lib/idris")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-cc-command + (lambda _ + (setenv "CC" "gcc") + #t)) + (add-after 'install 'fix-libs-install-location + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/idris")) + (modules (string-append lib "/libs"))) + (for-each + (lambda (module) + (symlink (string-append modules "/" module) + (string-append lib "/" module))) + '("prelude" "base" "contrib" "effects" "pruviloj")))))))) + (native-search-paths + (list (search-path-specification + (variable "IDRIS_LIBRARY_PATH") + (files '("lib/idris"))))) (home-page "http://www.idris-lang.org") (synopsis "General purpose language with full dependent types") (description "Idris is a general purpose language with full dependent -- cgit v1.2.3 From ae482ce12d19f7d8d58677a8c56c9581fa1c50fc Mon Sep 17 00:00:00 2001 From: David Craven Date: Tue, 3 Jan 2017 21:23:36 +0100 Subject: gnu: idris: Move to (gnu packages idris). * gnu/packages/haskell.scm: Move 'idris' to... * gnu/packages/idris.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add idris.scm. --- gnu/packages/haskell.scm | 82 ------------------------------------------------ 1 file changed, 82 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eda3a7b72d..de061a6300 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6669,88 +6669,6 @@ constant-time: @end enumerate\n") (license license:bsd-3))) -(define-public idris - (package - (name "idris") - (version "0.99") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "idris-" version "/idris-" version ".tar.gz")) - (sha256 - (base32 - "1sd4vy5rx0mp32xj99qijhknkgw4d2rxvz6wiy3pym6kaqmc497i")))) - (build-system haskell-build-system) - (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) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-html" ,ghc-blaze-html) - ("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) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-vector-binary-instances" ,ghc-vector-binary-instances) - ("ghc-vector" ,ghc-vector) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-zlib" ,ghc-zlib))) - (arguments - `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox. - #:configure-flags - (list (string-append "--datasubdir=" - (assoc-ref %outputs "out") "/lib/idris")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-cc-command - (lambda _ - (setenv "CC" "gcc") - #t)) - (add-after 'install 'fix-libs-install-location - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/idris")) - (modules (string-append lib "/libs"))) - (for-each - (lambda (module) - (symlink (string-append modules "/" module) - (string-append lib "/" module))) - '("prelude" "base" "contrib" "effects" "pruviloj")))))))) - (native-search-paths - (list (search-path-specification - (variable "IDRIS_LIBRARY_PATH") - (files '("lib/idris"))))) - (home-page "http://www.idris-lang.org") - (synopsis "General purpose language with full dependent types") - (description "Idris is a general purpose language with full dependent -types. It is compiled, with eager evaluation. Dependent types allow types to -be predicated on values, meaning that some aspects of a program's behaviour -can be specified precisely in the type. The language is closely related to -Epigram and Agda.") - (license license:bsd-3))) - (define-public ghc-base16-bytestring (package (name "ghc-base16-bytestring") -- cgit v1.2.3 From 6c8a387af2e08c8d3bb7fa558e6c3bbdb28681ac Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 4 Jan 2017 16:21:10 +0100 Subject: gnu: Add ghc-markdown-unlit. * gnu/packages/haskell.scm (ghc-markdown-unlit): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index de061a6300..ac0eac3fe8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8073,4 +8073,31 @@ It features a complete, well-tested parser and pretty printer for all of C99 and a large set of GNU extensions.") (license license:bsd-3))) +(define-public ghc-markdown-unlit + (package + (name "ghc-markdown-unlit") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/markdown-unlit/" + "markdown-unlit-" version ".tar.gz")) + (sha256 + (base32 + "1kj2bffl7ndd8ygwwa3r1mbpwbxbfhyfgnbla8k8g9i6ffp0qrbw")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-silently" ,ghc-silently) + ("ghc-stringbuilder" ,ghc-stringbuilder) + ("ghc-temporary" ,ghc-temporary) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/sol/markdown-unlit#readme") + (synopsis "Literate Haskell support for Markdown") + (description "This package allows you to have a README.md that at the +same time is a literate Haskell program.") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3