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