Skip to content

Commit 18b67de

Browse files
committed
chore: Upgrade base (semgrep/semgrep-proprietary#3869)
This week's Homebrew release [failed](Homebrew/homebrew-core#222682). I can reproduce the failure locally by running `brew install --head semgrep`, but I cannot reproduce the failure by running `make setup` in my Semgrep repository, even though both try to install the same version of `base`. I am not sure why that is. Regardless, we are not the only people to experience this error when attempting to build `base`. It [looks like](janestreet/base#178) an incompatibility with a newer version of the macOS developer tools. `base` has released a patch for it, but it's only been backported in `opam` to 17.1. So, I'm bumping the version of `base`. I also had to bump `ppx_sexp_conv` in order to do so. While I was in there I removed a redundant dependency on `base`. I am hoping that this will address the homebrew issue. Once this is synced to OSS I'll test it using `brew install --head semgrep`. Test plan: CI synced from Pro 78d75b4a1db42a398186382f7ef21acda949c9d0
1 parent 5ad5062 commit 18b67de

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

dune-project

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ For more information see https://semgrep.dev
6262
; core deps
6363
(ocaml (>= 5.3.0))
6464
(dune (>= 2.7.0 ))
65-
base
6665
; parser generators
6766
(menhir (= 20230608))
6867
; vendored in libs/ocaml-tree-sitter-core
@@ -74,7 +73,9 @@ For more information see https://semgrep.dev
7473
; (is it, though?), we need a version that doesn't register
7574
; rogue exception printers.
7675
; See https://github.com/janestreet/base/issues/146
77-
(base (>= v0.15.1))
76+
; We also need a version that can be built properly on macOS:
77+
; https://github.com/janestreet/base/issues/178
78+
(base (>= v0.17.2))
7879
fpath
7980
bos
8081
fileutils
@@ -109,7 +110,7 @@ For more information see https://semgrep.dev
109110
ppx_deriving_yojson
110111
ppx_hash
111112
ppx_inline_test
112-
(ppx_sexp_conv ( = v0.16.0))
113+
(ppx_sexp_conv ( = v0.17.0))
113114
ppx_expect
114115
(visitors (= 20250212))
115116
; regexps

semgrep.opam

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ bug-reports: "https://github.com/semgrep/semgrep/issues"
1818
depends: [
1919
"ocaml" {>= "5.3.0"}
2020
"dune" {>= "3.7" & >= "2.7.0"}
21-
"base"
2221
"menhir" {= "20230608"}
2322
"tree-sitter"
2423
"semgrep-interfaces"
25-
"base" {>= "v0.15.1"}
24+
"base" {>= "v0.17.2"}
2625
"fpath"
2726
"bos"
2827
"fileutils"
@@ -50,7 +49,7 @@ depends: [
5049
"ppx_deriving_yojson"
5150
"ppx_hash"
5251
"ppx_inline_test"
53-
"ppx_sexp_conv" {= "v0.16.0"}
52+
"ppx_sexp_conv" {= "v0.17.0"}
5453
"ppx_expect"
5554
"visitors" {= "20250212"}
5655
"re"

src/main/flags.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ else
121121
"-lalcotest_stubs"
122122
"-lbase_internalhash_types_stubs"
123123
"-lbase_stubs"
124+
"-locaml_intrinsics_kernel_stubs"
124125
"-lbigstringaf_stubs"
125126
"-lca_certs_stubs"
126127
"-lcamlstrnat"

0 commit comments

Comments
 (0)