diff --git a/deca.hsfiles b/deca.hsfiles index d03718c..e704009 100644 --- a/deca.hsfiles +++ b/deca.hsfiles @@ -373,8 +373,8 @@ FP Complete and can be found on [stackage.org](https://www.stackage.org/). resolver: lts-24.38 ``` -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 +This project uses [lts-24.57](https://www.stackage.org/lts-24.57) and Clash +1.10.1. 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. @@ -585,17 +585,18 @@ blinkerT (leds, mode, cntr) key1R = ((leds', mode', cntr'), complement leds) | otherwise = leds {-# START_FILE stack.yaml #-} -resolver: lts-24.38 +resolver: lts-24.57 extra-deps: -- 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 +- clash-ghc-1.10.1@sha256:f8a881d7471a20bccb5191c85a96df932743c90fd6542a4d65ffe99990256c6d,9479 +- clash-lib-1.10.1@sha256:710a9195dd071f89506e4bca5e229fb9407aee93d6b24eccc1f2e2d31d44baf6,15790 +- clash-prelude-1.10.1@sha256:2f10e87868c799387a1d8aaafd38ac10dadd1865194fec42bd74ddaa1c602e44,18778 +- clash-prelude-hedgehog-1.10.1@sha256:651b7eb6f0709d162e131c48a57a0a1e058603ca029e56b3c68a79a9ec5c4f41,1627 +- checked-literals-0.1.2@sha256:82910d3c373d91726d9ca564cb2e02b17b0a1b4486cd19f0e915af97d0c046ce,3019 +- ghc-typelits-extra-0.5.4@sha256:9c02b3d02208d088baff01fa766606c8ba1d3c827f57a11f93accb80208bfcb2,5830 +- ghc-typelits-knownnat-0.8.4@sha256:40842155a260424a3a98a99dd1a528d384a187319bdadbd23553f708802f2260,5993 +- ghc-typelits-natnormalise-0.9.6@sha256:cf48a5cd0e4df189f422a3ff37ee1eb901762b93ed8d8fd60d7260da1b9c9d78,3969 +- ghc-tcplugin-api-0.19.0.0@sha256:72d1bbfdfd025d03a45cb9e9a7d7bc257276b3fa01f6778e052bed018129859c,5410 {-# START_FILE syn/addclashsources.tcl #-} package require json @@ -831,7 +832,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/orangecrab.hsfiles b/orangecrab.hsfiles index 9a4cbe3..873a659 100644 --- a/orangecrab.hsfiles +++ b/orangecrab.hsfiles @@ -717,17 +717,18 @@ driveRGB desiredColor = mealy drive 0 desiredColor ) {-# START_FILE stack.yaml #-} -resolver: lts-24.38 +resolver: lts-24.57 extra-deps: -- 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 +- clash-ghc-1.10.1@sha256:f8a881d7471a20bccb5191c85a96df932743c90fd6542a4d65ffe99990256c6d,9479 +- clash-lib-1.10.1@sha256:710a9195dd071f89506e4bca5e229fb9407aee93d6b24eccc1f2e2d31d44baf6,15790 +- clash-prelude-1.10.1@sha256:2f10e87868c799387a1d8aaafd38ac10dadd1865194fec42bd74ddaa1c602e44,18778 +- clash-prelude-hedgehog-1.10.1@sha256:651b7eb6f0709d162e131c48a57a0a1e058603ca029e56b3c68a79a9ec5c4f41,1627 +- checked-literals-0.1.2@sha256:82910d3c373d91726d9ca564cb2e02b17b0a1b4486cd19f0e915af97d0c046ce,3019 +- ghc-typelits-extra-0.5.4@sha256:9c02b3d02208d088baff01fa766606c8ba1d3c827f57a11f93accb80208bfcb2,5830 +- ghc-typelits-knownnat-0.8.4@sha256:40842155a260424a3a98a99dd1a528d384a187319bdadbd23553f708802f2260,5993 +- ghc-typelits-natnormalise-0.9.6@sha256:cf48a5cd0e4df189f422a3ff37ee1eb901762b93ed8d8fd60d7260da1b9c9d78,3969 +- ghc-tcplugin-api-0.19.0.0@sha256:72d1bbfdfd025d03a45cb9e9a7d7bc257276b3fa01f6778e052bed018129859c,5410 {-# START_FILE tests/Tests/Blink.hs #-} module Tests.Blink where @@ -884,7 +885,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 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 2660667..9fa2542 100644 --- a/projects-nix/simple-nix/flake.lock +++ b/projects-nix/simple-nix/flake.lock @@ -11,16 +11,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776952304, - "narHash": "sha256-n1si+4jq08gn5FfWeZDO0QM2EcKf11VUFFKQPhhqJWs=", + "lastModified": 1787843053, + "narHash": "sha256-cMGJ6WMaTYWxXS/gkrm/TUsznMMT/lOixT7xGclWnN8=", "owner": "clash-lang", "repo": "clash-compiler", - "rev": "2371b8708bd4474e6ac0e5988fd7e68b17bf1f69", + "rev": "0373fc4920a1d46ebaaf1d66b36bd7d3a3060de3", "type": "github" }, "original": { "owner": "clash-lang", - "ref": "v1.10.0", + "ref": "v1.10.1", "repo": "clash-compiler", "type": "github" } @@ -158,11 +158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777395829, - "narHash": "sha256-HposVFZcsBCevgqLR73w/BpSe8J1lMgw5kASnnxO3A4=", + "lastModified": 1787964612, + "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e75f25705c2934955ee5075e62530d74aca973c6", + "rev": "e8be7818e19ada32105a8af937a6a473b38167ca", "type": "github" }, "original": { diff --git a/projects-nix/simple-nix/flake.nix b/projects-nix/simple-nix/flake.nix index 4856942..f453eb2 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.10.0"; + clash-compiler.url = "github:clash-lang/clash-compiler?ref=v1.10.1"; }; nixConfig = { extra-substituters = [ "https://clash-lang.cachix.org" ]; diff --git a/projects-nix/simple-nix/simple-nix.cabal b/projects-nix/simple-nix/simple-nix.cabal index 5f1025e..55086c1 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.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/deca/README.md b/projects/deca/README.md index 10bcc3b..35beeb1 100644 --- a/projects/deca/README.md +++ b/projects/deca/README.md @@ -303,8 +303,8 @@ FP Complete and can be found on [stackage.org](https://www.stackage.org/). resolver: lts-24.38 ``` -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 +This project uses [lts-24.57](https://www.stackage.org/lts-24.57) and Clash +1.10.1. 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 1da368b..4a45330 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.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/orangecrab/stack.yaml b/projects/orangecrab/stack.yaml deleted file mode 100644 index 7377d66..0000000 --- a/projects/orangecrab/stack.yaml +++ /dev/null @@ -1,11 +0,0 @@ -resolver: lts-24.38 - -extra-deps: -- 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/stack.yaml b/projects/orangecrab/stack.yaml new file mode 120000 index 0000000..e4e2fdf --- /dev/null +++ b/projects/orangecrab/stack.yaml @@ -0,0 +1 @@ +../simple/stack.yaml \ No newline at end of file diff --git a/projects/orangecrab/{{name}}.cabal b/projects/orangecrab/{{name}}.cabal index 7a431a8..b268178 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.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/simple/README.md b/projects/simple/README.md index 28b4f70..103131c 100644 --- a/projects/simple/README.md +++ b/projects/simple/README.md @@ -226,8 +226,8 @@ While Cabal fetches packages straight from Hackage (with a bias towards the late resolver: lts-24.38 ``` -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 +This project uses [lts-24.57](https://www.stackage.org/lts-24.57) and Clash +1.10.1. 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 7377d66..3649c4e 100644 --- a/projects/simple/stack.yaml +++ b/projects/simple/stack.yaml @@ -1,11 +1,12 @@ -resolver: lts-24.38 +resolver: lts-24.57 extra-deps: -- 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 +- clash-ghc-1.10.1@sha256:f8a881d7471a20bccb5191c85a96df932743c90fd6542a4d65ffe99990256c6d,9479 +- clash-lib-1.10.1@sha256:710a9195dd071f89506e4bca5e229fb9407aee93d6b24eccc1f2e2d31d44baf6,15790 +- clash-prelude-1.10.1@sha256:2f10e87868c799387a1d8aaafd38ac10dadd1865194fec42bd74ddaa1c602e44,18778 +- clash-prelude-hedgehog-1.10.1@sha256:651b7eb6f0709d162e131c48a57a0a1e058603ca029e56b3c68a79a9ec5c4f41,1627 +- checked-literals-0.1.2@sha256:82910d3c373d91726d9ca564cb2e02b17b0a1b4486cd19f0e915af97d0c046ce,3019 +- ghc-typelits-extra-0.5.4@sha256:9c02b3d02208d088baff01fa766606c8ba1d3c827f57a11f93accb80208bfcb2,5830 +- ghc-typelits-knownnat-0.8.4@sha256:40842155a260424a3a98a99dd1a528d384a187319bdadbd23553f708802f2260,5993 +- ghc-typelits-natnormalise-0.9.6@sha256:cf48a5cd0e4df189f422a3ff37ee1eb901762b93ed8d8fd60d7260da1b9c9d78,3969 +- ghc-tcplugin-api-0.19.0.0@sha256:72d1bbfdfd025d03a45cb9e9a7d7bc257276b3fa01f6778e052bed018129859c,5410 diff --git a/projects/simple/{{name}}.cabal b/projects/simple/{{name}}.cabal index 10fa014..8ff65db 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.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/simple.hsfiles b/simple.hsfiles index 3cbdc2a..dd5a96f 100644 --- a/simple.hsfiles +++ b/simple.hsfiles @@ -296,8 +296,8 @@ While Cabal fetches packages straight from Hackage (with a bias towards the late resolver: lts-24.38 ``` -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 +This project uses [lts-24.57](https://www.stackage.org/lts-24.57) and Clash +1.10.1. 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,17 +484,18 @@ accum = mealy accumT 0 accumT s i = (s + i, s) {-# START_FILE stack.yaml #-} -resolver: lts-24.38 +resolver: lts-24.57 extra-deps: -- 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 +- clash-ghc-1.10.1@sha256:f8a881d7471a20bccb5191c85a96df932743c90fd6542a4d65ffe99990256c6d,9479 +- clash-lib-1.10.1@sha256:710a9195dd071f89506e4bca5e229fb9407aee93d6b24eccc1f2e2d31d44baf6,15790 +- clash-prelude-1.10.1@sha256:2f10e87868c799387a1d8aaafd38ac10dadd1865194fec42bd74ddaa1c602e44,18778 +- clash-prelude-hedgehog-1.10.1@sha256:651b7eb6f0709d162e131c48a57a0a1e058603ca029e56b3c68a79a9ec5c4f41,1627 +- checked-literals-0.1.2@sha256:82910d3c373d91726d9ca564cb2e02b17b0a1b4486cd19f0e915af97d0c046ce,3019 +- ghc-typelits-extra-0.5.4@sha256:9c02b3d02208d088baff01fa766606c8ba1d3c827f57a11f93accb80208bfcb2,5830 +- ghc-typelits-knownnat-0.8.4@sha256:40842155a260424a3a98a99dd1a528d384a187319bdadbd23553f708802f2260,5993 +- ghc-typelits-natnormalise-0.9.6@sha256:cf48a5cd0e4df189f422a3ff37ee1eb901762b93ed8d8fd60d7260da1b9c9d78,3969 +- ghc-tcplugin-api-0.19.0.0@sha256:72d1bbfdfd025d03a45cb9e9a7d7bc257276b3fa01f6778e052bed018129859c,5410 {-# START_FILE tests/Tests/Example/Project.hs #-} module Tests.Example.Project where @@ -648,7 +649,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.10.0 && < 1.12, + clash-prelude >= 1.10.1 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat