From 7c3bf15dd135d97d8dafea83868ce1790d2d065b Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 6 Mar 2020 08:54:34 +0000 Subject: Upgrading packages to work with 8.2.2 --- default.nix | 4 ++-- verismith.cabal | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/default.nix b/default.nix index 9093557..516691e 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,9 @@ { nixpkgs ? null, compiler ? "ghc865", doBenchmark ? false } : let pinnedPkg = builtins.fetchGit { - name = "nixos-unstable-2019-10-06"; + name = "nixos-unstable-2020-03-06"; url = https://github.com/nixos/nixpkgs/; - rev = "271fef8a4eb03cd9de0c1fe2f0b7f4a16c2de49a"; + rev = "93ba4ecd58602d3f69f74f9d45d60a8f949544e2"; }; npkgs = if nixpkgs == null then import pinnedPkg {} diff --git a/verismith.cabal b/verismith.cabal index b2f0562..e88d3df 100644 --- a/verismith.cabal +++ b/verismith.cabal @@ -83,7 +83,7 @@ library , binary >= 0.8.5.1 && <0.9 , blaze-html >=0.9.0.1 && <0.10 , bytestring >=0.10 && <0.11 - , cryptonite >=0.25 && <0.26 + , cryptonite >=0.25 && <0.27 , deepseq >= 1.4.3.0 && <1.5 , exceptions >=0.10.0 && <0.11 , fgl >=5.6 && <5.8 @@ -91,23 +91,23 @@ library , filepath >=1.4.2 && <1.5 , gitrev >= 1.3.1 && <1.4 , hedgehog >=1.0 && <1.2 - , lens >=4.16.1 && <4.18 + , lens >=4.16.1 && <4.19 , lifted-base >=0.2.3 && <0.3 - , memory >=0.14 && <0.15 + , memory >=0.14 && <0.16 , monad-control >=1.0.2 && <1.1 , mtl >=2.2.2 && <2.3 - , optparse-applicative >=0.14 && <0.15 + , optparse-applicative >=0.14 && <0.16 , parsec >=3.1 && <3.2 - , prettyprinter >=1.2.0.1 && <1.3 + , prettyprinter >=1.2.0.1 && <1.7 , random >=1.1 && <1.2 , recursion-schemes >=5.0.2 && <5.2 , shakespeare >=2 && <2.1 - , shelly >=1.8.0 && <1.9 + , shelly >=1.8.0 && <1.10 , statistics >=0.14.0.2 && <0.16 - , template-haskell >=2.13.0 && <2.15 + , template-haskell >=2.13.0 && <2.16 , text >=1.2 && <1.3 - , time >= 1.8.0.2 && <1.9 - , tomland >=1.0 && <1.2 + , time >= 1.8.0.2 && <1.10 + , tomland >=1.0 && <1.3 , transformers >=0.5 && <0.6 , transformers-base >=0.4.5 && <0.5 , unordered-containers >=0.2.10 && <0.3 @@ -131,7 +131,7 @@ benchmark benchmark build-depends: base >=4 && <5 , verismith , criterion >=1.5.5 && <1.6 - , lens >=4.16.1 && <4.18 + , lens >=4.16.1 && <4.19 default-extensions: OverloadedStrings test-suite test @@ -147,7 +147,7 @@ test-suite test , verismith , fgl >=5.6 && <5.8 , hedgehog >=1.0 && <1.2 - , lens >=4.16.1 && <4.18 + , lens >=4.16.1 && <4.19 , parsec >= 3.1 && < 3.2 , shakespeare >=2 && <2.1 , tasty >=1.0.1.1 && <1.3 -- cgit From 0d51cfd64b5483883266d19add7763bbdd298652 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 6 Mar 2020 09:30:55 +0000 Subject: Change build to simple --- verismith.cabal | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/verismith.cabal b/verismith.cabal index e88d3df..99605c2 100644 --- a/verismith.cabal +++ b/verismith.cabal @@ -1,5 +1,5 @@ name: verismith -version: 1.0.0.0 +version: 1.0.0.1 synopsis: Random verilog generation and simulator testing. description: Verismith provides random verilog generation modules @@ -11,7 +11,7 @@ author: Yann Herklotz maintainer: yann [at] yannherklotz [dot] com copyright: 2018-2020 Yann Herklotz category: Hardware -build-type: Custom +build-type: Simple cabal-version: >=1.10 extra-source-files: README.md , examples/*.v @@ -29,12 +29,6 @@ source-repository this location: https://github.com/ymherklotz/verismith tag: v1.0.0.0 -custom-setup - setup-depends: - base >= 4 && <5, - cabal-doctest >= 1 && <1.1, - Cabal >= 1.10 && <2.5 - library hs-source-dirs: src default-language: Haskell2010 -- cgit From cbd95181877b79b259ec5293f30896186ce55682 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 6 Mar 2020 09:40:06 +0000 Subject: Change setup for default build --- Setup.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Setup.hs b/Setup.hs index bdfe8ae..c0cac3b 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,4 +1,4 @@ -import Distribution.Extra.Doctest +import Distribution.Simple main :: IO () -main = defaultMainWithDoctests "doctest" +main = defaultMain -- cgit From 04d0683a98cda28f8f56e3505ad358fa747dee1f Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 6 Mar 2020 09:47:44 +0000 Subject: Bump version to stable 1.0.0.2 --- verismith.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verismith.cabal b/verismith.cabal index 99605c2..43280d5 100644 --- a/verismith.cabal +++ b/verismith.cabal @@ -1,5 +1,5 @@ name: verismith -version: 1.0.0.1 +version: 1.0.0.2 synopsis: Random verilog generation and simulator testing. description: Verismith provides random verilog generation modules -- cgit From 75df0ab8508723ed171727727aa8e61e0cc25f94 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 6 Mar 2020 15:11:12 +0000 Subject: New travis build --- .travis.yml | 11 +++++++++++ scripts/build.sh | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100755 scripts/build.sh diff --git a/.travis.yml b/.travis.yml index dd99ef4..942cd62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,14 @@ language: nix # automatically runs nix-build git: depth: 3 # not 1 to build commits in the queue + +jobs: + include: + - name: "Cabal build" + env: NIX=0 + - name: "Nix build" + env: NIX=1 + +before_script: nix-env -i cabal ghc + +script: ./scripts/build.sh diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..838b9a8 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [[ -z $NIX ]]; then + if [[ $NIX -eq 0 ]]; then + cabal update + cabal build + else + nix-build + fi +fi + -- cgit From a4017a4c75d7b893247f05d4f8fa2736eb8eebe1 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 7 Mar 2020 14:19:40 +0000 Subject: Fix travis build and .envrc --- .envrc | 9 ++++++++- .travis.yml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index 4a4726a..f4c5cf4 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,8 @@ -use_nix +command -v lorri >/dev/null 2>&1 +lorri_available=$? + +if [[ $lorri_available -eq 0 ]]; then + eval "$(lorri direnv)" +else + use nix +fi diff --git a/.travis.yml b/.travis.yml index 942cd62..4ee507a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ jobs: - name: "Nix build" env: NIX=1 -before_script: nix-env -i cabal ghc +before_script: nix-env -i cabal-install ghc script: ./scripts/build.sh -- cgit From 4d7bbc25449ea6105427560c95ea3f65da6bfe59 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 7 Mar 2020 14:23:01 +0000 Subject: Update build script to run in bash --- .travis.yml | 2 +- scripts/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ee507a..7b29dcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ jobs: - name: "Nix build" env: NIX=1 -before_script: nix-env -i cabal-install ghc +before_script: if [[ $NIX -eq 0 ]]; then nix-env -i cabal-install ghc; fi script: ./scripts/build.sh diff --git a/scripts/build.sh b/scripts/build.sh index 838b9a8..8a1f71b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if [[ -z $NIX ]]; then if [[ $NIX -eq 0 ]]; then -- cgit From 817f1c7ba3b2bd43b2ed7164b90008871850b913 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 7 Mar 2020 14:25:04 +0000 Subject: Add not condition --- scripts/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 8a1f71b..266a0ee 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,11 +1,10 @@ #!/bin/bash -if [[ -z $NIX ]]; then - if [[ $NIX -eq 0 ]]; then +if ! [[ -z $NIX ]]; then + if [[ $NIX -eq 0 ]]; then cabal update cabal build else nix-build fi fi - -- cgit From 7e285ff81af1a0fd54a6cff5e46240cb220a8d62 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 7 Mar 2020 14:26:47 +0000 Subject: Fix formatting of build --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 266a0ee..a08a179 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/bash if ! [[ -z $NIX ]]; then - if [[ $NIX -eq 0 ]]; then + if [[ $NIX -eq 0 ]]; then cabal update cabal build else -- cgit From 27779e32f9364f278d727cb39e0881ecf44922c5 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 7 Mar 2020 14:35:37 +0000 Subject: Add caching for cabal to travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7b29dcb..8b9190b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ jobs: - name: "Nix build" env: NIX=1 +cache: + directories: + - $HOME/.cabal + before_script: if [[ $NIX -eq 0 ]]; then nix-env -i cabal-install ghc; fi script: ./scripts/build.sh -- cgit From feb21582faab8a30e5e9180420f4449764a11a9b Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 7 Mar 2020 15:57:31 +0000 Subject: Update documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 398a7d6..b552eb3 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Some external packages are required to use Verismith properly: A stable version of Verismith is available on [hackage](https://hackage.haskell.org/package/verismith) and can be installed using cabal directly without having to build the project from the repository: -**Note**: Only **GHC 8.6.5** is currently supported, work is going on to support newer versions of GHC. +**Note**: Only **GHC 8.6.5-8.8.2 ** are currently supported. ``` shell cabal install verismith -- cgit