From 64f688b59c369721db7f824d5ea4d48a5cbefded Mon Sep 17 00:00:00 2001
From: Malcolm <malcolm@terrateam.io>
Date: Fri, 7 Feb 2025 23:23:47 +0100
Subject: [PATCH] #291 UPGRADE Pds version

---
 code/Makefile                                 |  2 -
 code/hll.conf                                 |  2 +-
 code/pds.conf                                 |  2 +-
 docker/terrat/Dockerfile                      |  5 +-
 opam/packages/hll/hll.4.3/opam                |  4 +-
 .../merlin-of-pds/merlin-of-pds.1.4/opam      | 40 ++++++++++++++++
 opam/packages/pds/pds.6.44/opam               | 48 +++++++++++++++++++
 7 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 opam/packages/merlin-of-pds/merlin-of-pds.1.4/opam
 create mode 100644 opam/packages/pds/pds.6.44/opam

diff --git a/code/Makefile b/code/Makefile
index bac72def..1ca83f6d 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -11,8 +11,6 @@ pds.mk: pds.conf
 
 terrat-schemas: terrat-api terrat-repo-config terrat-webhooks
 
-terrat: pds.conf
-
 terrat: release_terrat_oss debug_terrat_oss
 
 terrat: release_terrat_ee debug_terrat_ee
diff --git a/code/hll.conf b/code/hll.conf
index 7302364b..8f0785a8 100644
--- a/code/hll.conf
+++ b/code/hll.conf
@@ -1,4 +1,4 @@
-pds = {major_version = 5}
+pds = {major_version = 6}
 desc = "Monorepo"
 maintainer = "malcolm.matalka@acsl.se"
 authors = [ "malcolm.matalka@acsl.se" ]
diff --git a/code/pds.conf b/code/pds.conf
index a053eb06..8bdaeca9 100644
--- a/code/pds.conf
+++ b/code/pds.conf
@@ -473,7 +473,7 @@ deps = ["base64", "containers", "mirage-crypto", "mirage-crypto-pk", "yojson"]
 [src.kqueue]
 install = true
 deps = ["ctypes", "ctypes.foreign", "kqueue_bindings"]
-compile_deps = ["kqueue_bindings_gen "]
+compile_deps = ["kqueue_bindings_gen"]
 extra_makefile_lines = ["include $(SRC_DIR)/kqueue.mk"]
 
 [src.kqueue.selector.linux]
diff --git a/docker/terrat/Dockerfile b/docker/terrat/Dockerfile
index a933bfd3..0d51af5b 100644
--- a/docker/terrat/Dockerfile
+++ b/docker/terrat/Dockerfile
@@ -27,6 +27,7 @@ RUN apk add --no-cache \
     opam \
     openssh \
     perl \
+    pkgconfig \
     py3-yaml \
     python3 \
     sqlite-dev \
@@ -34,7 +35,7 @@ RUN apk add --no-cache \
     zlib-dev
 
 # Initialize opam
-RUN opam init -ay --disable-sandboxing
+RUN opam init -ay --disable-sandboxing --bare
 
 # Set up OCaml compiler
 RUN eval $(opam env) && \
@@ -56,6 +57,8 @@ RUN eval $(opam env) && \
     opam repository set-url default "https://github.com/jjm-enterprises/opam-repository.git#terrateam" && \
     opam repository add opam-acsl mono/opam && \
     opam pin add -y containers 3.12 && \
+    opam pin add -y pds 6.44 && \
+    opam pin add -y hll 4.3 && \
     opam install -y hll pds && \
     mkdir -p opam-mono/compilers opam-mono/packages && \
     echo 'opam-version: "2.0"' > opam-mono/repo && \
