From 57cd7d92d8a0206609a1ffa6609947db82b0efc6 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Tue, 15 Jan 2019 16:16:23 +0100 Subject: gnu: Add ghc-tldr. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-tldr): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8d0e2aef69..b40a5d05da 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Timothy Sample ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2019 Gabriel Hondet ;;; ;;; This file is part of GNU Guix. ;;; @@ -11365,4 +11366,35 @@ (define-public ghc-safeio avoid the problem of partial intermediate files.") (license license:expat))) +(define-public ghc-tldr + (package + (name "ghc-tldr") + (version "0.4.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/tldr/tldr-" + version + ".tar.gz")) + (sha256 + (base32 + "0nc581y9jjzwd8l88g48c72mla7k6q1w102akl7gl5jsk9ljamd3")))) + (build-system haskell-build-system) + (inputs + `(("ghc-cmark" ,ghc-cmark) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-typed-process" ,ghc-typed-process) + ("ghc-semigroups" ,ghc-semigroups))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden))) + (home-page "https://github.com/psibi/tldr-hs#readme") + (synopsis "Haskell tldr client") + (description "This package provides the @command{tldr} command and a +Haskell client library allowing users to update and view @code{tldr} pages +from a shell. The @code{tldr} pages are a community effort to simplify the +man pages with practical examples.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 5de93cdba77db3777f8f026c029acadd7b8bdde3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 17 Jan 2019 09:17:41 +0100 Subject: gnu: ghc-8: Patch ghc-pkg for reproducibility. Fixes . Co-authored-by: Timothy Sample . * gnu/packages/haskell.scm (ghc-8)[arguments]: Add build phase "fix-ghc-pkg-nondeterminism". --- gnu/packages/haskell.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b40a5d05da..a3ce2a3e4c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017 Danny Milosavljevic ;;; Copyright © 2017 Peter Mikkelsen @@ -14,7 +14,7 @@ ;;; Copyright © 2017 rsiddharth ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Tonton -;;; Copyright © 2018 Timothy Sample +;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; @@ -509,6 +509,14 @@ (define-public ghc-8 (assoc-ref inputs "ghc-testsuite") "--strip-components=1") #t)) + ;; This phase patches the 'ghc-pkg' command so that it sorts the list + ;; of packages in the binary cache it generates. + (add-before 'build 'fix-ghc-pkg-nondeterminism + (lambda _ + (substitute* "utils/ghc-pkg/Main.hs" + (("confs = map \\(path \\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs") + "confs = map (path ) $ filter (\".conf\" `isSuffixOf`) (sort fs)")) + #t)) (add-after 'unpack-testsuite 'fix-shell-wrappers (lambda _ (substitute* '("driver/ghci/ghc.mk" -- cgit v1.2.3 From 2d04076332eedb7fcb292aa64b0dc18a53f58751 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 22 Jan 2019 11:08:43 +0100 Subject: gnu: Remove duplicate record fields. * gnu/packages/haskell.scm (ghc-case-insensitive): Remove duplicate 'inputs' field. * gnu/packages/python-xyz.scm (python2-pysnptools): Remove duplicate 'native-inputs' field. * gnu/tests/install.scm (%separate-home-os): Remove duplicate 'type' field. --- gnu/packages/haskell.scm | 4 +--- gnu/packages/python-xyz.scm | 4 +--- gnu/tests/install.scm | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a3ce2a3e4c..9433ae0570 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Siniša Biđin ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2018 Ludovic Courtès +;;; Copyright © 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus @@ -3790,8 +3790,6 @@ (define-public ghc-case-insensitive (base32 "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7")))) (build-system haskell-build-system) - (inputs - `(("ghc-hunit" ,ghc-hunit))) ;; these inputs are necessary to use this library (inputs `(("ghc-text" ,ghc-text) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 83753c55f0..35ac4e69f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2017 Eric Bavier @@ -3391,8 +3391,6 @@ (define-public python2-pysnptools `(("python2-numpy" ,python2-numpy) ("python2-scipy" ,python2-scipy) ("python2-pandas" ,python2-pandas))) - (native-inputs - `(("python2-cython" ,python2-cython))) (native-inputs `(("unzip" ,unzip))) (home-page "http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/") diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 7114e5cc79..ec29064118 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -430,7 +430,6 @@ (define-os-with-source (%separate-home-os %separate-home-os-source) (type "ext4")) (file-system (device "none") - (type "tmpfs") (mount-point "/home") (type "tmpfs")) %base-file-systems)) -- cgit v1.2.3 From ea7fa78a74909feb34e460d2530772b6dd1b44cf Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Sun, 20 Jan 2019 16:03:03 +0100 Subject: gnu: Add ghc-c2hs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-c2hs): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9433ae0570..b8ea36852b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11403,4 +11403,62 @@ (define-public ghc-tldr man pages with practical examples.") (license license:bsd-3))) +(define-public ghc-c2hs + (package + (name "ghc-c2hs") + (version "0.28.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/c2hs/c2hs-" + version + ".tar.gz")) + (sha256 + (base32 + "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci")))) + (build-system haskell-build-system) + (inputs + `(("ghc-language-c" ,ghc-language-c) + ("ghc-dlist" ,ghc-dlist))) + (native-inputs + `(("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-hunit" ,ghc-hunit) + ("ghc-shelly" ,ghc-shelly) + ("ghc-text" ,ghc-text) + ("gcc" ,gcc))) + (arguments + `(;; XXX: Test failures are induced by a parse error in + ;; of glibc 2.28. + #:tests? #f + + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-cc + ;; add a cc executable in the path, needed for some tests to pass + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc")) + (tmpbin (tmpnam)) + (curpath (getenv "PATH"))) + (mkdir-p tmpbin) + (symlink (which "gcc") (string-append tmpbin "/cc")) + (setenv "PATH" (string-append tmpbin ":" curpath))) + #t)) + (add-after 'check 'remove-cc + ;; clean the tmp dir made in 'set-cc + (lambda _ + (let* ((cc-path (which "cc")) + (cc-dir (dirname cc-path))) + (delete-file-recursively cc-dir) + #t)))))) + (home-page "https://github.com/haskell/c2hs") + (synopsis "Create Haskell bindings to C libraries") + (description "C->Haskell assists in the development of Haskell bindings to +C libraries. It extracts interface information from C header files and +generates Haskell code with foreign imports and marshaling. Unlike writing +foreign imports by hand (or using hsc2hs), this ensures that C functions are +imported with the correct Haskell types.") + (license license:gpl2))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 4ad7d037ad373a46e341354b19f0b17c737beebb Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Thu, 24 Jan 2019 20:16:11 +0100 Subject: gnu: Add ghc-libmpd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-libmpd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b8ea36852b..255e902e66 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11461,4 +11461,36 @@ (define-public ghc-c2hs imported with the correct Haskell types.") (license license:gpl2))) +(define-public ghc-libmpd + (package + (name "ghc-libmpd") + (version "0.9.0.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/libmpd/libmpd-" + version + ".tar.gz")) + (sha256 + (base32 + "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-text" ,ghc-text) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-network" ,ghc-network) + ("ghc-utf8-string" ,ghc-utf8-string))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/vimus/libmpd-haskell") + (synopsis "Haskell client library for the Music Player Daemon") + (description "This package provides a pure Haskell client library for the +Music Player Daemon.") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3