Skip to content

Commit 8f783ee

Browse files
Merge remote-tracking branch 'kaBeech/develop-version-bounds'. Close #570.
**Description** In order to keep Copilot effectively working in the current Haskell ecosystem, as well as new versions of GHC, we need to extend the versions of dependencies that Copilot can be installed with. For example, `filepath` has seen releases in the 1.5.* series, but `copilot` and `copilot-c99` need versions strictly lower than 1.5. The same is true for `containers`, of which we depend on versions prior to 0.7 but version 0.7 has been released, and `data-default`, of which we depend on versions prior to 0.8 but version 0.8.0.0 has been released. For those libraries that have introduced no breaking changes affecting Copilot, we should extend the version bounds. **Type** - Management: update versions of dependencies. **Additional context** None. **Requester** - Jens Petersen. **Method to check presence of bug** Not applicable (not a bug). **Expected result** Copilot can be installed with the most recent version of all dependencies published on hackage that do not require a change to the Haskell code. The following Dockerfile checks that Copilot can be installed with the recent versions of filepath, containers and data-default, as well as GHC (9.10 since 9.12 is not currently available in GHCUP), after which it prints the message "Success": ```Dockerfile FROM ubuntu:focal ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update RUN apt-get install --yes libz-dev RUN apt-get install --yes git RUN apt-get install --yes wget RUN mkdir -p $HOME/.ghcup/bin RUN wget https://downloads.haskell.org/~ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 -O $HOME/.ghcup/bin/ghcup RUN chmod a+x $HOME/.ghcup/bin/ghcup ENV PATH=$PATH:/root/.ghcup/bin/ ENV PATH=$PATH:/root/.cabal/bin/ RUN apt-get install --yes curl RUN apt-get install --yes gcc g++ make libgmp3-dev RUN apt-get install --yes pkg-config SHELL ["/bin/bash", "-c"] RUN ghcup install ghc 9.10 RUN ghcup install cabal 3.2 RUN ghcup set ghc 9.10 RUN cabal update SHELL ["/bin/bash", "-c"] CMD git clone $REPO && cd $NAME && git checkout $COMMIT && cd .. \ && cabal v1-sandbox init \ && cabal v1-install alex happy --constraint='happy <= 2' \ && cabal v1-install $NAME/copilot**/ --constraint='filepath>=1.5' --constraint='containers>=0.7' --constraint='data-default>=0.8' \ && echo "Success" ``` Command (substitute variables based on new path after merge): ``` $ docker run -e "REPO=https://github.com/Copilot-Language/copilot" -e "NAME=copilot" -e "COMMIT=<HASH>" -it copilot-verify-570 ``` **Solution implemented** Bump the version constraints on filepath, containers and data-default to include the latest versions available on hackage. **Further notes** These issues have made Copilot drop out of GHC 9.10 Stackage Nightly. Stackage is generally useful to get Copilot installed, and specially to facilitate having packages on Fedora.
2 parents 86a9ce0 + a31eb04 commit 8f783ee

File tree

10 files changed

+19
-8
lines changed

10 files changed

+19
-8
lines changed

copilot-c99/CHANGELOG

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
2024-12-20
1+
2025-01-02
22
* Remove uses of Copilot.Core.Expr.UExpr.uExprType. (#565)
33
* Allow using same trigger name in multiple declarations. (#296)
4+
* Bump upper version constraint on filepath. (#570)
45

56
2024-11-07
67
* Version bump (4.1). (#561)

copilot-c99/copilot-c99.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
ghc-options : -Wall
4242
build-depends : base >= 4.9 && < 5
4343
, directory >= 1.3 && < 1.4
44-
, filepath >= 1.4 && < 1.5
44+
, filepath >= 1.4 && < 1.6
4545
, mtl >= 2.2 && < 2.4
4646
, pretty >= 1.1 && < 1.2
4747

copilot-language/CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2025-01-02
2+
* Bump upper version constraint on containers. (#570)
3+
14
2024-11-07
25
* Version bump (4.1). (#561)
36
* Reject duplicate externs in properties and theorems. (#536)

copilot-language/copilot-language.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ library
3838
build-depends: base >= 4.9 && < 5
3939

4040
, array >= 0.5 && < 0.6
41-
, containers >= 0.4 && < 0.7
41+
, containers >= 0.4 && < 0.8
4242
, data-reify >= 0.6 && < 0.7
4343
, mtl >= 2.0 && < 3
4444

copilot-libraries/CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2025-01-02
2+
* Bump upper version constraint on containers. (#570)
3+
14
2024-11-07
25
* Version bump (4.1). (#561)
36
* Standardize changelog format. (#550)

copilot-libraries/copilot-libraries.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ library
3838

3939
build-depends: base >= 4.9 && < 5
4040

41-
, containers >= 0.4 && < 0.7
41+
, containers >= 0.4 && < 0.8
4242
, mtl >= 2.0 && < 2.4
4343
, parsec >= 2.0 && < 3.2
4444
, copilot-language >= 4.1 && < 4.2

copilot-theorem/CHANGELOG

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
2024-11-15
1+
2025-01-02
22
* Remove uses of Copilot.Core.Expr.UExpr.uExprType,uExprExpr. (#565)
3+
* Bump upper constraint on containers, data-default. (#570)
34

45
2024-11-07
56
* Version bump (4.1). (#561)

copilot-theorem/copilot-theorem.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ library
4848
build-depends : base >= 4.9 && < 5
4949
, bimap (>= 0.3 && < 0.4) || (>= 0.5 && < 0.6)
5050
, bv-sized >= 1.0.2 && < 1.1
51-
, containers >= 0.4 && < 0.7
52-
, data-default >= 0.7 && < 0.8
51+
, containers >= 0.4 && < 0.8
52+
, data-default >= 0.7 && < 0.9
5353
, directory >= 1.3 && < 1.4
5454
, libBF >= 0.6.2 && < 0.7
5555
, mtl >= 2.0 && < 2.4

copilot/CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2025-01-02
2+
* Bump upper version constraint on filepath. (#570)
3+
14
2024-11-07
25
* Version bump (4.1). (#561)
36
* Update contribution guidelines. (#476)

copilot/copilot.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ library
5050
base >= 4.9 && < 5
5151
, optparse-applicative >= 0.14 && < 0.19
5252
, directory >= 1.3 && < 1.4
53-
, filepath >= 1.4 && < 1.5
53+
, filepath >= 1.4 && < 1.6
5454

5555
, copilot-core >= 4.1 && < 4.2
5656
, copilot-theorem >= 4.1 && < 4.2

0 commit comments

Comments
 (0)