Skip to content

Commit ef37725

Browse files
committed
updates
1 parent ed09c10 commit ef37725

File tree

7 files changed

+43
-13
lines changed

7 files changed

+43
-13
lines changed

.bazelrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# bug:
2+
# 18:19: error: 'get<std::function<bool ()>, std::string, std::function<bool ()>>' is unavailable: introduced in macOS 10.13
3+
4+
build --host_cxxopt=-std=c++14 --cxxopt=-std=c++14
5+
16
try-import %workspace%/.config/registries.bazelrc
27
common --registry=https://raw.githubusercontent.com/obazl/registry/main/
38
common --registry=https://bcr.bazel.build

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ bazel_dep(name = "rules_cc", version = "0.1.1")
1212
bazel_dep(name = "stardoc", version = "0.8.0")
1313

1414
## obazl deps:
15-
bazel_dep(name = "rules_ocaml", version = "3.0.0.dev")
16-
bazel_dep(name = "rules_ppx", version = "3.0.0.dev")
17-
bazel_dep(name = "rules_ctypes", version = "0.23.0.dev")
15+
bazel_dep(name = "rules_ocaml", version = "3.0.0.beta.1")
16+
bazel_dep(name = "rules_ppx", version = "3.0.0.beta.1")
17+
bazel_dep(name = "rules_ctypes", version = "0.23.0.beta.1")
1818

19-
bazel_dep(name = "tools_opam", version = "1.0.0.dev")
19+
bazel_dep(name = "tools_opam", version = "1.0.0.beta.1")
2020
opam = use_extension("@tools_opam//extensions:opam.bzl", "opam")
2121

2222
bazel_dep(name = "protobuf", version = "29.0")

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: import lib module ns rt test
22

3-
default: ocaml tools_opam ppx
3+
default: rules_ocaml tools_opam ppx
44

55
xdefault: rules_ocaml sidebars tools_ocaml providers
66

7-
ocaml: binary import lib module ns rt sig test
7+
rules_ocaml: binary import lib module ns rt sig test
88

99
binary:
1010
bazel build //stardoc:ocaml_binary --show_result=20 \
@@ -53,8 +53,6 @@ providers:
5353

5454

5555

56-
rules_ocaml: binary import lib module ns rt sig test
57-
5856
sidebars:
5957
bazel build //stardoc:rules_ocaml_sidebar \
6058
&& sudo cp -v .bazel/bin/stardoc/sidebar_rules_ocaml.yml docs/_data/sidebars/sidebar_rules_ocaml_refman.yml

docs/_data/sidebars/obazl_ug_sbdata.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ entries:
4646
open: true
4747
url: "#_ocaml-platform-support"
4848
output: web
49-
- title: Opam libraries
49+
- title: Opam
5050
open: true
51-
url: "#_opam-libraries"
51+
url: "#_opam"
52+
output: web
53+
- title: Nix
54+
open: true
55+
url: "#_nix"
5256
output: web
5357
- title: Other tools
5458
open: true

docs/obazl/obazl_index.adoc

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,34 @@ Related:
389389
====
390390

391391

392-
== Opam libraries
392+
== Opam
393393

394394
Opam libraries are modeled as Bazel repos. The name conversion is
395395
straightforward:
396396

397+
== Nix
398+
399+
* https://xeiaso.net/blog/how-i-start-nix-2020-03-08/[How I Start: Nix] excellent blog article for getting started. 2020/03/08
400+
401+
* https://dimitrije.website/posts/2023-03-04-nix-ocaml.html[Nix-powered development with OCaml] Blog article, 2023-03-04
402+
403+
Installing manpages: https://nixos.org/manual/nixpkgs/stable/#sec-getting-documentation[Getting documentation] (nixpkgs manual)
404+
405+
Empty the store:
406+
407+
sudo nix-collect-garbage
408+
409+
Emits messages like `deleting '/nix/store/pg7zsw894hv5v6q5h1cmqibs2jis2mkb-libmpack-1.0.5.drv'
410+
`
411+
412+
but lots of stuff remains in /nix/store/
413+
414+
415+
=== MacOS
416+
417+
* https://checkoway.net/musings/nix/[Using Nix on macOS] Blog article, 2022-07-23. Contains excellent detailed info about dealing with `zsh` (https://checkoway.net/musings/nix/#fixing-shell-integration[Fixing shell integration]).
418+
419+
397420
== Other tools
398421

399422
Ordinary libraries are easy to use. You just list them as

docs/rules-ocaml/reference/ocaml_ns.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Not to be confused with the https://bazel.build/concepts/visibility[visibility,w
7272
| `None` | +++<a id="ocaml_ns-submodules"></a>+++submodules
7373
| List of strings from which submodule names are to be derived for aliasing. Bazel labels may be used; the submodule name will be derived from the target part. For example, '//a/b:c' normalizes to C. But they are just strings, and will not be checked against any files.
7474

75-
The normalized submodule names must match the names of the modules electing membership via the 'ns_config' attribute. | +++List of strings+++
75+
The normalized submodule names must match the names of the modules electing membership via the `ns` attribute. | +++List of strings+++
7676
| optional
7777
| `None` | +++<a id="ocaml_ns-visibility"></a>+++visibility
7878
| The visibility to be passed to this macro's exported targets. It always implicitly includes the location where this macro is instantiated, so this attribute only needs to be explicitly set if you want the macro's targets to be additionally visible somewhere else. | +++<a href="https://bazel.build/concepts/labels">List of labels</a>; <a href="https://bazel.build/reference/be/common-definitions#configurable-attributes">nonconfigurable</a>+++

docs/rules-ocaml/reference/ocaml_ns_config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Not to be confused with the https://bazel.build/concepts/visibility[visibility,w
7777
| [[_ocaml_ns_config_submodules]]submodules
7878
| List of strings from which submodule names are to be derived for aliasing. Bazel labels may be used; the submodule name will be derived from the target part. For example, '//a/b:c' normalizes to C. But they are just strings, and will not be checked against any files.
7979

80-
The normalized submodule names must match the names of the modules electing membership via the 'ns_config' attribute. | +++List of strings+++
80+
The normalized submodule names must match the names of the modules electing membership via the `ns` attribute. | +++List of strings+++
8181
| optional
8282
| []
8383

0 commit comments

Comments
 (0)