From 231031d00c809306208348269c0b954d9bb35d6d Mon Sep 17 00:00:00 2001 From: Peter Lebbing Date: Tue, 27 Jun 2023 13:04:32 +0200 Subject: [PATCH 1/2] Bump to v1.6.5 --- .ci/bindist/linux/snap/snap/snapcraft.yaml | 2 +- clash-cores/clash-cores.cabal | 2 +- clash-ghc/clash-ghc.cabal | 6 +++--- clash-lib-hedgehog/clash-lib-hedgehog.cabal | 4 ++-- clash-lib/clash-lib.cabal | 4 ++-- clash-prelude-hedgehog/clash-prelude-hedgehog.cabal | 4 ++-- clash-prelude/clash-prelude.cabal | 2 +- docs/conf.py | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.ci/bindist/linux/snap/snap/snapcraft.yaml b/.ci/bindist/linux/snap/snap/snapcraft.yaml index 5678fac248..644dba0543 100644 --- a/.ci/bindist/linux/snap/snap/snapcraft.yaml +++ b/.ci/bindist/linux/snap/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: clash -version: '1.6.4' +version: '1.6.5' summary: 'Clash: from Haskell to hardware' description: | Clash is a functional hardware description language that borrows both its diff --git a/clash-cores/clash-cores.cabal b/clash-cores/clash-cores.cabal index b903f2cf52..b9e5a5ecc0 100644 --- a/clash-cores/clash-cores.cabal +++ b/clash-cores/clash-cores.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: clash-cores -version: 1.6.4 +version: 1.6.5 synopsis: A collection of IP cores for Clash description: A collection of IP cores for Clash bug-reports: https://github.com/clash-lang/clash-cores/issues diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal index 710b748914..f3db38fb16 100644 --- a/clash-ghc/clash-ghc.cabal +++ b/clash-ghc/clash-ghc.cabal @@ -1,6 +1,6 @@ Cabal-version: 2.2 Name: clash-ghc -Version: 1.6.4 +Version: 1.6.5 Synopsis: Clash: a functional hardware description language - GHC frontend Description: Clash is a functional hardware description language that borrows both its @@ -148,8 +148,8 @@ library transformers >= 0.5.2.0 && < 0.7, unordered-containers >= 0.2.1.0 && < 0.3, - clash-lib == 1.6.4, - clash-prelude == 1.6.4, + clash-lib == 1.6.5, + clash-prelude == 1.6.5, concurrent-supply >= 0.1.7 && < 0.2, ghc-typelits-extra >= 0.3.2 && < 0.5, ghc-typelits-knownnat >= 0.6 && < 0.8, diff --git a/clash-lib-hedgehog/clash-lib-hedgehog.cabal b/clash-lib-hedgehog/clash-lib-hedgehog.cabal index 95743bcc8f..27107cf5a9 100644 --- a/clash-lib-hedgehog/clash-lib-hedgehog.cabal +++ b/clash-lib-hedgehog/clash-lib-hedgehog.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: clash-lib-hedgehog -version: 1.6.4 +version: 1.6.5 synopsis: Hedgehog Generators for clash-lib description: Hedgehog Generators for clash-lib bug-reports: https://github.com/clash-lang/clash-compiler/issues @@ -62,4 +62,4 @@ library text >= 1.2.2 && < 1.4, transformers >= 0.5.2.0 && < 0.7, - clash-lib == 1.6.4, + clash-lib == 1.6.5, diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal index 2edbd470b0..8bd2e56b02 100644 --- a/clash-lib/clash-lib.cabal +++ b/clash-lib/clash-lib.cabal @@ -1,6 +1,6 @@ Cabal-version: 2.2 Name: clash-lib -Version: 1.6.4 +Version: 1.6.5 Synopsis: Clash: a functional hardware description language - As a library Description: Clash is a functional hardware description language that borrows both its @@ -136,7 +136,7 @@ Library base16-bytestring >= 0.1.1 && < 1.1, binary >= 0.8.5 && < 0.11, bytestring >= 0.10.0.2 && < 0.12, - clash-prelude == 1.6.4, + clash-prelude == 1.6.5, concurrent-supply >= 0.1.7 && < 0.2, containers >= 0.5.0.0 && < 0.7, cryptohash-sha256 >= 0.11 && < 0.12, diff --git a/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal b/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal index 2558250ed5..5b6831e6ea 100644 --- a/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal +++ b/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: clash-prelude-hedgehog -version: 1.6.4 +version: 1.6.5 synopsis: Hedgehog Generators for clash-prelude description: Hedgehog Generators for clash-prelude bug-reports: https://github.com/clash-lang/clash-compiler/issues @@ -50,4 +50,4 @@ library ghc-typelits-natnormalise >= 0.7.2 && < 0.8, text >= 1.2.2 && < 1.4, - clash-prelude == 1.6.4, + clash-prelude == 1.6.5, diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal index 7f09adacd0..b033e40f6d 100644 --- a/clash-prelude/clash-prelude.cabal +++ b/clash-prelude/clash-prelude.cabal @@ -1,6 +1,6 @@ Cabal-version: 2.2 Name: clash-prelude -Version: 1.6.4 +Version: 1.6.5 Synopsis: Clash: a functional hardware description language - Prelude library Description: Clash is a functional hardware description language that borrows both its diff --git a/docs/conf.py b/docs/conf.py index 3d0980fd2a..c12e056e49 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -28,7 +28,7 @@ project = 'Clash' copyright = '2017-2019, The Clash Developers' author = 'The Clash Developers' -version = '1.6.4' +version = '1.6.5' release = version # Syntax highlighting From c90c940d2c2eed9955ce682ae0d818b0649560f8 Mon Sep 17 00:00:00 2001 From: Peter Lebbing Date: Tue, 27 Jun 2023 13:06:26 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md for v1.6.5 --- CHANGELOG.md | 11 +++++++++++ changelog/2023-02-05T12_23_02+01_00_clocks-lock | 5 ----- ...3-02-14T13_04_58+11_00_export_Wrapping_constructor | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 changelog/2023-02-05T12_23_02+01_00_clocks-lock delete mode 100644 changelog/2023-02-14T13_04_58+11_00_export_Wrapping_constructor diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cf5415bbd..0a7b958a87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,15 @@ # Changelog for the Clash project +## 1.6.5 *Jun 27th 2023* + +Fixed: + + * Support building with all combinations of specific versions of our dependencies `hashable` and `primitive`. [#2485](https://github.com/clash-lang/clash-compiler/pull/2485) + * The Haskell simulation of the PLL lock signal in `Clash.Clocks` (used by `Clash.Intel.ClockGen`) is fixed: the signal is now unasserted for the time the reset input is asserted and vice versa, and no longer crashes the simulation. HDL generation is unchanged. The PLL functions now have an additional constraint: `KnownDomain pllLock`. [#2420](https://github.com/clash-lang/clash-compiler/pull/2420) + +Changed: + + * Export the constructor for the `Wrapping` type in the `Clash.Num.Wrapping` module. See [#2292](https://github.com/clash-lang/clash-compiler/issues/2292) + ## 1.6.4 *Aug 30th 2022* Fixed: diff --git a/changelog/2023-02-05T12_23_02+01_00_clocks-lock b/changelog/2023-02-05T12_23_02+01_00_clocks-lock deleted file mode 100644 index 044146307b..0000000000 --- a/changelog/2023-02-05T12_23_02+01_00_clocks-lock +++ /dev/null @@ -1,5 +0,0 @@ -FIXED: The Haskell simulation of the PLL lock signal in `Clash.Clocks` (used by -`Clash.Intel.ClockGen`) is fixed: the signal is now unasserted for the time the -reset input is asserted and vice versa, and no longer crashes the simulation. -HDL generation is unchanged. The PLL functions now have an additional -constraint: `KnownDomain pllLock`. diff --git a/changelog/2023-02-14T13_04_58+11_00_export_Wrapping_constructor b/changelog/2023-02-14T13_04_58+11_00_export_Wrapping_constructor deleted file mode 100644 index e317b0e4fa..0000000000 --- a/changelog/2023-02-14T13_04_58+11_00_export_Wrapping_constructor +++ /dev/null @@ -1 +0,0 @@ -CHANGED: Export the constructor for the `Wrapping` type in the `Clash.Num.Wrapping` module. See [#2292](https://github.com/clash-lang/clash-compiler/issues/2292)