From 887158b605e92ec69e573017cce985794dacfd0c Mon Sep 17 00:00:00 2001 From: Peter Lebbing Date: Tue, 28 Apr 2026 17:04:42 +0200 Subject: [PATCH 1/3] DECA starter: use altpllSync `altpll` was removed from Clash 1.10. Using `altpllSync` is the proper thing to teach our users anyway; with it, you no longer need `unsafe...` calls and the user doesn't need to get them right. --- projects/deca/src/DECA.hs | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/projects/deca/src/DECA.hs b/projects/deca/src/DECA.hs index 7704cb6..67561ec 100644 --- a/projects/deca/src/DECA.hs +++ b/projects/deca/src/DECA.hs @@ -13,7 +13,9 @@ data LedMode deriving (Show, Eq, Enum, Generic, NFDataX) -- Define a synthesis domain with a clock with a period of 20000 /ps/. -createDomain vSystem{vName="Input", vPeriod=20000} +-- The signal coming from the reset button is low when pressed, and high when +-- not pressed, which means we set the reset polarity to active-low. +createDomain vSystem{vName="Input", vPeriod=20000, vResetPolarity=ActiveLow} -- Define a synthesis domain with a clock with a period of 50000 /ps/. createDomain vSystem{vName="Dom50", vPeriod=50000} @@ -35,7 +37,7 @@ deca -- -- Annotate with attributes to map the argument to the correct pin, with the -- correct voltage settings, on the DECA development kit. - -> Signal Input Bool + -> Reset Input `Annotate` 'StringAttr "chip_pin" "H21" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.5 V Schmitt Trigger\"" -- ^ Reset signal, straight from KEY0 @@ -64,28 +66,12 @@ deca clk20 rstBtn modeBtn = -- Start with the first LED turned on, in rotate mode, with the counter on zero initialStateBlinkerT = (1, Rotate, 0) - -- Signal coming from the reset button is low when pressed, and high when - -- not pressed. We convert this signal to the polarity of our domain with - -- 'unsafeFromLowPolarity'. - rst = unsafeFromLowPolarity rstBtn - -- Instantiate a PLL: this stabilizes the incoming clock signal and indicates -- when the signal is stable. We're also using it to transform an incoming -- clock signal running at 20 MHz to a clock signal running at 50 MHz. - (clk50, pllStable) = - altpll - @Dom50 - (SSymbol @"altpll50") - clk20 - rst - - -- Synchronize reset to clock signal coming from PLL. We want the reset to - -- remain active while the PLL is NOT stable, hence the conversion with - -- 'unsafeFromLowPolarity' - rstSync = - resetSynchronizer - clk50 - (unsafeFromLowPolarity pllStable) + ( clk50 :: Clock Dom50 + , rstSync :: Reset Dom50 + ) = altpllSync clk20 rstBtn -- | Changes the LED mode -- From 8130e3a62cf6d944afed303270135a69fa807eed Mon Sep 17 00:00:00 2001 From: Peter Lebbing Date: Wed, 29 Apr 2026 17:24:39 +0200 Subject: [PATCH 2/3] DECA starter: Change design clock to 40 MHz The crystal on the board runs at 50 MHz, a period of 20 ps. Before, we created a design clock of 20 MHz, a period of 50 ps. And named the clock domain and bindings after the period. This is quite confusing, since the numbers 20 and 50 apply to both clocks, and indeed this caused a mistake in one of the comments. The comment on the PLL instantiation said it converted a 20 MHz clock into a 50 MHz clock when it was actually the other way around. So let's make the design clock 40 MHz, a period of 25 ps. That way you can't confuse them as easily. Also, name everything after the frequency (`Dom40`, `clk50`, `clk40`). We don't even need to refer to the actual period anymore if we use `hzToPeriod` in `createDomain`. --- projects/deca/src/DECA.hs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/deca/src/DECA.hs b/projects/deca/src/DECA.hs index 67561ec..72a054b 100644 --- a/projects/deca/src/DECA.hs +++ b/projects/deca/src/DECA.hs @@ -12,13 +12,13 @@ data LedMode -- ^ After some period, turn on all disable LEDs, and vice versa deriving (Show, Eq, Enum, Generic, NFDataX) --- Define a synthesis domain with a clock with a period of 20000 /ps/. +-- Define a synthesis domain with a clock with a frequency of 50 MHz. -- The signal coming from the reset button is low when pressed, and high when -- not pressed, which means we set the reset polarity to active-low. -createDomain vSystem{vName="Input", vPeriod=20000, vResetPolarity=ActiveLow} +createDomain vSystem{vName="Input", vPeriod=hzToPeriod 50e6, vResetPolarity=ActiveLow} --- Define a synthesis domain with a clock with a period of 50000 /ps/. -createDomain vSystem{vName="Dom50", vPeriod=50000} +-- Define a synthesis domain with a clock with a frequency of 40 MHz. +createDomain vSystem{vName="Dom40", vPeriod=hzToPeriod 40e6} {-# ANN deca (Synthesize @@ -41,21 +41,21 @@ deca `Annotate` 'StringAttr "chip_pin" "H21" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.5 V Schmitt Trigger\"" -- ^ Reset signal, straight from KEY0 - -> Signal Dom50 Bit + -> Signal Dom40 Bit `Annotate` 'StringAttr "chip_pin" "H22" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.5 V Schmitt Trigger\"" -- ^ Mode choice, straight from KEY1. See 'LedMode'. - -> Signal Dom50 (BitVector 8) + -> Signal Dom40 (BitVector 8) `Annotate` 'StringAttr "chip_pin" "C5, B4, A5, C4, B7, A6, C8, C7" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.2 V\"" -- ^ Output containing 8 bits, corresponding to 8 LEDs, LEDs are active-low -- -- Use comma-seperated list in the "chip_pin" attribute to maps the individual -- bits of the result to the correct pins on the DECA development kit -deca clk20 rstBtn modeBtn = +deca clk50 rstBtn modeBtn = exposeClockResetEnable (mealy blinkerT initialStateBlinkerT . isRising 1) - clk50 + clk40 rstSync en modeBtn @@ -68,10 +68,10 @@ deca clk20 rstBtn modeBtn = -- Instantiate a PLL: this stabilizes the incoming clock signal and indicates -- when the signal is stable. We're also using it to transform an incoming - -- clock signal running at 20 MHz to a clock signal running at 50 MHz. - ( clk50 :: Clock Dom50 - , rstSync :: Reset Dom50 - ) = altpllSync clk20 rstBtn + -- clock signal running at 50 MHz to a clock signal running at 40 MHz. + ( clk40 :: Clock Dom40 + , rstSync :: Reset Dom40 + ) = altpllSync clk50 rstBtn -- | Changes the LED mode -- @@ -84,14 +84,14 @@ flipMode Rotate = Complement flipMode Complement = Rotate blinkerT - :: (BitVector 8, LedMode, Index 6660000) + :: (BitVector 8, LedMode, Index 13320000) -> Bool - -> ((BitVector 8, LedMode, Index 6660000), BitVector 8) + -> ((BitVector 8, LedMode, Index 13320000), BitVector 8) blinkerT (leds, mode, cntr) key1R = ((leds', mode', cntr'), complement leds) where - -- clock frequency = 20e6 (20 MHz) + -- clock frequency = 40e6 (40 MHz) -- led update rate = 333e-3 (every 333ms) - cnt_max = maxBound :: Index 6660000 -- 20e6 * 333e-3 + cnt_max = maxBound :: Index 13320000 -- 40e6 * 333e-3 cntr' | cntr == cnt_max = 0 | otherwise = cntr + 1 From 48e69c15a313c59203eb99a68751a4cbe5b073e8 Mon Sep 17 00:00:00 2001 From: Peter Lebbing Date: Thu, 30 Apr 2026 11:13:28 +0200 Subject: [PATCH 3/3] Use Clash 1.10.0 --- .github/workflows/ci.yml | 14 +---- deca.hsfiles | 74 ++++++++++-------------- orangecrab.hsfiles | 16 +++-- projects-nix/simple-nix/flake.lock | 28 ++++----- projects-nix/simple-nix/flake.nix | 6 +- projects-nix/simple-nix/simple-nix.cabal | 2 +- projects/deca/README.md | 6 +- projects/deca/{{name}}.cabal | 2 +- projects/orangecrab/stack.yaml | 14 +++-- projects/orangecrab/{{name}}.cabal | 2 +- projects/simple/README.md | 6 +- projects/simple/stack.yaml | 14 +++-- projects/simple/{{name}}.cabal | 2 +- simple.hsfiles | 22 ++++--- 14 files changed, 101 insertions(+), 107 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2503d39..51d1256 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,23 +66,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - ghc: ["9.2.8", "9.4.8", "9.6.7", "9.8.4", "9.10.2"] + ghc: ["9.6.7", "9.8.4", "9.10.3", "9.12.4"] # Windows missing; no cross-platform CI scripts available yet. os: ["ubuntu-latest", "macos-latest"] - exclude: - # Unsupported by Clash: - - os: macos-latest - ghc: 8.10.7 - # Unsupported on ARM64 - - os: macos-latest - ghc: 8.6.5 - - os: macos-latest - ghc: 8.8.4 - - os: macos-latest - ghc: 9.0.2 - fail-fast: false steps: - name: Checkout diff --git a/deca.hsfiles b/deca.hsfiles index e3de46e..f388c39 100644 --- a/deca.hsfiles +++ b/deca.hsfiles @@ -370,11 +370,11 @@ they specify a GHC version. These snapshots are curated by the community and FP Complete and can be found on [stackage.org](https://www.stackage.org/). ```yaml -resolver: lts-24.34 +resolver: lts-24.38 ``` -This project uses [lts-24.34](https://www.stackage.org/lts-24.34) and Clash -1.8.5. Snapshots tightly couple GHC and package versions. By +This project uses [lts-24.38](https://www.stackage.org/lts-24.38) and Clash +1.10.0. Snapshots tightly couple GHC and package versions. By working this way, Stack projects build on a cohesive set of packages. Plus, it guarantees that if a `stack build` works now, it will work in 10 years too. @@ -491,11 +491,13 @@ data LedMode -- ^ After some period, turn on all disable LEDs, and vice versa deriving (Show, Eq, Enum, Generic, NFDataX) --- Define a synthesis domain with a clock with a period of 20000 /ps/. -createDomain vSystem{vName="Input", vPeriod=20000} +-- Define a synthesis domain with a clock with a frequency of 50 MHz. +-- The signal coming from the reset button is low when pressed, and high when +-- not pressed, which means we set the reset polarity to active-low. +createDomain vSystem{vName="Input", vPeriod=hzToPeriod 50e6, vResetPolarity=ActiveLow} --- Define a synthesis domain with a clock with a period of 50000 /ps/. -createDomain vSystem{vName="Dom50", vPeriod=50000} +-- Define a synthesis domain with a clock with a frequency of 40 MHz. +createDomain vSystem{vName="Dom40", vPeriod=hzToPeriod 40e6} {-# ANN deca (Synthesize @@ -514,25 +516,25 @@ deca -- -- Annotate with attributes to map the argument to the correct pin, with the -- correct voltage settings, on the DECA development kit. - -> Signal Input Bool + -> Reset Input `Annotate` 'StringAttr "chip_pin" "H21" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.5 V Schmitt Trigger\"" -- ^ Reset signal, straight from KEY0 - -> Signal Dom50 Bit + -> Signal Dom40 Bit `Annotate` 'StringAttr "chip_pin" "H22" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.5 V Schmitt Trigger\"" -- ^ Mode choice, straight from KEY1. See 'LedMode'. - -> Signal Dom50 (BitVector 8) + -> Signal Dom40 (BitVector 8) `Annotate` 'StringAttr "chip_pin" "C5, B4, A5, C4, B7, A6, C8, C7" `Annotate` 'StringAttr "altera_attribute" "-name IO_STANDARD \"1.2 V\"" -- ^ Output containing 8 bits, corresponding to 8 LEDs, LEDs are active-low -- -- Use comma-seperated list in the "chip_pin" attribute to maps the individual -- bits of the result to the correct pins on the DECA development kit -deca clk20 rstBtn modeBtn = +deca clk50 rstBtn modeBtn = exposeClockResetEnable (mealy blinkerT initialStateBlinkerT . isRising 1) - clk50 + clk40 rstSync en modeBtn @@ -543,28 +545,12 @@ deca clk20 rstBtn modeBtn = -- Start with the first LED turned on, in rotate mode, with the counter on zero initialStateBlinkerT = (1, Rotate, 0) - -- Signal coming from the reset button is low when pressed, and high when - -- not pressed. We convert this signal to the polarity of our domain with - -- 'unsafeFromLowPolarity'. - rst = unsafeFromLowPolarity rstBtn - -- Instantiate a PLL: this stabilizes the incoming clock signal and indicates -- when the signal is stable. We're also using it to transform an incoming - -- clock signal running at 20 MHz to a clock signal running at 50 MHz. - (clk50, pllStable) = - altpll - @Dom50 - (SSymbol @"altpll50") - clk20 - rst - - -- Synchronize reset to clock signal coming from PLL. We want the reset to - -- remain active while the PLL is NOT stable, hence the conversion with - -- 'unsafeFromLowPolarity' - rstSync = - resetSynchronizer - clk50 - (unsafeFromLowPolarity pllStable) + -- clock signal running at 50 MHz to a clock signal running at 40 MHz. + ( clk40 :: Clock Dom40 + , rstSync :: Reset Dom40 + ) = altpllSync clk50 rstBtn -- | Changes the LED mode -- @@ -577,14 +563,14 @@ flipMode Rotate = Complement flipMode Complement = Rotate blinkerT - :: (BitVector 8, LedMode, Index 6660000) + :: (BitVector 8, LedMode, Index 13320000) -> Bool - -> ((BitVector 8, LedMode, Index 6660000), BitVector 8) + -> ((BitVector 8, LedMode, Index 13320000), BitVector 8) blinkerT (leds, mode, cntr) key1R = ((leds', mode', cntr'), complement leds) where - -- clock frequency = 20e6 (20 MHz) + -- clock frequency = 40e6 (40 MHz) -- led update rate = 333e-3 (every 333ms) - cnt_max = maxBound :: Index 6660000 -- 20e6 * 333e-3 + cnt_max = maxBound :: Index 13320000 -- 40e6 * 333e-3 cntr' | cntr == cnt_max = 0 | otherwise = cntr + 1 @@ -599,13 +585,17 @@ blinkerT (leds, mode, cntr) key1R = ((leds', mode', cntr'), complement leds) | otherwise = leds {-# START_FILE stack.yaml #-} -resolver: lts-24.34 +resolver: lts-24.38 extra-deps: -- clash-ghc-1.8.5@sha256:c610cd73934f662f345fc63220806bc8064359bcccbea5cb88e965988b0be06f,9867 -- clash-lib-1.8.5@sha256:7ecc42f90c8024077a60fea6fc2bb077d111382430b10495ff8f2feb6db4bbed,15721 -- clash-prelude-1.8.5@sha256:5fb27b119ee7e378bdea0dfe4a4175b13ca72f5b63bd3d31bc3928ea940415fc,17995 -- clash-prelude-hedgehog-1.8.5@sha256:7c0fb51609f844a5faf75ecc71fa1aa0b924299c1e3c06a95257124562be56cc,1416 +- clash-ghc-1.10.0@sha256:d196fd5454e119fa86a2d28736081abb1f176317e80f70972ad6ae96b957af3a,9152 +- clash-lib-1.10.0@sha256:3d512d1d8270586415e35d1eff3a47233978cf106d7909f064f100702a22c167,15776 +- clash-prelude-1.10.0@sha256:69daccb6c9066bac22846e59fc34a3335181c7b3d946715d2cb3204e42391d92,18110 +- clash-prelude-hedgehog-1.10.0@sha256:8d9738c12ce9742647dff05e807e069cc9cbc8c8831da5ea3899ee71932bc378,1615 +- ghc-typelits-extra-0.5.3@sha256:4fae3c698c15132181a431e52f95aa8f655dc78bcd2a5fdf35a7e222eb7d2d19,5830 +- ghc-typelits-knownnat-0.8.3@sha256:84114e2d8a4389c37921ed1b3dd030c6acd8af0eb47d5cb516e3a374ade0f9b4,5993 +- ghc-typelits-natnormalise-0.9.5@sha256:692d7a936ecee9e3a994f0a60d136be1f03137d38aca90f03b8efcb40bed90ca,3973 +- ghc-tcplugin-api-0.18.2.1@sha256:a5e1e7019f94203508a9a398cf1210ec813d2e11a880d325b0259985dbf7b02a,5426 {-# START_FILE syn/addclashsources.tcl #-} package require json @@ -841,7 +831,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/orangecrab.hsfiles b/orangecrab.hsfiles index 71e2cf5..7d1a21a 100644 --- a/orangecrab.hsfiles +++ b/orangecrab.hsfiles @@ -717,13 +717,17 @@ driveRGB desiredColor = mealy drive 0 desiredColor ) {-# START_FILE stack.yaml #-} -resolver: lts-24.34 +resolver: lts-24.38 extra-deps: -- clash-ghc-1.8.5@sha256:c610cd73934f662f345fc63220806bc8064359bcccbea5cb88e965988b0be06f,9867 -- clash-lib-1.8.5@sha256:7ecc42f90c8024077a60fea6fc2bb077d111382430b10495ff8f2feb6db4bbed,15721 -- clash-prelude-1.8.5@sha256:5fb27b119ee7e378bdea0dfe4a4175b13ca72f5b63bd3d31bc3928ea940415fc,17995 -- clash-prelude-hedgehog-1.8.5@sha256:7c0fb51609f844a5faf75ecc71fa1aa0b924299c1e3c06a95257124562be56cc,1416 +- clash-ghc-1.10.0@sha256:d196fd5454e119fa86a2d28736081abb1f176317e80f70972ad6ae96b957af3a,9152 +- clash-lib-1.10.0@sha256:3d512d1d8270586415e35d1eff3a47233978cf106d7909f064f100702a22c167,15776 +- clash-prelude-1.10.0@sha256:69daccb6c9066bac22846e59fc34a3335181c7b3d946715d2cb3204e42391d92,18110 +- clash-prelude-hedgehog-1.10.0@sha256:8d9738c12ce9742647dff05e807e069cc9cbc8c8831da5ea3899ee71932bc378,1615 +- ghc-typelits-extra-0.5.3@sha256:4fae3c698c15132181a431e52f95aa8f655dc78bcd2a5fdf35a7e222eb7d2d19,5830 +- ghc-typelits-knownnat-0.8.3@sha256:84114e2d8a4389c37921ed1b3dd030c6acd8af0eb47d5cb516e3a374ade0f9b4,5993 +- ghc-typelits-natnormalise-0.9.5@sha256:692d7a936ecee9e3a994f0a60d136be1f03137d38aca90f03b8efcb40bed90ca,3973 +- ghc-tcplugin-api-0.18.2.1@sha256:a5e1e7019f94203508a9a398cf1210ec813d2e11a880d325b0259985dbf7b02a,5426 {-# START_FILE tests/Tests/Blink.hs #-} module Tests.Blink where @@ -880,7 +884,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects-nix/simple-nix/flake.lock b/projects-nix/simple-nix/flake.lock index d4d110c..2660667 100644 --- a/projects-nix/simple-nix/flake.lock +++ b/projects-nix/simple-nix/flake.lock @@ -4,23 +4,23 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "ghc-tcplugins-extra": "ghc-tcplugins-extra", + "ghc-tcplugin-api": "ghc-tcplugin-api", "ghc-typelits-extra": "ghc-typelits-extra", "ghc-typelits-knownnat": "ghc-typelits-knownnat", "ghc-typelits-natnormalise": "ghc-typelits-natnormalise", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774438862, - "narHash": "sha256-Cu3wLBtIahUuBI5N1WerU3aMBZyVqPzn18GjCaU7lHw=", + "lastModified": 1776952304, + "narHash": "sha256-n1si+4jq08gn5FfWeZDO0QM2EcKf11VUFFKQPhhqJWs=", "owner": "clash-lang", "repo": "clash-compiler", - "rev": "50ec44fc22825acbf65bf0b2eb878eeae4121cdb", + "rev": "2371b8708bd4474e6ac0e5988fd7e68b17bf1f69", "type": "github" }, "original": { "owner": "clash-lang", - "ref": "v1.8.5", + "ref": "v1.10.0", "repo": "clash-compiler", "type": "github" } @@ -76,7 +76,7 @@ "type": "indirect" } }, - "ghc-tcplugins-extra": { + "ghc-tcplugin-api": { "flake": false, "locked": { "lastModified": 1768388673, @@ -87,8 +87,8 @@ "type": "github" }, "original": { - "owner": "clash-lang", - "repo": "ghc-tcplugins-extra", + "owner": "sheaf", + "repo": "ghc-tcplugin-api", "type": "github" } }, @@ -142,11 +142,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773628058, - "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", + "lastModified": 1775888245, + "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "rev": "13043924aaa7375ce482ebe2494338e058282925", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775005781, - "narHash": "sha256-HIihgifyfrmBlC2c9B7+bqP1fF5eHPNCNhgBd1coFcs=", + "lastModified": 1777395829, + "narHash": "sha256-HposVFZcsBCevgqLR73w/BpSe8J1lMgw5kASnnxO3A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e3050a29278c985725a86704faa1e99236b51a", + "rev": "e75f25705c2934955ee5075e62530d74aca973c6", "type": "github" }, "original": { diff --git a/projects-nix/simple-nix/flake.nix b/projects-nix/simple-nix/flake.nix index 45d2057..4856942 100644 --- a/projects-nix/simple-nix/flake.nix +++ b/projects-nix/simple-nix/flake.nix @@ -2,7 +2,7 @@ description = "A flake for starter Clash projects!"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - clash-compiler.url = "github:clash-lang/clash-compiler?ref=v1.8.5"; + clash-compiler.url = "github:clash-lang/clash-compiler?ref=v1.10.0"; }; nixConfig = { extra-substituters = [ "https://clash-lang.cachix.org" ]; @@ -19,7 +19,7 @@ # What version of GHC you want to use # The version must be in the list of supported versions of the clash-compiler! - ghc-version = "ghc9103"; + ghc-version = "ghc9124"; # A list of HASKELL packages clash-compiler uses, we use this set packages to prevent version # conflicts with the regular nixpkgs when using Clash @@ -77,7 +77,7 @@ echo "Simply run: nix develop" exit 1 fi - + cabal build --write-ghc-environment-files=never cabal run clash ${top-module} -- --${hdl} echo "Removing" .ghc.environment.* diff --git a/projects-nix/simple-nix/simple-nix.cabal b/projects-nix/simple-nix/simple-nix.cabal index 06fd444..bd2e887 100644 --- a/projects-nix/simple-nix/simple-nix.cabal +++ b/projects-nix/simple-nix/simple-nix.cabal @@ -75,7 +75,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/deca/README.md b/projects/deca/README.md index eba8870..10bcc3b 100644 --- a/projects/deca/README.md +++ b/projects/deca/README.md @@ -300,11 +300,11 @@ they specify a GHC version. These snapshots are curated by the community and FP Complete and can be found on [stackage.org](https://www.stackage.org/). ```yaml -resolver: lts-24.34 +resolver: lts-24.38 ``` -This project uses [lts-24.34](https://www.stackage.org/lts-24.34) and Clash -1.8.5. Snapshots tightly couple GHC and package versions. By +This project uses [lts-24.38](https://www.stackage.org/lts-24.38) and Clash +1.10.0. Snapshots tightly couple GHC and package versions. By working this way, Stack projects build on a cohesive set of packages. Plus, it guarantees that if a `stack build` works now, it will work in 10 years too. diff --git a/projects/deca/{{name}}.cabal b/projects/deca/{{name}}.cabal index 0f86479..fb49d6b 100644 --- a/projects/deca/{{name}}.cabal +++ b/projects/deca/{{name}}.cabal @@ -72,7 +72,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/orangecrab/stack.yaml b/projects/orangecrab/stack.yaml index 204103d..7377d66 100644 --- a/projects/orangecrab/stack.yaml +++ b/projects/orangecrab/stack.yaml @@ -1,7 +1,11 @@ -resolver: lts-24.34 +resolver: lts-24.38 extra-deps: -- clash-ghc-1.8.5@sha256:c610cd73934f662f345fc63220806bc8064359bcccbea5cb88e965988b0be06f,9867 -- clash-lib-1.8.5@sha256:7ecc42f90c8024077a60fea6fc2bb077d111382430b10495ff8f2feb6db4bbed,15721 -- clash-prelude-1.8.5@sha256:5fb27b119ee7e378bdea0dfe4a4175b13ca72f5b63bd3d31bc3928ea940415fc,17995 -- clash-prelude-hedgehog-1.8.5@sha256:7c0fb51609f844a5faf75ecc71fa1aa0b924299c1e3c06a95257124562be56cc,1416 +- clash-ghc-1.10.0@sha256:d196fd5454e119fa86a2d28736081abb1f176317e80f70972ad6ae96b957af3a,9152 +- clash-lib-1.10.0@sha256:3d512d1d8270586415e35d1eff3a47233978cf106d7909f064f100702a22c167,15776 +- clash-prelude-1.10.0@sha256:69daccb6c9066bac22846e59fc34a3335181c7b3d946715d2cb3204e42391d92,18110 +- clash-prelude-hedgehog-1.10.0@sha256:8d9738c12ce9742647dff05e807e069cc9cbc8c8831da5ea3899ee71932bc378,1615 +- ghc-typelits-extra-0.5.3@sha256:4fae3c698c15132181a431e52f95aa8f655dc78bcd2a5fdf35a7e222eb7d2d19,5830 +- ghc-typelits-knownnat-0.8.3@sha256:84114e2d8a4389c37921ed1b3dd030c6acd8af0eb47d5cb516e3a374ade0f9b4,5993 +- ghc-typelits-natnormalise-0.9.5@sha256:692d7a936ecee9e3a994f0a60d136be1f03137d38aca90f03b8efcb40bed90ca,3973 +- ghc-tcplugin-api-0.18.2.1@sha256:a5e1e7019f94203508a9a398cf1210ec813d2e11a880d325b0259985dbf7b02a,5426 diff --git a/projects/orangecrab/{{name}}.cabal b/projects/orangecrab/{{name}}.cabal index 7b1c979..ed33434 100644 --- a/projects/orangecrab/{{name}}.cabal +++ b/projects/orangecrab/{{name}}.cabal @@ -75,7 +75,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/simple/README.md b/projects/simple/README.md index 6953e57..28b4f70 100644 --- a/projects/simple/README.md +++ b/projects/simple/README.md @@ -223,11 +223,11 @@ write-ghc-environment-files: always While Cabal fetches packages straight from Hackage (with a bias towards the latest versions), Stack works through _snapshots_. Snapshots are an index of packages from Hackage know to work well with each other. In addition to that, they specify a GHC version. These snapshots are curated by the community and FP Complete and can be found on [stackage.org](https://www.stackage.org/). ```yaml -resolver: lts-24.34 +resolver: lts-24.38 ``` -This project uses [lts-24.34](https://www.stackage.org/lts-24.34) and Clash -1.8.5. Snapshots tightly couple GHC and package versions. By +This project uses [lts-24.38](https://www.stackage.org/lts-24.38) and Clash +1.10.0. Snapshots tightly couple GHC and package versions. By working this way, Stack projects build on a cohesive set of packages. Plus, it guarantees that if a `stack build` works now, it will work in 10 years too. diff --git a/projects/simple/stack.yaml b/projects/simple/stack.yaml index 204103d..7377d66 100644 --- a/projects/simple/stack.yaml +++ b/projects/simple/stack.yaml @@ -1,7 +1,11 @@ -resolver: lts-24.34 +resolver: lts-24.38 extra-deps: -- clash-ghc-1.8.5@sha256:c610cd73934f662f345fc63220806bc8064359bcccbea5cb88e965988b0be06f,9867 -- clash-lib-1.8.5@sha256:7ecc42f90c8024077a60fea6fc2bb077d111382430b10495ff8f2feb6db4bbed,15721 -- clash-prelude-1.8.5@sha256:5fb27b119ee7e378bdea0dfe4a4175b13ca72f5b63bd3d31bc3928ea940415fc,17995 -- clash-prelude-hedgehog-1.8.5@sha256:7c0fb51609f844a5faf75ecc71fa1aa0b924299c1e3c06a95257124562be56cc,1416 +- clash-ghc-1.10.0@sha256:d196fd5454e119fa86a2d28736081abb1f176317e80f70972ad6ae96b957af3a,9152 +- clash-lib-1.10.0@sha256:3d512d1d8270586415e35d1eff3a47233978cf106d7909f064f100702a22c167,15776 +- clash-prelude-1.10.0@sha256:69daccb6c9066bac22846e59fc34a3335181c7b3d946715d2cb3204e42391d92,18110 +- clash-prelude-hedgehog-1.10.0@sha256:8d9738c12ce9742647dff05e807e069cc9cbc8c8831da5ea3899ee71932bc378,1615 +- ghc-typelits-extra-0.5.3@sha256:4fae3c698c15132181a431e52f95aa8f655dc78bcd2a5fdf35a7e222eb7d2d19,5830 +- ghc-typelits-knownnat-0.8.3@sha256:84114e2d8a4389c37921ed1b3dd030c6acd8af0eb47d5cb516e3a374ade0f9b4,5993 +- ghc-typelits-natnormalise-0.9.5@sha256:692d7a936ecee9e3a994f0a60d136be1f03137d38aca90f03b8efcb40bed90ca,3973 +- ghc-tcplugin-api-0.18.2.1@sha256:a5e1e7019f94203508a9a398cf1210ec813d2e11a880d325b0259985dbf7b02a,5426 diff --git a/projects/simple/{{name}}.cabal b/projects/simple/{{name}}.cabal index 87fda8c..05515ce 100644 --- a/projects/simple/{{name}}.cabal +++ b/projects/simple/{{name}}.cabal @@ -75,7 +75,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/simple.hsfiles b/simple.hsfiles index e22b5ce..f043b8f 100644 --- a/simple.hsfiles +++ b/simple.hsfiles @@ -293,11 +293,11 @@ write-ghc-environment-files: always While Cabal fetches packages straight from Hackage (with a bias towards the latest versions), Stack works through _snapshots_. Snapshots are an index of packages from Hackage know to work well with each other. In addition to that, they specify a GHC version. These snapshots are curated by the community and FP Complete and can be found on [stackage.org](https://www.stackage.org/). ```yaml -resolver: lts-24.34 +resolver: lts-24.38 ``` -This project uses [lts-24.34](https://www.stackage.org/lts-24.34) and Clash -1.8.5. Snapshots tightly couple GHC and package versions. By +This project uses [lts-24.38](https://www.stackage.org/lts-24.38) and Clash +1.10.0. Snapshots tightly couple GHC and package versions. By working this way, Stack projects build on a cohesive set of packages. Plus, it guarantees that if a `stack build` works now, it will work in 10 years too. @@ -484,13 +484,17 @@ accum = mealy accumT 0 accumT s i = (s + i, s) {-# START_FILE stack.yaml #-} -resolver: lts-24.34 +resolver: lts-24.38 extra-deps: -- clash-ghc-1.8.5@sha256:c610cd73934f662f345fc63220806bc8064359bcccbea5cb88e965988b0be06f,9867 -- clash-lib-1.8.5@sha256:7ecc42f90c8024077a60fea6fc2bb077d111382430b10495ff8f2feb6db4bbed,15721 -- clash-prelude-1.8.5@sha256:5fb27b119ee7e378bdea0dfe4a4175b13ca72f5b63bd3d31bc3928ea940415fc,17995 -- clash-prelude-hedgehog-1.8.5@sha256:7c0fb51609f844a5faf75ecc71fa1aa0b924299c1e3c06a95257124562be56cc,1416 +- clash-ghc-1.10.0@sha256:d196fd5454e119fa86a2d28736081abb1f176317e80f70972ad6ae96b957af3a,9152 +- clash-lib-1.10.0@sha256:3d512d1d8270586415e35d1eff3a47233978cf106d7909f064f100702a22c167,15776 +- clash-prelude-1.10.0@sha256:69daccb6c9066bac22846e59fc34a3335181c7b3d946715d2cb3204e42391d92,18110 +- clash-prelude-hedgehog-1.10.0@sha256:8d9738c12ce9742647dff05e807e069cc9cbc8c8831da5ea3899ee71932bc378,1615 +- ghc-typelits-extra-0.5.3@sha256:4fae3c698c15132181a431e52f95aa8f655dc78bcd2a5fdf35a7e222eb7d2d19,5830 +- ghc-typelits-knownnat-0.8.3@sha256:84114e2d8a4389c37921ed1b3dd030c6acd8af0eb47d5cb516e3a374ade0f9b4,5993 +- ghc-typelits-natnormalise-0.9.5@sha256:692d7a936ecee9e3a994f0a60d136be1f03137d38aca90f03b8efcb40bed90ca,3973 +- ghc-tcplugin-api-0.18.2.1@sha256:a5e1e7019f94203508a9a398cf1210ec813d2e11a880d325b0259985dbf7b02a,5426 {-# START_FILE tests/Tests/Example/Project.hs #-} module Tests.Example.Project where @@ -644,7 +648,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.5 && < 1.10, + clash-prelude >= 1.10.0 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat