Skip to content
Open
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
23 changes: 13 additions & 10 deletions deca.hsfiles
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,10 @@ 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.6.4 && < 1.8,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -370,11 +371,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.

Expand Down Expand Up @@ -585,13 +586,14 @@ 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
- 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
Expand Down Expand Up @@ -830,9 +832,10 @@ 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.1 && < 1.12,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down
14 changes: 8 additions & 6 deletions orangecrab.hsfiles
Original file line number Diff line number Diff line change
Expand Up @@ -717,13 +717,14 @@ 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
- 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
Expand Down Expand Up @@ -883,9 +884,10 @@ 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.1 && < 1.12,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down
74 changes: 52 additions & 22 deletions projects-nix/simple-nix/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions projects-nix/simple-nix/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@
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";
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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion projects-nix/simple-nix/simple-nix.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ 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.1 && < 1.12,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down
9 changes: 5 additions & 4 deletions projects/deca/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,10 @@ 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.6.4 && < 1.8,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -300,11 +301,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.

Expand Down
3 changes: 2 additions & 1 deletion projects/deca/{{name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ 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.1 && < 1.12,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down
3 changes: 2 additions & 1 deletion projects/orangecrab/{{name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ 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.1 && < 1.12,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down
9 changes: 5 additions & 4 deletions projects/simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,10 @@ 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.8.2 && < 1.10,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -223,11 +224,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.

Expand Down
11 changes: 6 additions & 5 deletions projects/simple/stack.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
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
- 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
Expand Down
3 changes: 2 additions & 1 deletion projects/simple/{{name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ 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.1 && < 1.12,
clash-prelude >= 1.10.2 && < 1.12,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down
Loading
Loading