From 136c68877431eea15aec45448f031a3303109008 Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Tue, 28 Jul 2020 19:36:59 +0200 Subject: [PATCH 1/3] Update CHANGELOG with 1.2.4 release --- CHANGELOG.md | 5 +++++ .../2020-07-27T19_25_21+02_00_relax_aeson_dlist_versions | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 changelog/2020-07-27T19_25_21+02_00_relax_aeson_dlist_versions diff --git a/CHANGELOG.md b/CHANGELOG.md index 64a91b916e..36dd8388d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for the Clash project +## 1.2.4 *July 28th 2020* +* Changed: + * Relaxed upper bound versions of `aeson` and `dlist`, in preparation for the new Stack LTS. + * Reverted changes to primitive definitions for 'zipWith', 'map', 'foldr', and 'init' introduced in 1.2.2. They have shown to cause problems in very specific circumstances. + ## 1.2.3 *July 11th 2020* * Changed: * Upgrade to nixos 20.03. Nix and snap users will now use packages present in 20.03. diff --git a/changelog/2020-07-27T19_25_21+02_00_relax_aeson_dlist_versions b/changelog/2020-07-27T19_25_21+02_00_relax_aeson_dlist_versions deleted file mode 100644 index 9a1f09779d..0000000000 --- a/changelog/2020-07-27T19_25_21+02_00_relax_aeson_dlist_versions +++ /dev/null @@ -1 +0,0 @@ -CHANGED: Relaxed upper bound versions of `aeson` and `dlist`, in preparation for the new Stack LTS. From cb9e0b43a49f0bcc0513be59decd5c378a1eccaf Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Tue, 28 Jul 2020 19:36:37 +0200 Subject: [PATCH 2/3] Bump to 1.2.4 --- bindist/linux/snap/snap/snapcraft.yaml | 2 +- clash-cores/clash-cores.cabal | 2 +- clash-ghc/clash-ghc.cabal | 6 +++--- clash-lib/clash-lib.cabal | 4 ++-- clash-prelude/clash-prelude.cabal | 2 +- docs/conf.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bindist/linux/snap/snap/snapcraft.yaml b/bindist/linux/snap/snap/snapcraft.yaml index 138f08b209..b9aa15b9c8 100644 --- a/bindist/linux/snap/snap/snapcraft.yaml +++ b/bindist/linux/snap/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: clash -version: '1.2.3' +version: '1.2.4' 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 ceb9ce2d2d..893b6e1a33 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.2.3 +version: 1.2.4 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 3b2521f785..82b5325e98 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.2.3 +Version: 1.2.4 Synopsis: CAES Language for Synchronous Hardware Description: Clash is a functional hardware description language that borrows both its @@ -151,8 +151,8 @@ library transformers >= 0.5.2.0 && < 0.6, unordered-containers >= 0.2.1.0 && < 0.3, - clash-lib == 1.2.3, - clash-prelude == 1.2.3, + clash-lib == 1.2.4, + clash-prelude == 1.2.4, concurrent-supply >= 0.1.7 && < 0.2, ghc-typelits-extra >= 0.3.3 && < 0.5, ghc-typelits-knownnat >= 0.7.2 && < 0.8, diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal index 302f8a4c2c..bc73aca46f 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.2.3 +Version: 1.2.4 Synopsis: CAES Language for Synchronous Hardware - As a Library Description: Clash is a functional hardware description language that borrows both its @@ -141,7 +141,7 @@ Library base >= 4.11 && < 5, binary >= 0.8.5 && < 0.11, bytestring >= 0.10.0.2 && < 0.11, - clash-prelude == 1.2.3, + clash-prelude == 1.2.4, concurrent-supply >= 0.1.7 && < 0.2, containers >= 0.5.0.0 && < 0.7, data-binary-ieee754 >= 0.4.4 && < 0.6, diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal index 464c12aa8d..78de33838b 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.2.3 +Version: 1.2.4 Synopsis: CAES Language for Synchronous Hardware - 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 279e857806..325b3aa699 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.2.3' +version = '1.2.4' release = version # Syntax highlighting From eed49ec12d23dd5023b37a979981a35593c8faac Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Tue, 28 Jul 2020 19:41:55 +0200 Subject: [PATCH 3/3] Bump Win32 and recursion-schemes to newest versions --- cabal.project | 2 +- clash-ghc/clash-ghc.cabal | 2 +- clash-prelude/clash-prelude.cabal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index c8763c1355..a8fdba0c37 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ packages: -- index state, to go along with the cabal.project.freeze file. update the index -- state by running `cabal update` twice and looking at the index state it -- displays to you (as the second update will be a no-op) -index-state: 2020-06-11T14:21:31Z +index-state: 2020-07-28T17:25:20Z -- For some reason the `clash-testsuite` executable fails to run without -- this, as it cannot find the related library... diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal index 82b5325e98..f7e60182fa 100644 --- a/clash-ghc/clash-ghc.cabal +++ b/clash-ghc/clash-ghc.cabal @@ -177,7 +177,7 @@ library CPP-Options: -DUSE_GHC_PATHS=1 if os(windows) - Build-Depends: Win32 >= 2.3.1 && < 2.9 + Build-Depends: Win32 >= 2.3.1 && < 2.10 else Build-Depends: unix >= 2.7.1 && < 2.9 diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal index 78de33838b..74ae0ad9ed 100644 --- a/clash-prelude/clash-prelude.cabal +++ b/clash-prelude/clash-prelude.cabal @@ -324,7 +324,7 @@ Library half >= 0.2.2.3 && < 1.0, interpolate >= 0.2 && < 0.3, lens >= 4.10 && < 4.20, - recursion-schemes >= 5.1 && < 5.2, + recursion-schemes >= 5.1 && < 5.3, QuickCheck >= 2.7 && < 2.15, reflection >= 2 && < 2.2, singletons >= 1.0 && < 3.0,