From 307289f69993d1deeb90edefad0824127af39856 Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Wed, 1 May 2024 09:06:37 -0400 Subject: [PATCH] upgrade to GHC 9.6.4 --- NOTICE | 200 ++++++++++++++++-- src/Convert/AlwaysKW.hs | 2 + src/Convert/Cast.hs | 2 + src/Convert/GenvarName.hs | 1 + src/Convert/Inside.hs | 1 + src/Convert/Interface.hs | 2 + src/Convert/Jump.hs | 1 + src/Convert/Logic.hs | 1 + src/Convert/Package.hs | 1 + src/Convert/ParamNoDefault.hs | 1 + src/Convert/ParamType.hs | 1 + src/Convert/Scoper.hs | 1 + src/Convert/StringParam.hs | 1 + src/Convert/StructConst.hs | 1 + src/Convert/Traverse.hs | 1 + src/Convert/UnbasedUnsized.hs | 1 + src/Convert/UnnamedGenBlock.hs | 1 + src/Convert/UnpackedArray.hs | 1 + src/Language/SystemVerilog/Parser.hs | 2 + src/Language/SystemVerilog/Parser/Parse.y | 1 + .../SystemVerilog/Parser/Preprocess.hs | 1 + stack.yaml | 2 +- stack.yaml.lock | 8 +- 23 files changed, 213 insertions(+), 21 deletions(-) diff --git a/NOTICE b/NOTICE index bb7e070..914cc31 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ ================================================================================ -Dependency: alex-3.3.0.0 +Dependency: alex-3.4.0.1 ================================================================================ Copyright (c) 1995-2011, Chris Dornan and Simon Marlow @@ -34,7 +34,7 @@ Dependency: alex-3.3.0.0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -Dependency: array-0.5.4.0 +Dependency: array-0.5.6.0 ================================================================================ This library (libraries/base) is derived from code from several @@ -123,7 +123,7 @@ Dependency: array-0.5.4.0 ================================================================================ -Dependency: base-4.17.2.1 +Dependency: base-4.18.2.0 ================================================================================ This library (libraries/base) is derived from code from several @@ -353,7 +353,7 @@ Dependency: containers-0.6.7 DAMAGE. ================================================================================ -Dependency: deepseq-1.4.8.0 +Dependency: deepseq-1.4.8.1 ================================================================================ This library (deepseq) is derived from code from the GHC project which @@ -397,7 +397,7 @@ Dependency: deepseq-1.4.8.0 ----------------------------------------------------------------------------- ================================================================================ -Dependency: directory-1.3.7.1 +Dependency: directory-1.3.8.1 ================================================================================ This library (libraries/base) is derived from code from two @@ -465,7 +465,43 @@ Dependency: directory-1.3.7.1 ----------------------------------------------------------------------------- ================================================================================ -Dependency: filepath-1.4.2.2 +Dependency: exceptions-0.10.7 +================================================================================ + + Copyright 2013-2015 Edward Kmett + Copyright 2012 Google Inc. + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. Neither the name of the author nor the names of his contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +================================================================================ +Dependency: filepath-1.4.200.1 ================================================================================ Copyright Neil Mitchell 2005-2020. @@ -536,10 +572,71 @@ Dependency: ghc-bignum-1.3 DAMAGE. ================================================================================ -Dependency: ghc-prim-0.9.1 +Dependency: ghc-prim-0.10.0 ================================================================================ - Package not found: No such package version for ghc-prim + This library (libraries/ghc-prim) is derived from code from several + sources: + + * Code from the GHC project which is largely (c) The University of + Glasgow, and distributable under a BSD-style license (see below), + + * Code from the Haskell 98 Report which is (c) Simon Peyton Jones + and freely redistributable (but see the full license for + restrictions). + + The full text of these licenses is reproduced below. All of the + licenses are BSD-style or compatible. + + ----------------------------------------------------------------------------- + + The Glasgow Haskell Compiler License + + Copyright 2004, The University Court of the University of Glasgow. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + - Neither name of the University nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF + GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + + ----------------------------------------------------------------------------- + + Code derived from the document "Report on the Programming Language + Haskell 98", is distributed under the following license: + + Copyright (c) 2002 Simon Peyton Jones + + The authors intend this Report to belong to the entire Haskell + community, and so we grant permission to copy and distribute it for + any purpose, provided that it is reproduced in its entirety, + including this Notice. Modified versions of this Report may also be + copied and distributed for any purpose, provided that the modified + version is clearly presented as such, and that it does not claim to + be a definition of the Haskell 98 Language. + ================================================================================ Dependency: githash-0.1.7.0 @@ -609,7 +706,7 @@ Dependency: happy-1.20.1.1 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -Dependency: hashable-1.4.3.0 +Dependency: hashable-1.4.4.0 ================================================================================ Copyright Milan Straka 2010 @@ -644,7 +741,7 @@ Dependency: hashable-1.4.3.0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -Dependency: mtl-2.2.2 +Dependency: mtl-2.3.1 ================================================================================ The Glasgow Haskell Compiler License @@ -679,6 +776,41 @@ Dependency: mtl-2.2.2 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +================================================================================ +Dependency: os-string-2.0.2.1 +================================================================================ + + Copyright Neil Mitchell 2005-2020. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Neil Mitchell nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ================================================================================ Dependency: pretty-1.1.3.6 ================================================================================ @@ -759,7 +891,7 @@ Dependency: primitive-0.8.0.0 ================================================================================ -Dependency: process-1.6.18.0 +Dependency: process-1.6.17.0 ================================================================================ This library (libraries/process) is derived from code from two @@ -827,7 +959,43 @@ Dependency: process-1.6.18.0 ----------------------------------------------------------------------------- ================================================================================ -Dependency: template-haskell-2.19.0.0 +Dependency: stm-2.5.1.0 +================================================================================ + + The Glasgow Haskell Compiler License + + Copyright 2004, The University Court of the University of Glasgow. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + - Neither name of the University nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF + GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + +================================================================================ +Dependency: template-haskell-2.20.0.0 ================================================================================ @@ -896,7 +1064,7 @@ Dependency: text-2.0.2 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -Dependency: th-compat-0.1.4 +Dependency: th-compat-0.1.5 ================================================================================ Copyright (c) 2020, Ryan Scott @@ -946,7 +1114,7 @@ Dependency: time-1.12.2 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -Dependency: transformers-0.5.6.2 +Dependency: transformers-0.6.1.0 ================================================================================ The Glasgow Haskell Compiler License @@ -982,7 +1150,7 @@ Dependency: transformers-0.5.6.2 DAMAGE. ================================================================================ -Dependency: unix-2.7.3 +Dependency: unix-2.8.4.0 ================================================================================ The Glasgow Haskell Compiler License @@ -1055,7 +1223,7 @@ Dependency: vector-0.13.1.0 DAMAGE. ================================================================================ -Dependency: vector-stream-0.1.0.0 +Dependency: vector-stream-0.1.0.1 ================================================================================ Copyright (c) 2008-2012, Roman Leshchinskiy diff --git a/src/Convert/AlwaysKW.hs b/src/Convert/AlwaysKW.hs index d70aa9e..a88138e 100644 --- a/src/Convert/AlwaysKW.hs +++ b/src/Convert/AlwaysKW.hs @@ -12,9 +12,11 @@ module Convert.AlwaysKW (convert) where +import Control.Monad (when, zipWithM, (>=>)) import Control.Monad.State.Strict import Control.Monad.Writer.Strict import Data.Maybe (fromMaybe, mapMaybe) +import Data.Monoid (Any(Any), getAny) import Convert.Scoper import Convert.Traverse diff --git a/src/Convert/Cast.hs b/src/Convert/Cast.hs index b51f526..e992140 100644 --- a/src/Convert/Cast.hs +++ b/src/Convert/Cast.hs @@ -27,9 +27,11 @@ module Convert.Cast (convert) where +import Control.Monad (when) import Control.Monad.Writer.Strict import Data.List (isPrefixOf) import Data.Maybe (isJust) +import Data.Monoid (Any(Any), getAny) import Convert.ExprUtils import Convert.Scoper diff --git a/src/Convert/GenvarName.hs b/src/Convert/GenvarName.hs index 52a6a76..e208254 100644 --- a/src/Convert/GenvarName.hs +++ b/src/Convert/GenvarName.hs @@ -7,6 +7,7 @@ module Convert.GenvarName (convert) where +import Control.Monad (when) import Control.Monad.State.Strict import Control.Monad.Writer.Strict import Data.Functor ((<&>)) diff --git a/src/Convert/Inside.hs b/src/Convert/Inside.hs index 223d53b..cd125cb 100644 --- a/src/Convert/Inside.hs +++ b/src/Convert/Inside.hs @@ -21,6 +21,7 @@ import Language.SystemVerilog.AST import Control.Monad.Writer import Data.Maybe (fromMaybe) +import Data.Monoid (Any(Any), getAny) convert :: [AST] -> [AST] convert = map $ traverseDescriptions $ traverseModuleItems convertModuleItem diff --git a/src/Convert/Interface.hs b/src/Convert/Interface.hs index b2be281..337db5e 100644 --- a/src/Convert/Interface.hs +++ b/src/Convert/Interface.hs @@ -8,6 +8,8 @@ module Convert.Interface (convert, disambiguate) where import Data.List (intercalate, (\\)) import Data.Maybe (isJust, isNothing, mapMaybe) +import Data.Monoid (Any(Any), getAny) +import Control.Monad (when, (>=>)) import Control.Monad.Writer.Strict import Text.Read (readMaybe) import qualified Data.Map.Strict as Map diff --git a/src/Convert/Jump.hs b/src/Convert/Jump.hs index 9bc8654..e37c087 100644 --- a/src/Convert/Jump.hs +++ b/src/Convert/Jump.hs @@ -11,6 +11,7 @@ module Convert.Jump (convert) where import Control.Monad.State.Strict import Control.Monad.Writer.Strict +import Data.Monoid (Any(Any), getAny) import Convert.Traverse import Language.SystemVerilog.AST diff --git a/src/Convert/Logic.hs b/src/Convert/Logic.hs index f41c736..caa79d1 100644 --- a/src/Convert/Logic.hs +++ b/src/Convert/Logic.hs @@ -25,6 +25,7 @@ module Convert.Logic (convert) where +import Control.Monad (when) import Control.Monad.Writer.Strict import qualified Data.Map.Strict as Map import qualified Data.Set as Set diff --git a/src/Convert/Package.hs b/src/Convert/Package.hs index 91ee749..495f9cc 100644 --- a/src/Convert/Package.hs +++ b/src/Convert/Package.hs @@ -23,6 +23,7 @@ module Convert.Package , prefixItems ) where +import Control.Monad (when, (>=>)) import Control.Monad.State.Strict import Control.Monad.Writer.Strict import Data.Functor ((<&>)) diff --git a/src/Convert/ParamNoDefault.hs b/src/Convert/ParamNoDefault.hs index 659f4ae..b09f7d2 100644 --- a/src/Convert/ParamNoDefault.hs +++ b/src/Convert/ParamNoDefault.hs @@ -14,6 +14,7 @@ module Convert.ParamNoDefault (convert) where +import Control.Monad (when) import Control.Monad.Writer.Strict import Data.List (intercalate) import qualified Data.Map.Strict as Map diff --git a/src/Convert/ParamType.hs b/src/Convert/ParamType.hs index c074bd3..9b48a5e 100644 --- a/src/Convert/ParamType.hs +++ b/src/Convert/ParamType.hs @@ -10,6 +10,7 @@ import Control.Monad.Writer.Strict import Data.Either (isRight, lefts) import qualified Data.Map.Strict as Map import qualified Data.Set as Set +import Data.Monoid (Any(Any), getAny) import Convert.Traverse import Language.SystemVerilog.AST diff --git a/src/Convert/Scoper.hs b/src/Convert/Scoper.hs index f297311..22279f3 100644 --- a/src/Convert/Scoper.hs +++ b/src/Convert/Scoper.hs @@ -70,6 +70,7 @@ module Convert.Scoper , LookupResult ) where +import Control.Monad (join, when) import Control.Monad.State.Strict import Data.List (findIndices, intercalate, isPrefixOf, partition) import Data.Maybe (isNothing) diff --git a/src/Convert/StringParam.hs b/src/Convert/StringParam.hs index 1ec2afa..46ca885 100644 --- a/src/Convert/StringParam.hs +++ b/src/Convert/StringParam.hs @@ -11,6 +11,7 @@ module Convert.StringParam (convert) where +import Control.Monad (when) import Control.Monad.Writer.Strict import Data.Maybe (mapMaybe) import qualified Data.Set as Set diff --git a/src/Convert/StructConst.hs b/src/Convert/StructConst.hs index 9cfca3d..b531504 100644 --- a/src/Convert/StructConst.hs +++ b/src/Convert/StructConst.hs @@ -9,6 +9,7 @@ module Convert.StructConst (convert) where +import Control.Monad (join, mplus, when) import Control.Monad.State.Strict import Data.Maybe (fromMaybe) import Data.Tuple (swap) diff --git a/src/Convert/Traverse.hs b/src/Convert/Traverse.hs index 3c3dcf4..53ba6a2 100644 --- a/src/Convert/Traverse.hs +++ b/src/Convert/Traverse.hs @@ -112,6 +112,7 @@ module Convert.Traverse import Data.Bitraversable (bimapM) import Data.Functor.Identity (Identity, runIdentity) +import Control.Monad ((>=>)) import Control.Monad.Writer.Strict import Language.SystemVerilog.AST diff --git a/src/Convert/UnbasedUnsized.hs b/src/Convert/UnbasedUnsized.hs index b39ff6d..6ca100d 100644 --- a/src/Convert/UnbasedUnsized.hs +++ b/src/Convert/UnbasedUnsized.hs @@ -20,6 +20,7 @@ import Control.Monad.Writer.Strict import Data.Either (isLeft) import Data.Maybe (isNothing, mapMaybe) import qualified Data.Map.Strict as Map +import Data.Monoid (Any(Any), getAny) import Convert.Package (inject, prefixItems) import Convert.Traverse diff --git a/src/Convert/UnnamedGenBlock.hs b/src/Convert/UnnamedGenBlock.hs index c280224..d6c05ce 100644 --- a/src/Convert/UnnamedGenBlock.hs +++ b/src/Convert/UnnamedGenBlock.hs @@ -10,6 +10,7 @@ module Convert.UnnamedGenBlock (convert) where +import Control.Monad (when) import Control.Monad.State.Strict import Data.List (isPrefixOf) diff --git a/src/Convert/UnpackedArray.hs b/src/Convert/UnpackedArray.hs index 3dd2632..ef7d5b6 100644 --- a/src/Convert/UnpackedArray.hs +++ b/src/Convert/UnpackedArray.hs @@ -11,6 +11,7 @@ module Convert.UnpackedArray (convert) where +import Control.Monad (when, (>=>)) import Control.Monad.State.Strict import qualified Data.Map.Strict as Map diff --git a/src/Language/SystemVerilog/Parser.hs b/src/Language/SystemVerilog/Parser.hs index 46fd608..8ed9f5f 100644 --- a/src/Language/SystemVerilog/Parser.hs +++ b/src/Language/SystemVerilog/Parser.hs @@ -6,6 +6,8 @@ module Language.SystemVerilog.Parser , Config(..) ) where +import Control.Monad (when) +import Control.Monad.IO.Class (liftIO) import Control.Monad.Except import Data.List (elemIndex) import Data.Maybe (catMaybes) diff --git a/src/Language/SystemVerilog/Parser/Parse.y b/src/Language/SystemVerilog/Parser/Parse.y index 64ef225..23092fb 100644 --- a/src/Language/SystemVerilog/Parser/Parse.y +++ b/src/Language/SystemVerilog/Parser/Parse.y @@ -15,6 +15,7 @@ {-# LANGUAGE BlockArguments #-} module Language.SystemVerilog.Parser.Parse (parse) where +import Control.Monad (when) import Control.Monad.Except import Control.Monad.State.Strict import Data.Maybe (catMaybes, fromMaybe) diff --git a/src/Language/SystemVerilog/Parser/Preprocess.hs b/src/Language/SystemVerilog/Parser/Preprocess.hs index 9822f72..6688f22 100644 --- a/src/Language/SystemVerilog/Parser/Preprocess.hs +++ b/src/Language/SystemVerilog/Parser/Preprocess.hs @@ -14,6 +14,7 @@ module Language.SystemVerilog.Parser.Preprocess , Contents ) where +import Control.Monad (when) import Control.Monad.Except import Control.Monad.State.Strict import Data.Char (ord) diff --git a/stack.yaml b/stack.yaml index 7c2ed35..90aab60 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.25 +resolver: lts-22.19 pvp-bounds: both ghc-options: $locals: -j2 diff --git a/stack.yaml.lock b/stack.yaml.lock index f823d29..f8f2098 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd - size: 640086 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml - original: lts-21.25 + sha256: e5cac927cf7ccbd52aa41476baa68b88c564ee6ddc3bc573dbf4210069287fe7 + size: 713340 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/19.yaml + original: lts-22.19