Skip to content

Commit 307289f

Browse files
committed
upgrade to GHC 9.6.4
1 parent 05cafc3 commit 307289f

23 files changed

+213
-21
lines changed

NOTICE

Lines changed: 184 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
================================================================================
2-
Dependency: alex-3.3.0.0
2+
Dependency: alex-3.4.0.1
33
================================================================================
44

55
Copyright (c) 1995-2011, Chris Dornan and Simon Marlow
@@ -34,7 +34,7 @@ Dependency: alex-3.3.0.0
3434
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3535

3636
================================================================================
37-
Dependency: array-0.5.4.0
37+
Dependency: array-0.5.6.0
3838
================================================================================
3939

4040
This library (libraries/base) is derived from code from several
@@ -123,7 +123,7 @@ Dependency: array-0.5.4.0
123123

124124

125125
================================================================================
126-
Dependency: base-4.17.2.1
126+
Dependency: base-4.18.2.0
127127
================================================================================
128128

129129
This library (libraries/base) is derived from code from several
@@ -353,7 +353,7 @@ Dependency: containers-0.6.7
353353
DAMAGE.
354354

355355
================================================================================
356-
Dependency: deepseq-1.4.8.0
356+
Dependency: deepseq-1.4.8.1
357357
================================================================================
358358

359359
This library (deepseq) is derived from code from the GHC project which
@@ -397,7 +397,7 @@ Dependency: deepseq-1.4.8.0
397397
-----------------------------------------------------------------------------
398398

399399
================================================================================
400-
Dependency: directory-1.3.7.1
400+
Dependency: directory-1.3.8.1
401401
================================================================================
402402

403403
This library (libraries/base) is derived from code from two
@@ -465,7 +465,43 @@ Dependency: directory-1.3.7.1
465465
-----------------------------------------------------------------------------
466466

467467
================================================================================
468-
Dependency: filepath-1.4.2.2
468+
Dependency: exceptions-0.10.7
469+
================================================================================
470+
471+
Copyright 2013-2015 Edward Kmett
472+
Copyright 2012 Google Inc.
473+
474+
All rights reserved.
475+
476+
Redistribution and use in source and binary forms, with or without
477+
modification, are permitted provided that the following conditions
478+
are met:
479+
480+
1. Redistributions of source code must retain the above copyright
481+
notice, this list of conditions and the following disclaimer.
482+
483+
2. Redistributions in binary form must reproduce the above copyright
484+
notice, this list of conditions and the following disclaimer in the
485+
documentation and/or other materials provided with the distribution.
486+
487+
3. Neither the name of the author nor the names of his contributors
488+
may be used to endorse or promote products derived from this software
489+
without specific prior written permission.
490+
491+
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
492+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
493+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
494+
DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
495+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
496+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
497+
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
498+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
499+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
500+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
501+
POSSIBILITY OF SUCH DAMAGE.
502+
503+
================================================================================
504+
Dependency: filepath-1.4.200.1
469505
================================================================================
470506

471507
Copyright Neil Mitchell 2005-2020.
@@ -536,10 +572,71 @@ Dependency: ghc-bignum-1.3
536572
DAMAGE.
537573

538574
================================================================================
539-
Dependency: ghc-prim-0.9.1
575+
Dependency: ghc-prim-0.10.0
540576
================================================================================
541577

542-
Package not found: No such package version for ghc-prim
578+
This library (libraries/ghc-prim) is derived from code from several
579+
sources:
580+
581+
* Code from the GHC project which is largely (c) The University of
582+
Glasgow, and distributable under a BSD-style license (see below),
583+
584+
* Code from the Haskell 98 Report which is (c) Simon Peyton Jones
585+
and freely redistributable (but see the full license for
586+
restrictions).
587+
588+
The full text of these licenses is reproduced below. All of the
589+
licenses are BSD-style or compatible.
590+
591+
-----------------------------------------------------------------------------
592+
593+
The Glasgow Haskell Compiler License
594+
595+
Copyright 2004, The University Court of the University of Glasgow.
596+
All rights reserved.
597+
598+
Redistribution and use in source and binary forms, with or without
599+
modification, are permitted provided that the following conditions are met:
600+
601+
- Redistributions of source code must retain the above copyright notice,
602+
this list of conditions and the following disclaimer.
603+
604+
- Redistributions in binary form must reproduce the above copyright notice,
605+
this list of conditions and the following disclaimer in the documentation
606+
and/or other materials provided with the distribution.
607+
608+
- Neither name of the University nor the names of its contributors may be
609+
used to endorse or promote products derived from this software without
610+
specific prior written permission.
611+
612+
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
613+
GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
614+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
615+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
616+
UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
617+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
618+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
619+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
620+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
621+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
622+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
623+
DAMAGE.
624+
625+
-----------------------------------------------------------------------------
626+
627+
Code derived from the document "Report on the Programming Language
628+
Haskell 98", is distributed under the following license:
629+
630+
Copyright (c) 2002 Simon Peyton Jones
631+
632+
The authors intend this Report to belong to the entire Haskell
633+
community, and so we grant permission to copy and distribute it for
634+
any purpose, provided that it is reproduced in its entirety,
635+
including this Notice. Modified versions of this Report may also be
636+
copied and distributed for any purpose, provided that the modified
637+
version is clearly presented as such, and that it does not claim to
638+
be a definition of the Haskell 98 Language.
639+
543640

