pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/idris Update to idris-1.3.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/01a1e7a36b76
branches: trunk
changeset: 373617:01a1e7a36b76
user: pho <pho%pkgsrc.org@localhost>
date: Sat Feb 12 07:13:35 2022 +0000
description:
Update to idris-1.3.4
New in 1.3.4
Renamed 'forall' function for compability with future GHC releases
Updated version bounds
Bugfixes
diffstat:
lang/idris/Makefile | 18 +++------
lang/idris/buildlink3.mk | 6 +-
lang/idris/distinfo | 13 ++----
lang/idris/patches/patch-idris.cabal | 39 +++++++++------------
lang/idris/patches/patch-src_Idris_Output.hs | 31 -----------------
lang/idris/patches/patch-src_Idris_Parser_Stack.hs | 15 --------
lang/idris/patches/patch-src_Idris_REPL.hs | 39 ----------------------
7 files changed, 30 insertions(+), 131 deletions(-)
diffs (240 lines):
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/Makefile
--- a/lang/idris/Makefile Sat Feb 12 07:12:07 2022 +0000
+++ b/lang/idris/Makefile Sat Feb 12 07:13:35 2022 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/01/18 02:48:17 pho Exp $
+# $NetBSD: Makefile,v 1.8 2022/02/12 07:13:35 pho Exp $
-DISTNAME= idris-1.3.3
+DISTNAME= idris-1.3.4
PKGNAME= ${DISTNAME}
-PKGREVISION= 3
CATEGORIES= lang
MAINTAINER= pho%cielonegro.org@localhost
@@ -26,17 +25,12 @@
SUBST_FILES.runtime= src/IRTS/System.hs
SUBST_VARS.runtime= CC PREFIX COMPILER_RPATH_FLAG
-# When -O2 is in effect, GHC 8.8.1 uses whopping 1 TiB of virtual
-# memory (what?) to compile src/Idris/IBC.hs for some unknown reason,
-# possibly related to https://gitlab.haskell.org/ghc/ghc/issues/5642
-# or https://gitlab.haskell.org/ghc/ghc/issues/13535
+# When -O2 is in effect, GHC uses whopping 4 GiB of memory (what?) to
+# compile src/Idris/IBC.hs for some unknown reason, possibly related to
+# https://gitlab.haskell.org/ghc/ghc/issues/5642 or
+# https://gitlab.haskell.org/ghc/ghc/issues/13535
HASKELL_OPTIMIZATION_LEVEL= 1
-# Parallelization is unsafe because of the high memory consumption
-# even with -O1. Setting it to -O0 may seem desirable, but that makes
-# the resulting compiler way too slow.
-MAKE_JOBS_SAFE= NO
-
.include "options.mk"
.include "../../converters/hs-aeson/buildlink3.mk"
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/buildlink3.mk
--- a/lang/idris/buildlink3.mk Sat Feb 12 07:12:07 2022 +0000
+++ b/lang/idris/buildlink3.mk Sat Feb 12 07:13:35 2022 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/01/18 02:48:17 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/02/12 07:13:35 pho Exp $
BUILDLINK_TREE+= idris
.if !defined(IDRIS_BUILDLINK3_MK)
IDRIS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.idris+= idris>=1.3.2
-BUILDLINK_ABI_DEPENDS.idris+= idris>=1.3.3nb3
+BUILDLINK_API_DEPENDS.idris+= idris>=1.3.4
+BUILDLINK_ABI_DEPENDS.idris+= idris>=1.3.4
BUILDLINK_PKGSRCDIR.idris?= ../../lang/idris
.include "../../converters/hs-aeson/buildlink3.mk"
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/distinfo
--- a/lang/idris/distinfo Sat Feb 12 07:12:07 2022 +0000
+++ b/lang/idris/distinfo Sat Feb 12 07:13:35 2022 +0000
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:51:38 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/02/12 07:13:35 pho Exp $
-BLAKE2s (idris-1.3.3.tar.gz) = 73dfec9cd1086c0f1908c70744485028a8aef890798dd42f92a5803363da7d5e
-SHA512 (idris-1.3.3.tar.gz) = 4edcc67b173b5645102520a47b295742b894c2f738f94b8f2183c782aa39c349262a5c62cc01c947bcc366930f9f952632ebc419616cdb06c952ee0134b1ec4b
-Size (idris-1.3.3.tar.gz) = 1720984 bytes
+BLAKE2s (idris-1.3.4.tar.gz) = 5ecd1bf45becb897e273e9890a3aa3293bdf591d85b17d3c67e4a7f5ab98ae95
+SHA512 (idris-1.3.4.tar.gz) = 362c0442e5a38fc67d24e4b33728bc251ee49d14be9faacbbe924da171ce462e613cf975f8c0756fc6c8254807e98adfccfc2a6966dc32813cbadb3f25521f7c
+Size (idris-1.3.4.tar.gz) = 1720240 bytes
SHA1 (patch-Setup.hs) = 26b0fe5486434aa5056703abd8041778ff73f385
-SHA1 (patch-idris.cabal) = 4299b8addf9a41615801e201cb9b13716bbd7b74
+SHA1 (patch-idris.cabal) = ca4ee9a7d02a5bef2ba36c3edf317bb49718ae70
SHA1 (patch-rts_Makefile) = fe88269e184aa0d80e13723c9e4fe47aba68eb3e
SHA1 (patch-rts_idris__net.c) = fcb226e8752c34661fc1a81fff11e41342c3e0f8
SHA1 (patch-src_IRTS_System.hs) = 4451e03f4e9095fcac9e014eb7ad4b997d5e308d
-SHA1 (patch-src_Idris_Output.hs) = 75d0f8c8eb96c6110cf5a825cf402d3403da16a6
SHA1 (patch-src_Idris_Package_Parser.hs) = 3394ec6fbf1323f4331d614426b48377815b7347
SHA1 (patch-src_Idris_Parser_Data.hs) = 5b6d2d3944233fba22e93d631f92de49e64b35a8
SHA1 (patch-src_Idris_Parser_Helpers.hs) = bfd9b16dafa0581147c6b22e5d4e43ae2b701f96
SHA1 (patch-src_Idris_Parser_Ops.hs) = 2ebc3ffc1c909362c4945e556056d5428a8d0a25
-SHA1 (patch-src_Idris_Parser_Stack.hs) = 60f27654bc720df3830a42ec5d4debb7ca4b73cd
-SHA1 (patch-src_Idris_REPL.hs) = b5096550b15c9fbf01d993da24f1c8bf21817b09
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/patches/patch-idris.cabal
--- a/lang/idris/patches/patch-idris.cabal Sat Feb 12 07:12:07 2022 +0000
+++ b/lang/idris/patches/patch-idris.cabal Sat Feb 12 07:13:35 2022 +0000
@@ -1,42 +1,35 @@
-$NetBSD: patch-idris.cabal,v 1.2 2021/04/25 11:39:03 pho Exp $
+$NetBSD: patch-idris.cabal,v 1.3 2022/02/12 07:13:35 pho Exp $
Fix build with recent libraries.
---- idris.cabal.orig 2020-05-23 21:22:15.000000000 +0000
+--- idris.cabal.orig 2001-09-09 01:46:40.000000000 +0000
+++ idris.cabal
-@@ -319,12 +319,12 @@ Library
+@@ -319,7 +319,7 @@ Library
, BuildFlags_idris
Build-depends: base >=4 && <5
-- , aeson >= 0.6 && < 1.5
-+ , aeson >= 0.6 && < 1.6
+- , aeson >= 0.6 && < 1.6
++ , aeson >= 0.6
, annotated-wl-pprint >= 0.7 && < 0.8
-- , ansi-terminal < 0.11
-+ , ansi-terminal < 0.12
+ , ansi-terminal < 0.12
, ansi-wl-pprint < 0.7
- , array >= 0.4.0.1 && < 0.6
-- , base64-bytestring < 1.2
-+ , base64-bytestring < 1.3
+@@ -328,7 +328,7 @@ Library
, binary >= 0.8.4.1 && < 0.9
, blaze-html >= 0.6.1.3 && < 0.10
, blaze-markup >= 0.5.2.1 && < 0.10
-@@ -334,14 +334,15 @@ Library
+- , bytestring < 0.11
++ , bytestring
+ , cheapskate >= 0.1.1.2 && < 0.2
+ , code-page >= 0.1 && < 0.3
, containers >= 0.5 && < 0.7
- , deepseq < 1.5
- , directory >= 1.2.2.0 && < 1.2.3.0 || > 1.2.3.0
-+ , exceptions >= 0.10 && < 0.11
- , filepath < 1.5
- , fingertree >= 0.1.4.1 && < 0.2
-- , haskeline >= 0.7 && < 0.8
-+ , haskeline >= 0.7 && < 0.9
+@@ -340,8 +340,8 @@ Library
, ieee754 >= 0.7 && < 0.9
-- , megaparsec >= 7.0.4 && < 9
-+ , megaparsec >= 7.0.4 && < 9.1
+ , megaparsec >= 7.0.4 && < 10
, mtl >= 2.1 && < 2.3
- , network >= 2.7 && < 3.1.2
-- , optparse-applicative >= 0.13 && < 0.16
-+ , network >= 2.7 && < 3.2
-+ , optparse-applicative >= 0.13 && < 0.17
+- , optparse-applicative >= 0.13 && < 0.17
++ , network >= 2.7
++ , optparse-applicative >= 0.13
, parser-combinators >= 1.0.0
, pretty < 1.2
, process < 1.7
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/patches/patch-src_Idris_Output.hs
--- a/lang/idris/patches/patch-src_Idris_Output.hs Sat Feb 12 07:12:07 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_Idris_Output.hs,v 1.1 2021/04/25 11:39:03 pho Exp $
-
-Fix build with haskeline-0.8.*. Not sure this is the right way to fix
-it though (probably not), and it's not clear if the upstream is going
-to fix this properly given that Idris 2 is going to supersede this
-implementation.
-
---- src/Idris/Output.hs.orig 2021-04-25 10:27:19.932751280 +0000
-+++ src/Idris/Output.hs
-@@ -37,21 +37,13 @@ import Prelude hiding ((<$>))
- #endif
-
- import Control.Arrow (first)
--import Control.Monad.Trans.Except (ExceptT(ExceptT), runExceptT)
- import Data.List (intersperse, nub)
- import Data.Maybe (fromJust, fromMaybe, isJust, listToMaybe)
- import qualified Data.Set as S
--import System.Console.Haskeline.MonadException (MonadException(controlIO),
-- RunIO(RunIO))
- import System.FilePath (replaceExtension)
- import System.IO (Handle, hPutStr, hPutStrLn)
- import System.IO.Error (tryIOError)
-
--instance MonadException m => MonadException (ExceptT Err m) where
-- controlIO f = ExceptT $ controlIO $ \(RunIO run) -> let
-- run' = RunIO (fmap ExceptT . run . runExceptT)
-- in fmap runExceptT $ f run'
--
- pshow :: IState -> Err -> String
- pshow ist err = displayDecorated (consoleDecorate ist) .
- renderPretty 1.0 80 .
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/patches/patch-src_Idris_Parser_Stack.hs
--- a/lang/idris/patches/patch-src_Idris_Parser_Stack.hs Sat Feb 12 07:12:07 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Idris_Parser_Stack.hs,v 1.2 2021/04/25 11:39:03 pho Exp $
-
-Fix build with megaparsec-9.0.*.
-
---- src/Idris/Parser/Stack.hs.orig 2021-04-25 10:29:33.784393017 +0000
-+++ src/Idris/Parser/Stack.hs
-@@ -84,7 +84,7 @@ instance Message ParseError where
- (pos, _) = P.reachOffsetNoLine (parseErrorOffset err) (parseErrorPosState err)
- #endif
- messageText = PP.text . init . P.parseErrorTextPretty . parseError
-- messageSource err = Just sline
-+ messageSource err = sline
- where
- #if MIN_VERSION_megaparsec(8,0,0)
- (sline, _) = P.reachOffset (parseErrorOffset err) (parseErrorPosState err)
diff -r 68c2e01e8f9b -r 01a1e7a36b76 lang/idris/patches/patch-src_Idris_REPL.hs
--- a/lang/idris/patches/patch-src_Idris_REPL.hs Sat Feb 12 07:12:07 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_Idris_REPL.hs,v 1.1 2021/04/25 11:39:03 pho Exp $
-
-Fix build with haskeline-0.8.*.
-
---- src/Idris/REPL.hs.orig 2021-04-25 10:35:54.491750352 +0000
-+++ src/Idris/REPL.hs
-@@ -25,6 +25,7 @@ import Control.Concurrent.Async (race)
- import Control.DeepSeq
- import qualified Control.Exception as X
- import Control.Monad
-+import Control.Monad.Catch (catch)
- import Control.Monad.Trans (lift)
- import Control.Monad.Trans.Except (runExceptT)
- import Control.Monad.Trans.State.Strict (evalStateT, get, put)
-@@ -122,13 +123,13 @@ repl orig mods efile
- (if colour && not isWindows
- then colourisePrompt theme str
- else str) ++ " "
-- x <- H.catch (H.withInterrupt $ getInputLine prompt)
-+ x <- catch (H.withInterrupt $ getInputLine prompt)
- (ctrlC (return $ Just ""))
- case x of
- Nothing -> do lift $ when (not quiet) (iputStrLn "Bye bye")
- return ()
- Just input -> -- H.catch
-- do ms <- H.catch (H.withInterrupt $ lift $ processInput input orig mods efile)
-+ do ms <- catch (H.withInterrupt $ lift $ processInput input orig mods efile)
- (ctrlC (return (Just mods)))
- case ms of
- Just mods -> let efile' = fromMaybe efile (listToMaybe mods)
-@@ -136,7 +137,7 @@ repl orig mods efile
- Nothing -> return ()
- -- ctrlC)
- -- ctrlC
-- where ctrlC :: InputT Idris a -> SomeException -> InputT Idris a
-+ where ctrlC :: InputT Idris a -> X.SomeException -> InputT Idris a
- ctrlC act e = do lift $ iputStrLn (show e)
- act -- repl orig mods
-
Home |
Main Index |
Thread Index |
Old Index