diff --git a/opam/packages/hll/hll.4.3/opam b/opam/packages/hll/hll.4.3/opam
index 66f5f79f..3bf72a49 100644
--- a/opam/packages/hll/hll.4.3/opam
+++ b/opam/packages/hll/hll.4.3/opam
@@ -15,10 +15,10 @@ remove: [
 
 depends: [
 	"cmdliner" { >= "1.3.0" }
-	"containers" { >= "3.12.0" }
+	"containers" { >= "3.12" }
 	"ocaml" { >= "4.12.0" }
 	"ocamlfind"
-	"pds" { build & (>= "5" & < "6") }
+	"pds" { build & (>= "6" & < "7") }
 	"process" { >= "0.2.1" }
 	"sha"
 	"toml" { >= "6" }
diff --git a/opam/packages/merlin-of-pds/merlin-of-pds.1.4/opam b/opam/packages/merlin-of-pds/merlin-of-pds.1.4/opam
new file mode 100644
index 00000000..8b385636
--- /dev/null
+++ b/opam/packages/merlin-of-pds/merlin-of-pds.1.4/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+maintainer: "orbitz@gmail.com"
+build: [
+	[make "-j%{jobs}%"]
+	[make "-j%{jobs}%" "test"] {with-test}
+]
+
+install: [
+	[make "PREFIX=%{prefix}%" "install"]
+]
+
+remove: [
+	[make "PREFIX=%{prefix}%" "remove"]
+]
+
+depends: [
+	"ocamlfind"
+	"pds" { build & (>= "6" & < "7") }
+]
+
+authors: [
+	"orbitz@gmail.com"
+]
+
+description: """
+Simple script that turns a pds.conf into a .merlin file
+"""
+
+homepage: "https://bitbucket.org/acslab/merlin-of-pds"
+
+url {
+	src: "https://bitbucket.org/acslab/merlin-of-pds/get/1.4.tar.gz"
+	checksum: [
+		"md5=7392d566419232c46424fab4706570ff"
+		"sha256=40584fb5134127a6b19be74cc787be6f2efea5c4d12ad3d01eddcfa5457b987e"
+	]
+}
+bug-reports: "https://bitbucket.org/acslab/merlin-of-pds/issues"
+dev-repo: "https://bitbucket.org/acslab/merlin-of-pds.git"
+
diff --git a/opam/packages/pds/pds.6.44/opam b/opam/packages/pds/pds.6.44/opam
new file mode 100644
index 00000000..3f36d643
--- /dev/null
+++ b/opam/packages/pds/pds.6.44/opam
@@ -0,0 +1,48 @@
+opam-version: "2.0"
+maintainer: "orbitz@gmail.com"
+build: [
+	[make "-j%{jobs}%"]
+	[make "-j%{jobs}%" "test"] {with-test}
+]
+
+install: [
+	[make "PREFIX=%{prefix}%" "install"]
+]
+
+remove: [
+	[make "PREFIX=%{prefix}%" "remove"]
+]
+
+depends: [
+	"cmdliner" { >= "1.3.0" }
+	"containers" { >= "3.12" }
+	"crunch"
+	"ocaml" { >= "4.12.0" }
+	"ocamlfind"
+	"ppx_deriving"
+	"process" { >= "0.2.1" }
+	"sedlex"
+	"sqlite3"
+	"toml" { >= "6" }
+]
+
+authors: [
+	"orbitz@gmail.com"
+]
+
+description: """
+A tool to build Makefiles for Ocaml projects.
+"""
+
+homepage: "https://hg.sr.ht/~mmatalka/pds"
+
+url {
+	src: "http://acsl-pkgs.s3.amazonaws.com/pds-6.44.tar.gz"
+	checksum: [
+		"md5=fe0dc02504c53b4da43264656a179467"
+		"sha256=300980f31a803f416b2652cd7494dab5a5b12f35d9d61e91a97a652bc31335be"
+	]
+}
+bug-reports: "https://todo.sr.ht/~mmatalka/pds"
+dev-repo: "hg+ssh://hg@hg.sr.ht/~mmatalka/pds"
+