Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,16 @@ pull_request_rules:
- "1.6"
queue:
update_method: rebase

- name: backport patches to 1.8
conditions:
- base=master
- label=backport 1.8
- merged
actions:
copy:
ignore_conflicts: True
branches:
- "1.8"
queue:
update_method: rebase
2 changes: 1 addition & 1 deletion clash-cores/clash-cores.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2

name: clash-cores
version: 1.9.0
version: 1.8.0
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
Expand Down
6 changes: 3 additions & 3 deletions clash-ghc/clash-ghc.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-version: 2.2
Name: clash-ghc
Version: 1.9.0
Version: 1.8.0
Synopsis: Clash: a functional hardware description language - GHC frontend
Description:
Clash is a functional hardware description language that borrows both its
Expand Down Expand Up @@ -168,8 +168,8 @@ library
transformers >= 0.5.2.0 && < 0.7,
unordered-containers >= 0.2.1.0 && < 0.3,

clash-lib == 1.9.0,
clash-prelude == 1.9.0,
clash-lib == 1.8.0,
clash-prelude == 1.8.0,
concurrent-supply >= 0.1.7 && < 0.2,
ghc-typelits-extra >= 0.3.2 && < 0.5,
ghc-typelits-knownnat >= 0.6 && < 0.8,
Expand Down
2 changes: 1 addition & 1 deletion clash-lib-hedgehog/clash-lib-hedgehog.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ library
text >= 1.2.2 && < 2.1,
transformers >= 0.5.2.0 && < 0.7,

clash-lib == 1.9.0,
clash-lib == 1.8.0,
4 changes: 2 additions & 2 deletions clash-lib/clash-lib.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-version: 2.2
Name: clash-lib
Version: 1.9.0
Version: 1.8.0
Synopsis: Clash: a functional hardware description language - As a library
Description:
Clash is a functional hardware description language that borrows both its
Expand Down Expand Up @@ -151,7 +151,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.9.0,
clash-prelude == 1.8.0,
concurrent-supply >= 0.1.7 && < 0.2,
containers >= 0.5.0.0 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
Expand Down
2 changes: 1 addition & 1 deletion clash-prelude-hedgehog/clash-prelude-hedgehog.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ library
ghc-typelits-natnormalise >= 0.7.2 && < 0.8,
text >= 1.2.2 && < 2.1,

clash-prelude == 1.9.0,
clash-prelude == 1.8.0,
4 changes: 2 additions & 2 deletions clash-prelude/clash-prelude.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-version: 2.2
Name: clash-prelude
Version: 1.9.0
Version: 1.8.0
Synopsis: Clash: a functional hardware description language - Prelude library
Description:
Clash is a functional hardware description language that borrows both its
Expand Down Expand Up @@ -96,7 +96,7 @@ flag multiple-hidden
experimental feature, possibly triggering confusing error messages. By
default, it is enabled on development versions of Clash and disabled on
releases.
default: True
default: False
manual: True

flag doctests
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
project = 'Clash'
copyright = '2017-2019, The Clash Developers'
author = 'The Clash Developers'
version = '1.9.0'
version = '1.8.0'
release = version

# Syntax highlighting
Expand Down