From 4f2f69b95bcd3ac3125fe86dd4053e5a8ed3b2a9 Mon Sep 17 00:00:00 2001 From: rowanG077 Date: Sun, 20 Sep 2026 16:07:34 +0200 Subject: [PATCH 1/2] Update to Clash v1.10.2 --- deca.hsfiles | 20 +++++------ orangecrab.hsfiles | 12 +++---- projects-nix/simple-nix/flake.lock | 44 ++++++++++++------------ projects-nix/simple-nix/flake.nix | 2 +- projects-nix/simple-nix/simple-nix.cabal | 2 +- projects/deca/README.md | 8 ++--- projects/deca/{{name}}.cabal | 2 +- projects/orangecrab/{{name}}.cabal | 2 +- projects/simple/README.md | 8 ++--- projects/simple/stack.yaml | 10 +++--- projects/simple/{{name}}.cabal | 2 +- simple.hsfiles | 20 +++++------ 12 files changed, 66 insertions(+), 66 deletions(-) diff --git a/deca.hsfiles b/deca.hsfiles index e704009..f50d7f9 100644 --- a/deca.hsfiles +++ b/deca.hsfiles @@ -281,7 +281,7 @@ common section is some build dependencies: Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.6.4 && < 1.8, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat @@ -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.38 +resolver: lts-24.59 ``` -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 +This project uses [lts-24.59](https://www.stackage.org/lts-24.59) and Clash +1.10.2. 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,13 +585,13 @@ blinkerT (leds, mode, cntr) key1R = ((leds', mode', cntr'), complement leds) | otherwise = leds {-# START_FILE stack.yaml #-} -resolver: lts-24.57 +resolver: lts-24.59 extra-deps: -- 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 +- clash-ghc-1.10.2@sha256:191e64f4b7340a803869c778d0840341c532801de169f1cfef2505ea52f0b88c,9479 +- clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 +- clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 +- clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,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 @@ -832,7 +832,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.10.1 && < 1.12, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/orangecrab.hsfiles b/orangecrab.hsfiles index 873a659..0df0e8f 100644 --- a/orangecrab.hsfiles +++ b/orangecrab.hsfiles @@ -717,13 +717,13 @@ driveRGB desiredColor = mealy drive 0 desiredColor ) {-# START_FILE stack.yaml #-} -resolver: lts-24.57 +resolver: lts-24.59 extra-deps: -- 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 +- clash-ghc-1.10.2@sha256:191e64f4b7340a803869c778d0840341c532801de169f1cfef2505ea52f0b88c,9479 +- clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 +- clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 +- clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,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 @@ -885,7 +885,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.10.1 && < 1.12, + clash-prelude >= 1.10.2 && < 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 9fa2542..ff293b5 100644 --- a/projects-nix/simple-nix/flake.lock +++ b/projects-nix/simple-nix/flake.lock @@ -11,16 +11,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1787843053, - "narHash": "sha256-cMGJ6WMaTYWxXS/gkrm/TUsznMMT/lOixT7xGclWnN8=", + "lastModified": 1788621183, + "narHash": "sha256-LOTlGkRHw+iF7FI3kQUpFSQTmV+cAmszBiukEIltDi8=", "owner": "clash-lang", "repo": "clash-compiler", - "rev": "0373fc4920a1d46ebaaf1d66b36bd7d3a3060de3", + "rev": "f564a6f02dfbb05654a965a1effc476a45849f38", "type": "github" }, "original": { "owner": "clash-lang", - "ref": "v1.10.1", + "ref": "v1.10.2", "repo": "clash-compiler", "type": "github" } @@ -79,11 +79,11 @@ "ghc-tcplugin-api": { "flake": false, "locked": { - "lastModified": 1768388673, - "narHash": "sha256-3RriTela4iwbvHhF3UigmBOfxJv0+YQGAlXQbnXsX74=", + "lastModified": 1778583653, + "narHash": "sha256-v31rd0V38e8kzl1V+u00FIsJT5xhQlQy27mlCOx+ITo=", "owner": "sheaf", "repo": "ghc-tcplugin-api", - "rev": "c583750b5899846cb455f3fe2d58b3ba9bc910d0", + "rev": "5b4f056fb7ef361bcf3d882f2b541d07bd455274", "type": "github" }, "original": { @@ -95,11 +95,11 @@ "ghc-typelits-extra": { "flake": false, "locked": { - "lastModified": 1773994244, - "narHash": "sha256-BPOTj6Dqv2Nt+C47MCayXzItXRf3HC4f2kV7lnAjAEY=", + "lastModified": 1778681768, + "narHash": "sha256-uv5QIelvJbJ0JfWU+xXkBRhBq2yPAnjlsdRO+obgCJ0=", "owner": "clash-lang", "repo": "ghc-typelits-extra", - "rev": "1d38c49f456406937c5e9e3b3e382af6ccbff0e1", + "rev": "46413efa70451de45b88b7cf992e42d8c0ef3892", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "ghc-typelits-knownnat": { "flake": false, "locked": { - "lastModified": 1774000279, - "narHash": "sha256-41mjxMsWHXmAS2bxYVsE3OOav3sWnwPbpP56aRDVUNU=", + "lastModified": 1778679058, + "narHash": "sha256-Bs6eovpLjo6svx2g2eb03VF9rpwtOKvjQ37eYWnU+/8=", "owner": "clash-lang", "repo": "ghc-typelits-knownnat", - "rev": "21fb8294266484b2e267f3850f5437e87d8b241f", + "rev": "1ccb90d574726f2efe573c19802a962ca47c2352", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "ghc-typelits-natnormalise": { "flake": false, "locked": { - "lastModified": 1773940027, - "narHash": "sha256-MGdoDIOWAHk9IERWtGQhxB5AlBAVbmtCUouKJUv122g=", + "lastModified": 1778677210, + "narHash": "sha256-HTYF1r3BQEHlsPn0OSSW+nTmF0AoOvoNfF3oRgS3fAo=", "owner": "clash-lang", "repo": "ghc-typelits-natnormalise", - "rev": "5adf333887f5f9f00e47f69368a2b5e9705c9cbc", + "rev": "76dc51382c1f51161af84bebdfed253103c7f7dd", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775888245, - "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", + "lastModified": 1787964612, + "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13043924aaa7375ce482ebe2494338e058282925", + "rev": "e8be7818e19ada32105a8af937a6a473b38167ca", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1787964612, - "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=", + "lastModified": 1789724158, + "narHash": "sha256-nlKgrm0dsVhOSopKheVBCcOpiIticufPPVLdVOI0euA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8be7818e19ada32105a8af937a6a473b38167ca", + "rev": "0a3468a402c449992505b6a9fc5b06580141b750", "type": "github" }, "original": { diff --git a/projects-nix/simple-nix/flake.nix b/projects-nix/simple-nix/flake.nix index f453eb2..5f031ed 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.1"; + clash-compiler.url = "github:clash-lang/clash-compiler?ref=v1.10.2"; }; 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 55086c1..27a2093 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.1 && < 1.12, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/deca/README.md b/projects/deca/README.md index 35beeb1..6e211db 100644 --- a/projects/deca/README.md +++ b/projects/deca/README.md @@ -211,7 +211,7 @@ common section is some build dependencies: Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.6.4 && < 1.8, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat @@ -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.38 +resolver: lts-24.59 ``` -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 +This project uses [lts-24.59](https://www.stackage.org/lts-24.59) and Clash +1.10.2. 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 4a45330..9bfd673 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.1 && < 1.12, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/orangecrab/{{name}}.cabal b/projects/orangecrab/{{name}}.cabal index b268178..22ae942 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.1 && < 1.12, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/projects/simple/README.md b/projects/simple/README.md index 103131c..e5bfa4b 100644 --- a/projects/simple/README.md +++ b/projects/simple/README.md @@ -152,7 +152,7 @@ Note that this whole section is a `common` "stanza". We'll use it as a template Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.2 && < 1.10, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat @@ -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.38 +resolver: lts-24.59 ``` -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 +This project uses [lts-24.59](https://www.stackage.org/lts-24.59) and Clash +1.10.2. 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 3649c4e..f77b754 100644 --- a/projects/simple/stack.yaml +++ b/projects/simple/stack.yaml @@ -1,10 +1,10 @@ -resolver: lts-24.57 +resolver: lts-24.59 extra-deps: -- 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 +- clash-ghc-1.10.2@sha256:191e64f4b7340a803869c778d0840341c532801de169f1cfef2505ea52f0b88c,9479 +- clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 +- clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 +- clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,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 diff --git a/projects/simple/{{name}}.cabal b/projects/simple/{{name}}.cabal index 8ff65db..9ab6cbc 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.1 && < 1.12, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat diff --git a/simple.hsfiles b/simple.hsfiles index dd5a96f..5aed150 100644 --- a/simple.hsfiles +++ b/simple.hsfiles @@ -222,7 +222,7 @@ Note that this whole section is a `common` "stanza". We'll use it as a template Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.8.2 && < 1.10, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat @@ -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.38 +resolver: lts-24.59 ``` -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 +This project uses [lts-24.59](https://www.stackage.org/lts-24.59) and Clash +1.10.2. 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,13 @@ accum = mealy accumT 0 accumT s i = (s + i, s) {-# START_FILE stack.yaml #-} -resolver: lts-24.57 +resolver: lts-24.59 extra-deps: -- 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 +- clash-ghc-1.10.2@sha256:191e64f4b7340a803869c778d0840341c532801de169f1cfef2505ea52f0b88c,9479 +- clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 +- clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 +- clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,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 @@ -649,7 +649,7 @@ common common-options Cabal, -- clash-prelude will set suitable version bounds for the plugins - clash-prelude >= 1.10.1 && < 1.12, + clash-prelude >= 1.10.2 && < 1.12, ghc-typelits-natnormalise, ghc-typelits-extra, ghc-typelits-knownnat From d08d1809532dc6ed97f69692a4e7ceec4af14f7b Mon Sep 17 00:00:00 2001 From: rowanG077 Date: Sun, 20 Sep 2026 16:11:20 +0200 Subject: [PATCH 2/2] Add clash-shockwaves --- deca.hsfiles | 3 +++ orangecrab.hsfiles | 2 ++ projects-nix/simple-nix/flake.lock | 30 ++++++++++++++++++++++++ projects-nix/simple-nix/flake.nix | 10 ++++++-- projects-nix/simple-nix/simple-nix.cabal | 1 + projects/deca/README.md | 1 + projects/deca/{{name}}.cabal | 1 + projects/orangecrab/{{name}}.cabal | 1 + projects/simple/README.md | 1 + projects/simple/stack.yaml | 1 + projects/simple/{{name}}.cabal | 1 + simple.hsfiles | 3 +++ 12 files changed, 53 insertions(+), 2 deletions(-) diff --git a/deca.hsfiles b/deca.hsfiles index f50d7f9..12da59e 100644 --- a/deca.hsfiles +++ b/deca.hsfiles @@ -279,6 +279,7 @@ common section is some build dependencies: build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, @@ -592,6 +593,7 @@ extra-deps: - clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 - clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 - clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,1627 +- clash-shockwaves-1.1.2@sha256:42c51e6bac8f3ac19ae73769d9dc4af2e5f31cdb52a3ba3467cbfccb4034891a,5407 - 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 @@ -830,6 +832,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/orangecrab.hsfiles b/orangecrab.hsfiles index 0df0e8f..638c4b0 100644 --- a/orangecrab.hsfiles +++ b/orangecrab.hsfiles @@ -724,6 +724,7 @@ extra-deps: - clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 - clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 - clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,1627 +- clash-shockwaves-1.1.2@sha256:42c51e6bac8f3ac19ae73769d9dc4af2e5f31cdb52a3ba3467cbfccb4034891a,5407 - 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 @@ -883,6 +884,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/projects-nix/simple-nix/flake.lock b/projects-nix/simple-nix/flake.lock index ff293b5..0184094 100644 --- a/projects-nix/simple-nix/flake.lock +++ b/projects-nix/simple-nix/flake.lock @@ -25,6 +25,35 @@ "type": "github" } }, + "clash-shockwaves": { + "inputs": { + "clash-compiler": [ + "clash-compiler" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "clash-shockwaves", + "clash-compiler", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788427375, + "narHash": "sha256-rBGceJvTyNsxJ1Fr8FxEo6BbJcgr2XGXROBvpSuFJLk=", + "owner": "clash-lang", + "repo": "clash-shockwaves", + "rev": "7b268232a8a3569fba80900a79d80d79a53f8e28", + "type": "github" + }, + "original": { + "owner": "clash-lang", + "ref": "v1.1.2", + "repo": "clash-shockwaves", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -175,6 +204,7 @@ "root": { "inputs": { "clash-compiler": "clash-compiler", + "clash-shockwaves": "clash-shockwaves", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" } diff --git a/projects-nix/simple-nix/flake.nix b/projects-nix/simple-nix/flake.nix index 5f031ed..e5d58de 100644 --- a/projects-nix/simple-nix/flake.nix +++ b/projects-nix/simple-nix/flake.nix @@ -3,13 +3,18 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; clash-compiler.url = "github:clash-lang/clash-compiler?ref=v1.10.2"; + clash-shockwaves = { + url = "github:clash-lang/clash-shockwaves?ref=v1.1.2"; + inputs.clash-compiler.follows = "clash-compiler"; + inputs.flake-utils.follows = "flake-utils"; + }; }; nixConfig = { extra-substituters = [ "https://clash-lang.cachix.org" ]; extra-trusted-substituters = [ "https://clash-lang.cachix.org" ]; extra-trusted-public-keys = [ "clash-lang.cachix.org-1:/2N1uka38B/heaOAC+Ztd/EWLmF0RLfizWgC5tamCBg=" ]; }; - outputs = { self, nixpkgs, flake-utils, clash-compiler }: + outputs = { self, nixpkgs, flake-utils, clash-compiler, clash-shockwaves }: flake-utils.lib.eachDefaultSystem (system: let # A list of regular packages you want to use with your project @@ -36,7 +41,8 @@ }; # Create a set of Haskell packages including ours! - hs-pkgs = clash-pkgs.extend package-overlay; + hs-pkgs = (clash-pkgs.extend clash-shockwaves.overlays.${system}.${ghc-version}) + .extend package-overlay; # Options for `nix run` # Select the toplevel module diff --git a/projects-nix/simple-nix/simple-nix.cabal b/projects-nix/simple-nix/simple-nix.cabal index 27a2093..d1ca748 100644 --- a/projects-nix/simple-nix/simple-nix.cabal +++ b/projects-nix/simple-nix/simple-nix.cabal @@ -73,6 +73,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/projects/deca/README.md b/projects/deca/README.md index 6e211db..a505477 100644 --- a/projects/deca/README.md +++ b/projects/deca/README.md @@ -209,6 +209,7 @@ common section is some build dependencies: build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/projects/deca/{{name}}.cabal b/projects/deca/{{name}}.cabal index 9bfd673..b5897f1 100644 --- a/projects/deca/{{name}}.cabal +++ b/projects/deca/{{name}}.cabal @@ -70,6 +70,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/projects/orangecrab/{{name}}.cabal b/projects/orangecrab/{{name}}.cabal index 22ae942..2ef6d5d 100644 --- a/projects/orangecrab/{{name}}.cabal +++ b/projects/orangecrab/{{name}}.cabal @@ -73,6 +73,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/projects/simple/README.md b/projects/simple/README.md index e5bfa4b..58f6cea 100644 --- a/projects/simple/README.md +++ b/projects/simple/README.md @@ -150,6 +150,7 @@ Note that this whole section is a `common` "stanza". We'll use it as a template build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/projects/simple/stack.yaml b/projects/simple/stack.yaml index f77b754..e07896f 100644 --- a/projects/simple/stack.yaml +++ b/projects/simple/stack.yaml @@ -5,6 +5,7 @@ extra-deps: - clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 - clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 - clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,1627 +- clash-shockwaves-1.1.2@sha256:42c51e6bac8f3ac19ae73769d9dc4af2e5f31cdb52a3ba3467cbfccb4034891a,5407 - 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 diff --git a/projects/simple/{{name}}.cabal b/projects/simple/{{name}}.cabal index 9ab6cbc..bc6b402 100644 --- a/projects/simple/{{name}}.cabal +++ b/projects/simple/{{name}}.cabal @@ -73,6 +73,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, diff --git a/simple.hsfiles b/simple.hsfiles index 5aed150..f924f7a 100644 --- a/simple.hsfiles +++ b/simple.hsfiles @@ -220,6 +220,7 @@ Note that this whole section is a `common` "stanza". We'll use it as a template build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12, @@ -491,6 +492,7 @@ extra-deps: - clash-lib-1.10.2@sha256:63eb47bdc50dca927d477e986f46fe8226f92a4cc35a6f057c14849e9a13481f,15913 - clash-prelude-1.10.2@sha256:d2a76196cc09b3a343f05b48fdb689ec2dff4d0659ad10ea81a7d6d012be8b05,18778 - clash-prelude-hedgehog-1.10.2@sha256:dceb232177f99540ca5e6ab4949da2b273c8c95f81960855b2ecd159a8b4db2a,1627 +- clash-shockwaves-1.1.2@sha256:42c51e6bac8f3ac19ae73769d9dc4af2e5f31cdb52a3ba3467cbfccb4034891a,5407 - 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 @@ -647,6 +649,7 @@ common common-options build-depends: base, Cabal, + clash-shockwaves >= 1.1.2 && < 1.2, -- clash-prelude will set suitable version bounds for the plugins clash-prelude >= 1.10.2 && < 1.12,