Skip to content

Commit f5e4f24

Browse files
Merge branch 'develop-bump-cabal-versions' into develop. Close #213.
**Description** In order to keep Ogma effectively working in the current Haskell ecosystem, as well as new versions of GHC, we need to extend the versions of dependencies that Ogma can be installed with. More specifically, we currently impose a restriction on Cabal to be lower than version 3.9, which is preventing Ogma from being used in Debian sid. **Type** - Management: update versions of dependencies. **Additional context** None. **Requester** - Scott Talbert. **Method to check presence of bug** Not applicable (not a bug). **Expected result** Ogma can be installed with the most recent version of Cabal that does not require a change to the Haskell code. The following dockerfile installs Ogma using Cabal >= 3.14, after which it prints the message "Success": ``` FROM ubuntu:focal RUN apt-get update RUN apt-get install --yes \ curl g++ gcc git libgmp3-dev libz-dev make RUN mkdir -p $HOME/.local/bin ENV PATH=$PATH:/root/.local/bin/ RUN curl https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7 -o $HOME/.local/bin/ghcup RUN chmod a+x $HOME/.local/bin/ghcup ENV PATH=$PATH:/root/.ghcup/bin/ RUN ghcup install ghc 9.6 RUN ghcup install cabal 3.12 RUN ghcup set ghc 9.6.6 RUN cabal update SHELL ["/bin/bash", "-c"] CMD git clone $REPO \ && cd $NAME \ && git checkout $COMMIT \ && cabal v1-install alex happy \ && cabal v1-install BNFC \ && cabal v1-install ogma-**/ --constraint='Cabal>=3.14' \ && echo Success ``` Command (substitute variables based on new path after merge): ```sh $ docker run -e "REPO=https://github.com/NASA/ogma" -e "NAME=ogma" -e "COMMIT=<HASH>" -it ogma-verify-213 ``` **Solution implemented** Modify version bounds in all Ogma packages depending directly on Cabal to allow installation with versions of Cabal lower than 3.15. **Further notes** None.
2 parents b810bc3 + 26276b5 commit f5e4f24

File tree

8 files changed

+14
-6
lines changed

8 files changed

+14
-6
lines changed

ogma-extra/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Revision history for ogma-extra
22

3+
## [1.X.Y] - 2025-01-30
4+
* Bump upper version constraint on Cabal (#213).
5+
36
## [1.6.0] - 2025-01-21
47

58
* Version bump 1.6.0 (#208).

ogma-extra/ogma-extra.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ library
7777
base >= 4.11.0.0 && < 5
7878
, aeson >= 2.0.0.0 && < 2.2
7979
, bytestring >= 0.10.8.2 && < 0.13
80-
, Cabal >= 2.2.0.0 && < 3.9
80+
, Cabal >= 2.2.0.0 && < 3.15
8181
, directory >= 1.3.1.5 && < 1.4
8282
, filepath >= 1.4.2 && < 1.6
8383
, microstache >= 1.0 && < 1.1

ogma-language-c/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Revision history for ogma-language-c
22

3+
## [1.X.Y] - 2025-01-30
4+
* Bump upper version constraint on Cabal (#213).
5+
36
## [1.6.0] - 2025-01-21
47

58
* Version bump 1.6.0 (#208).

ogma-language-c/ogma-language-c.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ source-repository head
7070
custom-setup
7171
setup-depends:
7272
base >= 4.11.0.0 && < 5
73-
, Cabal >= 2.0 && < 3.9
73+
, Cabal >= 2.0 && < 3.15
7474
, process >= 1.6 && < 1.7
7575
, BNFC >= 2.9.1 && < 2.10
7676

ogma-language-cocospec/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Revision history for ogma-language-cocospec
22

3-
## [1.X.Y] - 2025-01-27
3+
## [1.X.Y] - 2025-01-30
44

55
* Remove references to old design of Ogma from documentation (#220).
6+
* Bump upper version constraint on Cabal (#213).
67

78
## [1.6.0] - 2025-01-21
89

ogma-language-cocospec/ogma-language-cocospec.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ source-repository head
7070
custom-setup
7171
setup-depends:
7272
base >= 4.11.0.0 && < 5
73-
, Cabal >= 2.0 && < 3.9
73+
, Cabal >= 2.0 && < 3.15
7474
, process >= 1.6 && < 1.7
7575
, BNFC >= 2.9.1 && < 2.10
7676

ogma-language-smv/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Revision history for ogma-language-smv
22

3-
## [1.X.Y] - 2025-01-27
3+
## [1.X.Y] - 2025-01-30
44

55
* Remove references to old design of Ogma from documentation (#220).
6+
* Bump upper version constraint on Cabal (#213).
67

78
## [1.6.0] - 2025-01-21
89

ogma-language-smv/ogma-language-smv.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ source-repository head
7070
custom-setup
7171
setup-depends:
7272
base >= 4.11.0.0 && < 5
73-
, Cabal >= 2.0 && < 3.9
73+
, Cabal >= 2.0 && < 3.15
7474
, process >= 1.6 && < 1.7
7575
, BNFC >= 2.9.1 && < 2.10
7676

0 commit comments

Comments
 (0)