From 5877c2a229eda3b2d41b2b84978964cf26b0b552 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Sun, 4 Mar 2018 19:05:25 -0600 Subject: [PATCH] (WIP) gnu: idris: Upgrade to 1.2.0. * gnu/packages/idris.scm (idris): upgrade to 1.2.0. [inputs] alphebetize ghc-vector-binary-instances and ghc-async. Delete ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun, ghc-trifecta, and ghc-zlib as they are not dependencies of 1.2.0. Add ghc-binary and ghc-megaparsec. --- gnu/packages/haskell.scm | 5 ++++- gnu/packages/idris.scm | 18 +++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e7401e5cf..2560179e6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1955,7 +1955,10 @@ case with other forms of concurrent communication, such as locks or ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text (arguments `(#:tests? #f)) (inputs - `(("ghc-random" ,ghc-random))) + `(("ghc-random" ,ghc-random) + ;; necessary, but seems to cause a circular dependency. + #;("ghc-binary" ,ghc-binary) + )) (home-page "https://github.com/bos/text") (synopsis "Efficient packed Unicode text type library") (description diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 6eb940c9d..784346872 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -33,7 +33,7 @@ (define-public idris (package (name "idris") - (version "1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append @@ -41,17 +41,18 @@ "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h")))) + "0bim5lmr1wh3sc5nj5axy8xa2qq8rajp13x363mb9kkrnfy5wbxk")))) (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-async" ,ghc-async) ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-binary" ,ghc-binary) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-cheapskate" ,ghc-cheapskate) @@ -59,26 +60,21 @@ ("ghc-fingertree" ,ghc-fingertree) ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) + ("ghc-megaparsec" ,ghc-megaparsec) ("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))) + ("ghc-vector-binary-instances" ,ghc-vector-binary-instances) + ("ghc-zip-archive" ,ghc-zip-archive))) (arguments `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox. #:configure-flags -- 2.16.2