544641
================================================================================
545642
Dependency: githash-0.1.7.0
@@ -609,7 +706,7 @@ Dependency: happy-1.20.1.1
609706
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
610707

611708
================================================================================
612-
Dependency: hashable-1.4.3.0
709+
Dependency: hashable-1.4.4.0
613710
================================================================================
614711

615712
Copyright Milan Straka 2010
@@ -644,7 +741,7 @@ Dependency: hashable-1.4.3.0
644741
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
645742

646743
================================================================================
647-
Dependency: mtl-2.2.2
744+
Dependency: mtl-2.3.1
648745
================================================================================
649746

650747
The Glasgow Haskell Compiler License
@@ -679,6 +776,41 @@ Dependency: mtl-2.2.2
679776
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
680777
DAMAGE.
681778

779+
================================================================================
780+
Dependency: os-string-2.0.2.1
781+
================================================================================
782+
783+
Copyright Neil Mitchell 2005-2020.
784+
All rights reserved.
785+
786+
Redistribution and use in source and binary forms, with or without
787+
modification, are permitted provided that the following conditions are
788+
met:
789+
790+
* Redistributions of source code must retain the above copyright
791+
notice, this list of conditions and the following disclaimer.
792+
793+
* Redistributions in binary form must reproduce the above
794+
copyright notice, this list of conditions and the following
795+
disclaimer in the documentation and/or other materials provided
796+
with the distribution.
797+
798+
* Neither the name of Neil Mitchell nor the names of other
799+
contributors may be used to endorse or promote products derived
800+
from this software without specific prior written permission.
801+
802+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
803+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
804+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
805+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
806+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
807+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
808+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
809+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
810+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
811+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
812+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
813+
682814
================================================================================
683815
Dependency: pretty-1.1.3.6
684816
================================================================================
@@ -759,7 +891,7 @@ Dependency: primitive-0.8.0.0
759891

760892

761893
================================================================================
762-
Dependency: process-1.6.18.0
894+
Dependency: process-1.6.17.0
763895
================================================================================
764896

765897
This library (libraries/process) is derived from code from two
@@ -827,7 +959,43 @@ Dependency: process-1.6.18.0
827959
-----------------------------------------------------------------------------
828960

829961
================================================================================
830-
Dependency: template-haskell-2.19.0.0
962+
Dependency: stm-2.5.1.0
963+
================================================================================
964+
965+
The Glasgow Haskell Compiler License
966+
967+
Copyright 2004, The University Court of the University of Glasgow.
968+
All rights reserved.
969+
970+
Redistribution and use in source and binary forms, with or without
971+
modification, are permitted provided that the following conditions are met:
972+
973+
- Redistributions of source code must retain the above copyright notice,
974+
this list of conditions and the following disclaimer.
975+
976+
- Redistributions in binary form must reproduce the above copyright notice,
977+
this list of conditions and the following disclaimer in the documentation
978+
and/or other materials provided with the distribution.
979+
980+
- Neither name of the University nor the names of its contributors may be
981+
used to endorse or promote products derived from this software without
982+
specific prior written permission.
983+
984+
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
985+
GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
986+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
987+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
988+
UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
989+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
990+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
991+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
992+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
993+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
994+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
995+
DAMAGE.
996+
997+
================================================================================
998+
Dependency: template-haskell-2.20.0.0
831999
================================================================================
8321000

