fix(opam): versions have a prefix v.........

cryspen · Jan 23, 2025 · 6501524 · 6501524
1 parent 2c4b368
commit 6501524
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/engine/dune-project b/engine/dune-project
@@ -24,23 +24,23 @@
  (depends
         (ocaml (>= "4.14.1"))
         dune
-        (base                (= "0.16"))
-        (core                (= "0.16"))
-        (yojson              (= "2.2"))
+        (base                (= "v0.16.2"))
+        (core                (= "v0.16.2"))
+        (yojson              (= "2.2.0"))
         (non_empty_list      (= "0.1"))
         (pprint              (= "0.1"))
-        (ppx_deriving_yojson (= "3.7"))
-        (ppx_yojson_conv     (= "0.15"))
-        (ppx_sexp_conv       (= "0.16"))
-        (ppx_compare         (= "0.16"))
-        (ppx_hash            (= "0.16"))
-        (ppx_deriving        (= "5.2"))
-        (cmdliner            (= "1.3"))
-        (angstrom            (= "0.16"))
-        (re                  (= "1.11"))
+        (ppx_deriving_yojson (= "3.7.0"))
+        (ppx_yojson_conv     (= "v0.15.1"))
+        (ppx_sexp_conv       (= "v0.16.0"))
+        (ppx_compare         (= "v0.16.0"))
+        (ppx_hash            (= "v0.16.0"))
+        (ppx_deriving        (= "5.2.1"))
+        (cmdliner            (= "1.3.0"))
+        (angstrom            (= "0.16.0"))
+        (re                  (= "1.11.0"))
         (ppx_matches         (= "0.1"))
-        (ppx_string          (= "0.16"))
-        (logs                (= "0.7"))
+        (ppx_string          (= "v0.16.0"))
+        (logs                (= "0.7.0"))
         (ocamlgraph          (= "2.1"))
 
         js_of_ocaml-compiler

diff --git a/engine/hax-engine.opam b/engine/hax-engine.opam
@@ -14,23 +14,23 @@ bug-reports: "https://github.com/hacspec/hax/issues"
 depends: [
   "ocaml" {>= "4.14.1"}
   "dune" {>= "3.0"}
-  "base" {= "0.16"}
-  "core" {= "0.16"}
-  "yojson" {= "2.2"}
+  "base" {= "v0.16.2"}
+  "core" {= "v0.16.2"}
+  "yojson" {= "2.2.0"}
   "non_empty_list" {= "0.1"}
   "pprint" {= "0.1"}
-  "ppx_deriving_yojson" {= "3.7"}
-  "ppx_yojson_conv" {= "0.15"}
-  "ppx_sexp_conv" {= "0.16"}
-  "ppx_compare" {= "0.16"}
-  "ppx_hash" {= "0.16"}
-  "ppx_deriving" {= "5.2"}
-  "cmdliner" {= "1.3"}
-  "angstrom" {= "0.16"}
-  "re" {= "1.11"}
+  "ppx_deriving_yojson" {= "3.7.0"}
+  "ppx_yojson_conv" {= "v0.15.1"}
+  "ppx_sexp_conv" {= "v0.16.0"}
+  "ppx_compare" {= "v0.16.0"}
+  "ppx_hash" {= "v0.16.0"}
+  "ppx_deriving" {= "5.2.1"}
+  "cmdliner" {= "1.3.0"}
+  "angstrom" {= "0.16.0"}
+  "re" {= "1.11.0"}
   "ppx_matches" {= "0.1"}
-  "ppx_string" {= "0.16"}
-  "logs" {= "0.7"}
+  "ppx_string" {= "v0.16.0"}
+  "logs" {= "0.7.0"}
   "ocamlgraph" {= "2.1"}
   "js_of_ocaml-compiler"
   "js_of_ocaml"

diff --git a/flake.nix b/flake.nix
@@ -127,17 +127,19 @@
             hax-engine-names-extract = pkgs.hello;
           }).overrideAttrs (old: {
             name = "dune-project";
-            outputs = ["out"];
+            outputs = [ "out" ];
             buildPhase = ''
               dune describe installed-libraries > /tmp/dune-installed-libraries
 
               for package in $(grep -Po '^ {8}[(]\K\w+' dune-project); do
-                  version=$(cat /tmp/dune-installed-libraries | grep -Po "\b$package\b.*version: v?\K[0-9.]+" | head -n1 || true)
-                  version=$(echo "$version" | grep -Po "^\d+.\d+" || true)
+                  version=$(cat /tmp/dune-installed-libraries | grep -Po "\b$package\b.*version: \Kv?[0-9.]+" | head -n1 || true)
+                  version=$(echo "$version" | grep -Po "^v?\d+([.]\d+)*" || true)
                   if [ -z "${"$"}{version}" ]; then
                       continue
                   fi
-                  ${pkgs.sd}/bin/sd "(^ {8}[(]$package +)\([^)]+\)" '${"$"}{1}'"(= \"$version\")" dune-project
+                  ${pkgs.sd}/bin/sd "(^ {8}[(]$package +)\([^)]+\)" '${
+                    "$"
+                  }{1}'"(= \"$version\")" dune-project
                   echo "-> $package: $version"
               done
             '';