Skip to content

Commit 56185a1

Browse files
committed
Add PolyKinds to as default extension to clash-prelude
`NoPolyKinds` has confused us multiple times because it prevents us from getting typeclass derivations of types that contain a Kind
1 parent 1c193ad commit 56185a1

File tree

14 files changed

+8
-12
lines changed

14 files changed

+8
-12
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CHANGED: `PolyKinds` is now a `default-extension` of `clash-prelude`. `NoPolyKinds` prevented the derivation of
2+
typeclass instances of types that contained a Kind, for example `BitPack (Proxy 52)`.

clash-prelude/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Copyright (c) 2013-2016, University of Twente,
22
2016-2019, Myrtle Software Ltd,
3-
2017-2019, QBayLogic B.V., Google Inc.
3+
2017-2025, QBayLogic B.V., Google Inc.
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

clash-prelude/clash-prelude.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ common common-options
131131
KindSignatures
132132
MagicHash
133133
NoStarIsType
134+
PolyKinds
134135
PostfixOperators
135136
ScopedTypeVariables
136137
StandaloneDeriving

clash-prelude/src/Clash/Annotations/SynthesisAttributes.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-|
22
Copyright : (C) 2018, Google Inc.,
3-
2021-2023, QBayLogic B.V.
3+
2021-2025, QBayLogic B.V.
44
License : BSD2 (see the file LICENSE)
55
Maintainer : QBayLogic B.V. <[email protected]>
66

clash-prelude/src/Clash/Annotations/TH.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ makeTopEntity 'topEntity
5151
{-# LANGUAGE GADTs #-}
5252
{-# LANGUAGE LambdaCase #-}
5353
{-# LANGUAGE PatternSynonyms #-}
54-
{-# LANGUAGE PolyKinds #-}
5554
{-# LANGUAGE StandaloneDeriving #-}
5655
{-# LANGUAGE TemplateHaskell #-}
5756
{-# LANGUAGE TypeFamilies #-}

clash-prelude/src/Clash/Class/BitPack/Internal.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Maintainer : QBayLogic B.V. <[email protected]>
1212
{-# LANGUAGE TemplateHaskell #-}
1313
{-# LANGUAGE TypeFamilies #-}
1414
{-# LANGUAGE UndecidableInstances #-}
15-
{-# LANGUAGE PolyKinds #-} -- Required for BitPack (KnownNat n) => BitPack (Proxy n) instances
1615
{-# LANGUAGE Trustworthy #-}
1716

1817
{-# OPTIONS_GHC -fplugin=GHC.TypeLits.Extra.Solver #-}

clash-prelude/src/Clash/Class/HasDomain/Common.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ License : BSD2 (see the file LICENSE)
44
Maintainer : Christiaan Baaij <[email protected]>
55
-}
66

7-
{-# LANGUAGE PolyKinds #-}
87
{-# LANGUAGE TypeFamilies #-}
98

109
module Clash.Class.HasDomain.Common {-# DEPRECATED "Experimental feature multiple hidden has been removed. This module will therefore be removed in Clash 1.12." #-}

clash-prelude/src/Clash/Class/HasDomain/HasSingleDomain.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-|
22
Copyright : (C) 2019, Myrtle Software Ltd
3-
2022, QBayLogic B.V.
3+
2022-2025, QBayLogic B.V.
44
License : BSD2 (see the file LICENSE)
55
Maintainer : QBayLogic B.V. <[email protected]>
66
@@ -10,7 +10,6 @@ Internals for "Clash.Class.HasDomain"
1010
{-# LANGUAGE ConstraintKinds #-}
1111
{-# LANGUAGE CPP #-}
1212
{-# LANGUAGE FlexibleInstances #-}
13-
{-# LANGUAGE PolyKinds #-}
1413
{-# LANGUAGE TemplateHaskell #-}
1514
{-# LANGUAGE TypeFamilies #-}
1615
{-# LANGUAGE UndecidableInstances #-}

clash-prelude/src/Clash/Class/HasDomain/HasSpecificDomain.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{-|
22
Copyright : (C) 2019, Myrtle Software Ltd
3+
2022-2025, QBayLogic B.V.
34
License : BSD2 (see the file LICENSE)
45
Maintainer : Christiaan Baaij <[email protected]>
56
@@ -10,7 +11,6 @@ Internals for "Clash.Class.HasDomain"
1011
{-# LANGUAGE CPP #-}
1112
{-# LANGUAGE FlexibleInstances #-}
1213
{-# LANGUAGE MultiParamTypeClasses #-}
13-
{-# LANGUAGE PolyKinds #-}
1414
{-# LANGUAGE TemplateHaskell #-}
1515
{-# LANGUAGE TypeFamilies #-}
1616
{-# LANGUAGE UndecidableInstances #-}

clash-prelude/src/Clash/NamedTypes.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ fifo @System
3434
-}
3535

3636
{-# LANGUAGE NoGeneralizedNewtypeDeriving #-}
37-
{-# LANGUAGE PolyKinds #-}
3837

3938
{-# LANGUAGE Safe #-}
4039

0 commit comments

Comments
 (0)