8331001

@@ -896,7 +1064,7 @@ Dependency: text-2.0.2
8961064
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8971065

8981066
================================================================================
899-
Dependency: th-compat-0.1.4
1067+
Dependency: th-compat-0.1.5
9001068
================================================================================
9011069

9021070
Copyright (c) 2020, Ryan Scott
@@ -946,7 +1114,7 @@ Dependency: time-1.12.2
9461114
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.
9471115

9481116
================================================================================
949-
Dependency: transformers-0.5.6.2
1117+
Dependency: transformers-0.6.1.0
9501118
================================================================================
9511119

9521120
The Glasgow Haskell Compiler License
@@ -982,7 +1150,7 @@ Dependency: transformers-0.5.6.2
9821150
DAMAGE.
9831151

9841152
================================================================================
985-
Dependency: unix-2.7.3
1153+
Dependency: unix-2.8.4.0
9861154
================================================================================
9871155

9881156
The Glasgow Haskell Compiler License
@@ -1055,7 +1223,7 @@ Dependency: vector-0.13.1.0
10551223
DAMAGE.
10561224

10571225
================================================================================
1058-
Dependency: vector-stream-0.1.0.0
1226+
Dependency: vector-stream-0.1.0.1
10591227
================================================================================
10601228

10611229
Copyright (c) 2008-2012, Roman Leshchinskiy

src/Convert/AlwaysKW.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212

1313
module Convert.AlwaysKW (convert) where
1414

15+
import Control.Monad (when, zipWithM, (>=>))
1516
import Control.Monad.State.Strict
1617
import Control.Monad.Writer.Strict
1718
import Data.Maybe (fromMaybe, mapMaybe)
19+
import Data.Monoid (Any(Any), getAny)
1820

1921
import Convert.Scoper
2022
import Convert.Traverse

src/Convert/Cast.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727

2828
module Convert.Cast (convert) where
2929

30+
import Control.Monad (when)
3031
import Control.Monad.Writer.Strict
3132
import Data.List (isPrefixOf)
3233
import Data.Maybe (isJust)
34+
import Data.Monoid (Any(Any), getAny)
3335

3436
import Convert.ExprUtils
3537
import Convert.Scoper

src/Convert/GenvarName.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
module Convert.GenvarName (convert) where
99

10+
import Control.Monad (when)
1011
import Control.Monad.State.Strict
1112
import Control.Monad.Writer.Strict
1213
import Data.Functor ((<&>))

src/Convert/Inside.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import Language.SystemVerilog.AST
2121

2222
import Control.Monad.Writer
2323
import Data.Maybe (fromMaybe)
24+
import Data.Monoid (Any(Any), getAny)
2425

2526
convert :: [AST] -> [AST]
2627
convert = map $ traverseDescriptions $ traverseModuleItems convertModuleItem

src/Convert/Interface.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ module Convert.Interface (convert, disambiguate) where
88

99
import Data.List (intercalate, (\\))
1010
import Data.Maybe (isJust, isNothing, mapMaybe)
11+
import Data.Monoid (Any(Any), getAny)
12+
import Control.Monad (when, (>=>))
1113
import Control.Monad.Writer.Strict
1214
import Text.Read (readMaybe)
1315
import qualified Data.Map.Strict as Map

src/Convert/Jump.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module Convert.Jump (convert) where
1111

1212
import Control.Monad.State.Strict
1313
import Control.Monad.Writer.Strict
14+
import Data.Monoid (Any(Any), getAny)
1415

1516
import Convert.Traverse
1617
import Language.SystemVerilog.AST

src/Convert/Logic.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
module Convert.Logic (convert) where
2727

28+
import Control.Monad (when)
2829
import Control.Monad.Writer.Strict
2930
import qualified Data.Map.Strict as Map
3031
import qualified Data.Set as Set

src/Convert/Package.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module Convert.Package
2323
, prefixItems
2424
) where
2525

26+
import Control.Monad (when, (>=>))
2627
import Control.Monad.State.Strict
2728
import Control.Monad.Writer.Strict
2829
import Data.Functor ((<&>))

src/Convert/ParamNoDefault.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
module Convert.ParamNoDefault (convert) where
1616

17+
import Control.Monad (when)
1718
import Control.Monad.Writer.Strict
1819
import Data.List (intercalate)
1920
import qualified Data.Map.Strict as Map

0 commit comments

Comments
 (0)