Cabal flag to allow embedding Agda 2.6.2.2 instead of 2.6.3

agda · Nov 23, 2023 · 6b0386c · 6b0386c
1 parent df8fb16
commit 6b0386c
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## v0.2.6.3.0 - 2023-11-23
 
 ### Changed
-- Bundle Agda-2.6.3.
+- Embed Agda-2.6.3.
 - Builds with `lsp` < 1.7 on GHC 8.10 (LTS 18.28), 9.0 (LTS 19.33), and 9.2 (LTS 20.26),
   and with Cabal also on 9.4 and 9.6.
 
+### Added
+- Build flag `Agda-2-6-2-2` to embed Agda-2.6.2.2 rather than 2.6.3.
+
 ## v0.2.6.2.2.1 - 2023-11-21
 
 ### Added
@@ -22,7 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 
-- Bundle Agda-2.6.2.2.
+- Embed Agda-2.6.2.2.
 - Versioning scheme: _x.a.b.c.d.y_ where _a.b.c.d_ is the 4-digit Agda version (2.6.2.2), _x_ is 0 but may be bumped for revolutionary changes to the agda-language-server, and _y_ is for patch releases.
 - Builds with `lsp` < 1.5 on GHC 8.10 (LTS 18.28) and 9.0 (LTS 19.33).
 

diff --git a/agda-language-server.cabal b/agda-language-server.cabal
@@ -30,6 +30,11 @@ source-repository head
   type: git
   location: https://github.com/banacorn/agda-language-server
 
+flag Agda-2-6-2-2
+  description: Embed Agda-2.6.2.2 (rather than 2.6.3)
+  manual: True
+  default: False
+
 library
   exposed-modules:
       Agda
@@ -67,7 +72,7 @@ library
       TypeOperators
   ghc-options: -Wincomplete-patterns -Wunused-do-bind -Wunused-foralls -Wwarnings-deprecations -Wwrong-do-bind -Wmissing-fields -Wmissing-methods -Wmissing-pattern-synonym-signatures -Wmissing-signatures -Werror=incomplete-patterns -fno-warn-orphans
   build-depends:
-      Agda ==2.6.3
+      Agda
     , aeson
     , base >=4.7 && <5
     , bytestring
@@ -81,6 +86,12 @@ library
     , strict
     , text
   default-language: Haskell2010
+  if flag(Agda-2-6-2-2)
+    build-depends:
+        Agda ==2.6.2.2
+  else
+    build-depends:
+        Agda ==2.6.3
 
 executable als
   main-is: Main.hs
@@ -94,7 +105,7 @@ executable als
       TypeOperators
   ghc-options: -Wincomplete-patterns -Wunused-do-bind -Wunused-foralls -Wwarnings-deprecations -Wwrong-do-bind -Wmissing-fields -Wmissing-methods -Wmissing-pattern-synonym-signatures -Wmissing-signatures -threaded -rtsopts -with-rtsopts=-N -Werror=incomplete-patterns -fno-warn-orphans
   build-depends:
-      Agda ==2.6.3
+      Agda
     , aeson
     , agda-language-server
     , base >=4.7 && <5
@@ -109,6 +120,12 @@ executable als
     , strict
     , text
   default-language: Haskell2010
+  if flag(Agda-2-6-2-2)
+    build-depends:
+        Agda ==2.6.2.2
+  else
+    build-depends:
+        Agda ==2.6.3
 
 test-suite als-test
   type: exitcode-stdio-1.0
@@ -150,7 +167,7 @@ test-suite als-test
       TypeOperators
   ghc-options: -Wincomplete-patterns -Wunused-do-bind -Wunused-foralls -Wwarnings-deprecations -Wwrong-do-bind -Wmissing-fields -Wmissing-methods -Wmissing-pattern-synonym-signatures -Wmissing-signatures -threaded -rtsopts -with-rtsopts=-N -Werror=incomplete-patterns -fno-warn-orphans
   build-depends:
-      Agda ==2.6.3
+      Agda
     , aeson
     , base >=4.7 && <5
     , bytestring
@@ -168,3 +185,9 @@ test-suite als-test
     , tasty-quickcheck
     , text
   default-language: Haskell2010
+  if flag(Agda-2-6-2-2)
+    build-depends:
+        Agda ==2.6.2.2
+  else
+    build-depends:
+        Agda ==2.6.3
diff --git a/package.yaml b/package.yaml
@@ -24,14 +24,24 @@ category:            Development
 # common to point users to the README.md file.
 description:         Please see the README on GitHub at <https://github.com/agda/agda-language-server#readme>
 
-default-extensions:
-- LambdaCase
-- OverloadedStrings
-- TypeOperators
+flags:
+  Agda-2-6-2-2:
+    description: Embed Agda-2.6.2.2 (rather than 2.6.3)
+    manual: true
+    default: false
+
+when:
+- condition: flag(Agda-2-6-2-2)
+  then:
+    dependencies:
+    - Agda == 2.6.2.2
+  else:
+    dependencies:
+    - Agda == 2.6.3
 
 dependencies:
   - base >= 4.7 && < 5
-  - Agda == 2.6.3
+  - Agda
   - aeson
   - bytestring
   - containers
@@ -44,6 +54,11 @@ dependencies:
   - text
   - process
 
+default-extensions:
+- LambdaCase
+- OverloadedStrings
+- TypeOperators
+
 library:
   source-dirs: src
   ghc-options:

diff --git a/stack-8.10-Agda-2.6.2.2.yaml b/stack-8.10-Agda-2.6.2.2.yaml
@@ -14,6 +14,8 @@ extra-deps:
 - lsp-types-1.3.0.1
 
 flags:
+  agda-language-server:
+    Agda-2-6-2-2: true
   Agda:
     # optimise-heavily: true
     enable-cluster-counting: true
diff --git a/stack-9.0-Agda-2.6.2.2.yaml b/stack-9.0-Agda-2.6.2.2.yaml
@@ -12,6 +12,8 @@ extra-deps:
 # - Agda-2.6.2.2  # This is the lts-19.33 version of Agda
 
 flags:
+  agda-language-server:
+    Agda-2-6-2-2: true
   Agda:
     # optimise-heavily: true
     enable-cluster-counting: true
diff --git a/stack-9.2-Agda-2.6.2.2.yaml b/stack-9.2-Agda-2.6.2.2.yaml
@@ -10,6 +10,8 @@ extra-deps:
 - Agda-2.6.2.2
 
 flags:
+  agda-language-server:
+    Agda-2-6-2-2: true
   Agda:
     # optimise-heavily: true
     enable-cluster-counting: true