+1 -1

.github/workflows/build-nix.yml

reviewed

··· 3 3 on: 4 4 push: 5 5 branches: 6 6 - - master 6 6 + - main 7 7 tags: 8 8 - "**" 9 9 pull_request:

+1 -1

.github/workflows/main.yml

reviewed

··· 45 45 run: opam install dune 46 46 47 47 - name: Validate lock directory 48 48 - run: opam exec -- dune pkg validate-lock-dir 48 48 + run: opam exec -- dune pkg validate-lockdir 49 49 50 50 - name: Build with Dune package management 51 51 run: opam exec -- dune build

+13 -5

dune-project

reviewed

··· 4 4 5 5 ; Keep opam metadata generated from the same dependency source that Dune pkg 6 6 ; consumes, so Nix, opam, and plain Dune builds all describe the same project. 7 7 + 7 8 (generate_opam_files true) 8 9 9 10 (source ··· 19 20 20 21 ; The repo vendors patched forks of these libraries. Pin them so Dune package 21 22 ; management resolves the same sources the build already uses locally. 23 23 + 22 24 (pin 23 25 (url "./forks/notty") 24 26 (package ··· 51 53 (package 52 54 (name jj_tui) 53 55 (synopsis "Terminal UI for the Jujutsu version control system") 54 54 - (description "A terminal UI for Jujutsu built in OCaml with Notty and Nottui.") 56 56 + (description 57 57 + "A terminal UI for Jujutsu built in OCaml with Notty and Nottui.") 55 58 (depends 56 56 - (ocaml (>= "5.1")) 59 59 + (dune (>="3.20")) 60 60 + (ocaml 61 61 + (>= "5.1")) 57 62 angstrom 58 63 base 59 64 bigstringaf ··· 77 82 uutf 78 83 yaml 79 84 yojson 80 80 - (picos_std (= "0.6.0")) 81 81 - (picos_io (= "0.6.0")) 82 82 - (picos_mux (= "0.6.0"))) 85 85 + (picos_std 86 86 + (= "0.6.0")) 87 87 + (picos_io 88 88 + (= "0.6.0")) 89 89 + (picos_mux 90 90 + (= "0.6.0"))) 83 91 (tags 84 92 (topics "terminal" "tui" "jujutsu" "jj" "vcs")))

+21

dune.lock/dune-configurator.3.21.1.pkg

reviewed

··· 1 1 + (version 3.21.1) 2 2 + 3 3 + (build 4 4 + (all_platforms 5 5 + ((action 6 6 + (progn 7 7 + (when %{pkg-self:dev} (run dune subst)) 8 8 + (run rm -rf vendor/csexp) 9 9 + (run rm -rf vendor/pp) 10 10 + (run dune build -p %{pkg-self:name} -j %{jobs} @install)))))) 11 11 + 12 12 + (depends 13 13 + (all_platforms 14 14 + (dune ocaml base-unix csexp))) 15 15 + 16 16 + (source 17 17 + (fetch 18 18 + (url 19 19 + https://github.com/ocaml/dune/releases/download/3.21.1/dune-3.21.1.tbz) 20 20 + (checksum 21 21 + sha256=84f7a82c6d80a7124f3847e9a489e80cfbeafb7bed3573ac01286ef56fd08d94)))

-19

dune.lock/dune-configurator.3.22.1.pkg

reviewed

··· 1 1 - (version 3.22.1) 2 2 - 3 3 - (build 4 4 - (all_platforms 5 5 - ((action 6 6 - (progn 7 7 - (when %{pkg-self:dev} (run dune subst)) 8 8 - (run dune build -p %{pkg-self:name} -j %{jobs} @install)))))) 9 9 - 10 10 - (depends 11 11 - (all_platforms 12 12 - (dune ocaml base-unix csexp))) 13 13 - 14 14 - (source 15 15 - (fetch 16 16 - (url 17 17 - https://github.com/ocaml/dune/releases/download/3.22.1/dune-3.22.1.tbz) 18 18 - (checksum 19 19 - sha256=0c0b98396c32ec426886c2c2294024fd687ac5114d4dda0af9dc8a2e584d47fd)))

+1 -1

dune.lock/lock.dune

reviewed

··· 1 1 (lang package 0.1) 2 2 3 3 - (dependency_hash b449638cf5f771192541918be601fb1c) 3 3 + (dependency_hash 5dc644e8b28a1a5fb5aa828ad6f0a543) 4 4 5 5 (ocaml ocaml-base-compiler) 6 6

+1 -2

dune.lock/ppx_record_updater.dev.pkg

reviewed

··· 9 9 10 10 (source 11 11 (fetch 12 12 - (url 13 13 - git+https://github.com/faldor20/ppx_record_updater.git#15a6ac0fa1a98e21e2b4b68b2eaee088186d5515))) 12 12 + (url git+https://github.com/faldor20/ppx_record_updater.git))) 14 13 15 14 (dev)