Skip to content

Commit 6501524

Browse files
committed
fix(opam): versions have a prefix v.........
1 parent 2c4b368 commit 6501524

File tree

3 files changed

+34
-32
lines changed

3 files changed

+34
-32
lines changed

engine/dune-project

+14-14
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
(depends
2525
(ocaml (>= "4.14.1"))
2626
dune
27-
(base (= "0.16"))
28-
(core (= "0.16"))
29-
(yojson (= "2.2"))
27+
(base (= "v0.16.2"))
28+
(core (= "v0.16.2"))
29+
(yojson (= "2.2.0"))
3030
(non_empty_list (= "0.1"))
3131
(pprint (= "0.1"))
32-
(ppx_deriving_yojson (= "3.7"))
33-
(ppx_yojson_conv (= "0.15"))
34-
(ppx_sexp_conv (= "0.16"))
35-
(ppx_compare (= "0.16"))
36-
(ppx_hash (= "0.16"))
37-
(ppx_deriving (= "5.2"))
38-
(cmdliner (= "1.3"))
39-
(angstrom (= "0.16"))
40-
(re (= "1.11"))
32+
(ppx_deriving_yojson (= "3.7.0"))
33+
(ppx_yojson_conv (= "v0.15.1"))
34+
(ppx_sexp_conv (= "v0.16.0"))
35+
(ppx_compare (= "v0.16.0"))
36+
(ppx_hash (= "v0.16.0"))
37+
(ppx_deriving (= "5.2.1"))
38+
(cmdliner (= "1.3.0"))
39+
(angstrom (= "0.16.0"))
40+
(re (= "1.11.0"))
4141
(ppx_matches (= "0.1"))
42-
(ppx_string (= "0.16"))
43-
(logs (= "0.7"))
42+
(ppx_string (= "v0.16.0"))
43+
(logs (= "0.7.0"))
4444
(ocamlgraph (= "2.1"))
4545

4646
js_of_ocaml-compiler

engine/hax-engine.opam

+14-14
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ bug-reports: "https://github.com/hacspec/hax/issues"
1414
depends: [
1515
"ocaml" {>= "4.14.1"}
1616
"dune" {>= "3.0"}
17-
"base" {= "0.16"}
18-
"core" {= "0.16"}
19-
"yojson" {= "2.2"}
17+
"base" {= "v0.16.2"}
18+
"core" {= "v0.16.2"}
19+
"yojson" {= "2.2.0"}
2020
"non_empty_list" {= "0.1"}
2121
"pprint" {= "0.1"}
22-
"ppx_deriving_yojson" {= "3.7"}
23-
"ppx_yojson_conv" {= "0.15"}
24-
"ppx_sexp_conv" {= "0.16"}
25-
"ppx_compare" {= "0.16"}
26-
"ppx_hash" {= "0.16"}
27-
"ppx_deriving" {= "5.2"}
28-
"cmdliner" {= "1.3"}
29-
"angstrom" {= "0.16"}
30-
"re" {= "1.11"}
22+
"ppx_deriving_yojson" {= "3.7.0"}
23+
"ppx_yojson_conv" {= "v0.15.1"}
24+
"ppx_sexp_conv" {= "v0.16.0"}
25+
"ppx_compare" {= "v0.16.0"}
26+
"ppx_hash" {= "v0.16.0"}
27+
"ppx_deriving" {= "5.2.1"}
28+
"cmdliner" {= "1.3.0"}
29+
"angstrom" {= "0.16.0"}
30+
"re" {= "1.11.0"}
3131
"ppx_matches" {= "0.1"}
32-
"ppx_string" {= "0.16"}
33-
"logs" {= "0.7"}
32+
"ppx_string" {= "v0.16.0"}
33+
"logs" {= "0.7.0"}
3434
"ocamlgraph" {= "2.1"}
3535
"js_of_ocaml-compiler"
3636
"js_of_ocaml"

flake.nix

+6-4
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,19 @@
127127
hax-engine-names-extract = pkgs.hello;
128128
}).overrideAttrs (old: {
129129
name = "dune-project";
130-
outputs = ["out"];
130+
outputs = [ "out" ];
131131
buildPhase = ''
132132
dune describe installed-libraries > /tmp/dune-installed-libraries
133133
134134
for package in $(grep -Po '^ {8}[(]\K\w+' dune-project); do
135-
version=$(cat /tmp/dune-installed-libraries | grep -Po "\b$package\b.*version: v?\K[0-9.]+" | head -n1 || true)
136-
version=$(echo "$version" | grep -Po "^\d+.\d+" || true)
135+
version=$(cat /tmp/dune-installed-libraries | grep -Po "\b$package\b.*version: \Kv?[0-9.]+" | head -n1 || true)
136+
version=$(echo "$version" | grep -Po "^v?\d+([.]\d+)*" || true)
137137
if [ -z "${"$"}{version}" ]; then
138138
continue
139139
fi
140-
${pkgs.sd}/bin/sd "(^ {8}[(]$package +)\([^)]+\)" '${"$"}{1}'"(= \"$version\")" dune-project
140+
${pkgs.sd}/bin/sd "(^ {8}[(]$package +)\([^)]+\)" '${
141+
"$"
142+
}{1}'"(= \"$version\")" dune-project
141143
echo "-> $package: $version"
142144
done
143145
'';

0 commit comments

Comments
 (0)