Merge branch 'release-v0.6.4'

* release-v0.6.4: Bump version and update changelogs Use custom Stack snapshot to avoid rebuilding extra-deps Lower lower bounds Update deps and stack.yaml files Show log if nix-build fails Provide explicit lower bounds for dependencies of rzk
rzk-lang · Sep 27, 2023 · d5611bc · d5611bc
2 parents 6969508 + 699050d
commit d5611bc
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 201 deletions.
diff --git a/.github/workflows/ghcjs.yml b/.github/workflows/ghcjs.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: 🔨 Build GHCJS version with Nix
         run: |
-          nix build .#try-rzk
+          nix build .#try-rzk || (nix log /nix/store/*-rzk-0.6.3.drv ; false)
 
       - name: 🔨 Collect build artifacts
         run: |

diff --git a/docs/docs/getting-started/changelog.md b/docs/docs/getting-started/changelog.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the
 [Haskell Package Versioning Policy](https://pvp.haskell.org/).
 
+## v0.6.4 — 2023-09-27
+
+This version improves the stucture of the project, in particular w.r.t dependencies:
+
+- Add custom snapshot and explicit lower bounds (see [#108](https://github.com/rzk-lang/rzk/pull/108))
+
 ## v0.6.3 — 2023-09-27
 
 This version contains a fix for the command line interface of `rzk`:

diff --git a/rzk/ChangeLog.md b/rzk/ChangeLog.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the
 [Haskell Package Versioning Policy](https://pvp.haskell.org/).
 
+## v0.6.4 — 2023-09-27
+
+This version improves the stucture of the project, in particular w.r.t dependencies:
+
+- Add custom snapshot and explicit lower bounds (see [#108](https://github.com/rzk-lang/rzk/pull/108))
+
 ## v0.6.3 — 2023-09-27
 
 This version contains a fix for the command line interface of `rzk`:

diff --git a/rzk/package.yaml b/rzk/package.yaml
@@ -1,5 +1,5 @@
 name: rzk
-version: 0.6.3
+version: 0.6.4
 github: 'rzk-lang/rzk'
 license: BSD3
 author: 'Nikolai Kudasov'
@@ -18,26 +18,33 @@ category: Dependent Types # same as Agda
 # common to point users to the README.md file.
 description: Please see the README on GitHub at <https://github.com/rzk-lang/rzk#readme>
 
+flags:
+  lsp:
+    description: >-
+      Build with LSP support.
+    manual: true
+    default: true
+
 build-tools:
-  - alex
-  - happy
+  alex:   ">= 3.2.4"
+  happy:  ">= 1.19.9"
 
 dependencies:
-  - array
-  - aeson
-  - base >= 4.7 && < 5
-  - bifunctors
-  - bytestring
-  - mtl
-  - template-haskell
-  - text
-  - optparse-generic
-  - Glob
-  - lens
-  - filepath
-  - stm
-  - yaml
-  - data-default-class
+  array: ">= 0.5.3.0"
+  aeson: ">= 1.4.2.0"
+  base: ">= 4.7 && < 5"
+  bifunctors: ">= 5.5.3"
+  bytestring: ">= 0.10.8.2"
+  mtl: ">= 2.2.2"
+  template-haskell: ">= 2.14.0.0"
+  text: ">= 1.2.3.1"
+  optparse-generic: ">= 1.3.0"
+  Glob: ">= 0.9.3"
+  lens: ">= 4.17"
+  filepath: ">= 1.4.2.1"
+  stm: ">= 2.5.0.0"
+  yaml: ">= 0.11.0.0"
+  data-default-class: ">= 0.1.2.0"
 
 ghc-options:
   - -Wall
@@ -58,16 +65,16 @@ library:
         - Language.Rzk.Syntax.Test
         - Language.Rzk.Syntax.ErrM
         - Language.Rzk.Syntax.Skel
-    - condition: '!impl(ghcjs)'
+    - condition: flag(lsp) && !impl(ghcjs)
       exposed-modules:
         - Language.Rzk.VSCode.Env
         - Language.Rzk.VSCode.Handlers
         - Language.Rzk.VSCode.Lsp
         - Language.Rzk.VSCode.State
         - Language.Rzk.VSCode.Tokenize
       dependencies:
-        - lsp
-        - lsp-types
+        lsp: ">= 2.1.0.0"
+        lsp-types: ">= 2.0.1.0"
 
 executables:
   rzk:
@@ -80,9 +87,9 @@ executables:
     dependencies:
       - rzk
     when:
-      - condition: '!impl(ghcjs)'
+      - condition: flag(lsp) && !impl(ghcjs)
         dependencies:
-          - with-utf8
+          with-utf8: ">= 1.0.2.4"
 
 tests:
   rzk-test:

diff --git a/rzk/rzk.cabal b/rzk/rzk.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           rzk
-version:        0.6.3
+version:        0.6.4
 synopsis:       An experimental proof assistant for synthetic ∞-categories
 description:    Please see the README on GitHub at <https://github.com/rzk-lang/rzk#readme>
 category:       Dependent Types
@@ -25,6 +25,11 @@ source-repository head
   type: git
   location: https://github.com/rzk-lang/rzk
 
+flag lsp
+  description: Build with LSP support.
+  manual: True
+  default: True
+
 library
   exposed-modules:
       Free.Scoped
@@ -45,35 +50,35 @@ library
       src
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-tools:
-      alex
-    , happy
+      alex >=3.2.4
+    , happy >=1.19.9
   build-depends:
-      Glob
-    , aeson
-    , array
+      Glob >=0.9.3
+    , aeson >=1.4.2.0
+    , array >=0.5.3.0
     , base >=4.7 && <5
-    , bifunctors
-    , bytestring
-    , data-default-class
-    , filepath
-    , lens
-    , mtl
-    , optparse-generic
-    , stm
-    , template-haskell
-    , text
-    , yaml
+    , bifunctors >=5.5.3
+    , bytestring >=0.10.8.2
+    , data-default-class >=0.1.2.0
+    , filepath >=1.4.2.1
+    , lens >=4.17
+    , mtl >=2.2.2
+    , optparse-generic >=1.3.0
+    , stm >=2.5.0.0
+    , template-haskell >=2.14.0.0
+    , text >=1.2.3.1
+    , yaml >=0.11.0.0
   default-language: Haskell2010
-  if !impl(ghcjs)
+  if flag(lsp) && !impl(ghcjs)
     exposed-modules:
         Language.Rzk.VSCode.Env
         Language.Rzk.VSCode.Handlers
         Language.Rzk.VSCode.Lsp
         Language.Rzk.VSCode.State
         Language.Rzk.VSCode.Tokenize
     build-depends:
-        lsp
-      , lsp-types
+        lsp >=2.1.0.0
+      , lsp-types >=2.0.1.0
 
 executable rzk
   main-is: Main.hs
@@ -83,29 +88,29 @@ executable rzk
       app
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-tools:
-      alex
-    , happy
+      alex >=3.2.4
+    , happy >=1.19.9
   build-depends:
-      Glob
-    , aeson
-    , array
+      Glob >=0.9.3
+    , aeson >=1.4.2.0
+    , array >=0.5.3.0
     , base >=4.7 && <5
-    , bifunctors
-    , bytestring
-    , data-default-class
-    , filepath
-    , lens
-    , mtl
-    , optparse-generic
+    , bifunctors >=5.5.3
+    , bytestring >=0.10.8.2
+    , data-default-class >=0.1.2.0
+    , filepath >=1.4.2.1
+    , lens >=4.17
+    , mtl >=2.2.2
+    , optparse-generic >=1.3.0
     , rzk
-    , stm
-    , template-haskell
-    , text
-    , yaml
+    , stm >=2.5.0.0
+    , template-haskell >=2.14.0.0
+    , text >=1.2.3.1
+    , yaml >=0.11.0.0
   default-language: Haskell2010
-  if !impl(ghcjs)
+  if flag(lsp) && !impl(ghcjs)
     build-depends:
-        with-utf8
+        with-utf8 >=1.0.2.4
 
 test-suite doctests
   type: exitcode-stdio-1.0
@@ -114,26 +119,26 @@ test-suite doctests
       test
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-tools:
-      alex
-    , happy
+      alex >=3.2.4
+    , happy >=1.19.9
   build-depends:
       Glob
     , QuickCheck
-    , aeson
-    , array
+    , aeson >=1.4.2.0
+    , array >=0.5.3.0
     , base
-    , bifunctors
-    , bytestring
-    , data-default-class
+    , bifunctors >=5.5.3
+    , bytestring >=0.10.8.2
+    , data-default-class >=0.1.2.0
     , doctest
-    , filepath
-    , lens
-    , mtl
-    , optparse-generic
-    , stm
+    , filepath >=1.4.2.1
+    , lens >=4.17
+    , mtl >=2.2.2
+    , optparse-generic >=1.3.0
+    , stm >=2.5.0.0
     , template-haskell
-    , text
-    , yaml
+    , text >=1.2.3.1
+    , yaml >=0.11.0.0
   default-language: Haskell2010
 
 test-suite rzk-test
@@ -145,23 +150,23 @@ test-suite rzk-test
       test
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-tools:
-      alex
-    , happy
+      alex >=3.2.4
+    , happy >=1.19.9
   build-depends:
-      Glob
-    , aeson
-    , array
+      Glob >=0.9.3
+    , aeson >=1.4.2.0
+    , array >=0.5.3.0
     , base >=4.7 && <5
-    , bifunctors
-    , bytestring
-    , data-default-class
-    , filepath
-    , lens
-    , mtl
-    , optparse-generic
+    , bifunctors >=5.5.3
+    , bytestring >=0.10.8.2
+    , data-default-class >=0.1.2.0
+    , filepath >=1.4.2.1
+    , lens >=4.17
+    , mtl >=2.2.2
+    , optparse-generic >=1.3.0
     , rzk
-    , stm
-    , template-haskell
-    , text
-    , yaml
+    , stm >=2.5.0.0
+    , template-haskell >=2.14.0.0
+    , text >=1.2.3.1
+    , yaml >=0.11.0.0
   default-language: Haskell2010
diff --git a/rzk/rzk.nix b/rzk/rzk.nix
@@ -5,7 +5,7 @@
 }:
 mkDerivation {
   pname = "rzk";
-  version = "0.6.3";
+  version = "0.6.4";
   src = ./.;
   isLibrary = true;
   isExecutable = true;

diff --git a/snapshot.yaml b/snapshot.yaml
@@ -0,0 +1,8 @@
+resolver: nightly-2023-04-09
+name: rzk-snapshot
+packages:
+  - with-utf8-1.0.2.4
+  - lsp-2.1.0.0
+  - lsp-types-2.0.1.0
+  - row-types-1.0.1.2
+
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -2,4 +2,8 @@ resolver:
   url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml
 
 packages:
-- rzk/
+  - rzk/
+
+flags:
+  rzk:
+    lsp: false