Merge pull request #1465 from clash-lang/release-1.2.4

Release 1.2.4
clash-lang · Jul 28, 2020 · 4f58720 · 4f58720
2 parents 7d2bb1f + eed49ec
commit 4f58720
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 13 deletions.
diff --git 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/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/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/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
diff --git 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
@@ -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,
@@ -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-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
@@ -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
@@ -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,

diff --git 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