Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #815

Closed
wants to merge 7 commits into from
Closed

Update dependencies #815

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
635287d
Update to latest Dream
MisterDA Dec 12, 2023
1fb7b9b
Link with Dream in templates
MisterDA Dec 12, 2023
bc4e92d
Bump omd lower-bound
MisterDA Dec 12, 2023
dab6333
Update opam-repository and mirage-dev in deploy
MisterDA Dec 12, 2023
fa758f6
Update to mirage.4.4.1
MisterDA Dec 12, 2023
85a8348
Remove mirage opam-repository overlay in deploy
MisterDA Dec 12, 2023
0488633
Try installing opam dependencies for pin-depends in deploy
MisterDA Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ FROM ocaml/opam:debian-12-ocaml-4.14
RUN sudo apt-get update && sudo apt-get install autoconf automake -y --no-install-recommends
RUN mkdir -p /home/opam/www/mirage
WORKDIR /home/opam/www
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && cd ~/opam-repository && git pull origin master && git reset --hard 297ab9ebb38254eee222f5bb4365ae80baa9caa1 && opam update
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && cd ~/opam-repository && git pull origin master && git reset --hard 30b1b97d735732e40996cf2e6b06d478ac40633f && opam update
RUN opam pin tailwindcss.dev https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz
RUN opam repo add mirage-dev git+https://github.com/mirage/mirage-dev.git#842c55556ffd0950d21141d6ab99e52a8d88a50f
RUN opam repo add mirage-dev git+https://github.com/mirage/mirage-dev.git#749c02302f8f15e609332edbe827541558554a80
Copy link
Member

@hannesm hannesm Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this mirage-dev overlay we should not need (famous last words) at all ;)

RUN opam install mirage
COPY --chown=opam:root mirage/config.ml /home/opam/www/mirage/
COPY --chown=opam:root mirageio.opam /home/opam/www/
Expand Down
2 changes: 1 addition & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
(ptime (>= 0.8.1))
(tailwindcss :build)
(crunch (and :build (>= 3.1.0)))
(omd (and :build (< 2.0.0~alpha3)))
(omd (>= 2.0.0~alpha4))
(yaml :build)
(fmt :build)
(ppx_deriving_yaml (and :build (>= 0.2.1)))))
10 changes: 5 additions & 5 deletions mirageio.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ depends: [
"ptime" {>= "0.8.1"}
"tailwindcss" {build}
"crunch" {build & >= "3.1.0"}
"omd" {build & < "2.0.0~alpha3"}
"omd" {>= "2.0.0~alpha4"}
"yaml" {build}
"fmt" {build}
"ppx_deriving_yaml" {build & >= "0.2.1"}
Expand All @@ -55,9 +55,9 @@ build: [
]
dev-repo: "git+https://github.com/mirage/mirage-www.git"
pin-depends: [
["dream-pure.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream-mirage.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream-httpaf.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream-pure.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["dream.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["dream-mirage.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["dream-httpaf.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
]
8 changes: 4 additions & 4 deletions mirageio.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pin-depends: [
["dream-pure.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream-mirage.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream-httpaf.dev" "git+https://github.com/tmcgilchrist/dream.git#fcc20d00bf61a1c417aa38e18b62aa3d0962704e"]
["dream-pure.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["dream.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["dream-mirage.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["dream-httpaf.dev" "git+https://github.com/aantron/dream.git#337a35fb1238b86f10f57d7aacb20003bc0486ba"]
["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
]
2 changes: 1 addition & 1 deletion template/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(library
(name mirageio_template)
(libraries dream-mirage mirageio_data))
(libraries dream dream-mirage mirageio_data))

(rule
(targets atom.ml)
Expand Down