From f54f04756f6d90c9fb3b5e45f3947329287f9b05 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 17:08:08 -0400 Subject: gnu: ghc-mtl: Remove built-in Haskell package. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-mtl. * gnu/packages/games.scm (raincat)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml, ghc-tasty-golden, ghc-tasty, ghc-tasty-kat, ghc-tasty-rerun, ghc-crypto-cipher-tests)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding, ghc-pem, ghc-x509, ghc-x509-store, ghc-x509-validation, ghc-x509-system)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-web.scm (ghc-http, ghc-http-conduit, ghc-yesod-core)[inputs]: Remove ghc-mtl. * gnu/packages/haskell.scm (ghc-convertible, ghc-libxml, ghc-cgi, ghc-happy, ghc-haskell-src-exts, ghc-resourcet, cabal-install, ghc-indents, ghc-regex-base, ghc-regex-tdfa-rc, ghc-trifecta, ghc-zip-archive, ghc-logict, ghc-exceptions, ghc-smallcheck, ghc-syb, ghc-fgl, ghc-chasingbottoms, ghc-parsec, ghc-megaparsec, ghc-edisonapi, ghc-edisoncore, ghc-mmorph, ghc-ifelse, ghc-kan-extensions, ghc-lens, ghc-cheapskate, ghc-free, ghc-adjunctions, ghc-equivalence, ghc-texmath, ghc-texmath-for-pandoc-1, ghc-highlighting-kate, ghc-th-reify-many, ghc-th-orphans, ghc-geniplate-mirror, ghc-conduit, ghc-filemanip, ghc-juicypixels, ghc-hslua, ghc-hourglass, ghc-skylighting, ghc-skylighting-for-pandoc-1, ghc-pandoc, ghc-pandoc-1, ghc-pandoc-citeproc, ghc-regex-tdfa, ghc-stmonadtrans, ghc-constraints, ghc-lifted-async, ghc-shelly, ghc-hslogger, ghc-json, shellcheck, ghc-vector-algorithms, ghc-monad-par-extras, ghc-monad-par, ghc-monadrandom, ghc-either, ghc-rebase, ghc-aws, ghc-monad-logger, ghc-persistent, ghc-bytes, ghc-missingh, ghc-operational, ghc-chart)[inputs]: Remove ghc-mtl. (ghc-conduit-combinators)[native-inputs]: Remove ghc-mtl. (ghc-mtl): Remove variable. * gnu/packages/idris.scm (idris)[inputs]: Remove ghc-mtl. * gnu/packages/tls.scm (ghc-tls)[inputs]: Remove ghc-mtl. * gnu/packages/version-control.scm (darcs, git-annex)[inputs]: Remove ghc-mtl. * gnu/packages/wm.scm (xmonad, ghc-xmonad-contrib)[inputs]: Remove ghc-mtl. * gnu/packages/xml.scm (ghc-hxt)[inputs]: Remove ghc-mtl. --- gnu/packages/agda.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/agda.scm') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index df4968c445..572de5bbeb 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -58,7 +58,6 @@ ("ghc-hashtables" ,ghc-hashtables) ("ghc-ieee754" ,ghc-ieee754) ("ghc-monadplus" ,ghc-monadplus) - ("ghc-mtl" ,ghc-mtl) ("ghc-murmur-hash" ,ghc-murmur-hash) ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) -- cgit v1.2.3 From 5ebadb584bc642d58bf6c8dbb54468e4b7f266bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:44:15 -0400 Subject: gnu: agda: Update to 2.5.4.1. * gnu/packages/agda.scm (agda): Update to 2.5.4.1. --- gnu/packages/agda.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/agda.scm') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 572de5bbeb..418025bc37 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -30,7 +30,7 @@ (define-public agda (package (name "agda") - (version "2.5.3") + (version "2.5.4.1") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.gz")) (sha256 (base32 - "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a")))) + "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) -- cgit v1.2.3 From 787231e9570779892b2eb2e79563be4cfacc9b9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 12:23:59 +0200 Subject: gnu: agda: Fix build. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-monadplus; add ghc-filemanip. [arguments]: Replace configure phase. --- gnu/packages/agda.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) (limited to 'gnu/packages/agda.scm') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 418025bc37..6bb38aac4d 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex ter Weele +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,13 +52,13 @@ ("ghc-edisoncore" ,ghc-edisoncore) ("ghc-edit-distance" ,ghc-edit-distance) ("ghc-equivalence" ,ghc-equivalence) + ("ghc-filemanip" ,ghc-filemanip) ("ghc-geniplate-mirror" ,ghc-geniplate-mirror) ("ghc-gitrev" ,ghc-gitrev) ("ghc-happy" ,ghc-happy) ("ghc-hashable" ,ghc-hashable) ("ghc-hashtables" ,ghc-hashtables) ("ghc-ieee754" ,ghc-ieee754) - ("ghc-monadplus" ,ghc-monadplus) ("ghc-murmur-hash" ,ghc-murmur-hash) ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) @@ -70,9 +71,50 @@ (arguments `(#:modules ((guix build haskell-build-system) (guix build utils) - (srfi srfi-26)) + (srfi srfi-26) + (ice-9 match)) #:phases (modify-phases %standard-phases + ;; FIXME: This is a copy of the standard configure phase with a tiny + ;; difference: this package needs the -package-db flag to be passed + ;; to "runhaskell" in addition to the "configure" action, because + ;; Setup.hs depends on filemanip. Without this option the Setup.hs + ;; file cannot be evaluated. The haskell-build-system should be + ;; changed to pass "-package-db" to "runhaskell" in any case. + (replace 'configure + (lambda* (#:key outputs inputs tests? (configure-flags '()) + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (input-dirs (match inputs + (((_ . dir) ...) + dir) + (_ '()))) + (ghc-path (getenv "GHC_PACKAGE_PATH")) + (params (append `(,(string-append "--prefix=" out)) + `(,(string-append "--libdir=" out "/lib")) + `(,(string-append "--bindir=" out "/bin")) + `(,(string-append + "--docdir=" out + "/share/doc/" ((@@ (guix build haskell-build-system) + package-name-version) out))) + '("--libsubdir=$compiler/$pkg-$version") + '("--package-db=../package.conf.d") + '("--global") + `(,@(map + (cut string-append "--extra-include-dirs=" <>) + (search-path-as-list '("include") input-dirs))) + `(,@(map + (cut string-append "--extra-lib-dirs=" <>) + (search-path-as-list '("lib") input-dirs))) + (if tests? + '("--enable-tests") + '()) + configure-flags))) + (unsetenv "GHC_PACKAGE_PATH") + (apply invoke "runhaskell" "-package-db=../package.conf.d" + "Setup.hs" "configure" params) + (setenv "GHC_PACKAGE_PATH" ghc-path) + #t))) (add-after 'compile 'agda-compile (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3