| 3 Nov 2025 |
 K900 | Like now | 12:10:49 |
| K900 | 
Download image.png | 12:10:59 |
 Grimmauld (any/all) | i looked at z3 ocaml a while back, never again | 12:10:58 |
| K900 | Because I am looking at this | 12:11:02 |
| K900 | And I am not understand | 12:11:05 |
| K900 | And I do not want to be understand | 12:11:11 |
| Grimmauld (any/all) | Ah i see | 12:14:12 |
| Grimmauld (any/all) | i think what you want is:
let
inherit (callPackage ./generic.nix args) src version library_deps;
in
lib.throwIf
(
lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
|| lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
|| lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
|| lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
|| lib.versionAtLeast ocaml.version "5.4" && !lib.versionAtLeast version "0.28"
)
"ocamlformat ${version} is not available for OCaml ${ocaml.version}"
buildDunePackage {
pname = "ocamlformat";
inherit src version;
minimalOCamlVersion = "4.08";
| 12:15:17 |
| Grimmauld (any/all) | (+ formatting) | 12:15:24 |
| Grimmauld (any/all) | not sure | 12:15:28 |
|  StepBroBD joined the room. | 12:15:39 |
| StepBroBD | i saw K900 pining someone doing ocaml | 12:16:04 |
| StepBroBD | did i mess smth up lmfao | 12:16:26 |
| K900 | Yes | 12:16:35 |
| Grimmauld (any/all) | https://github.com/NixOS/nixpkgs/blob/90dec067d09ee9b02f817063f480b395ba81039e/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix#L17-L32
(this would be what we have on master, basically) | 12:16:41 |
| K900 | Not really | 12:16:57 |
| K900 | Merge conflicts on staging are not uncommon | 12:16:58 |
| K900 | But with this particular instance I have no idea what the correct resolution looks like | 12:17:10 |
| StepBroBD | i guess its due to staging next dont have what we have on master right? | 12:17:34 |
| K900 | The other way around usually | 12:17:43 |
| K900 | staging-next has more things than master | 12:17:49 |
| K900 | And master is automatically merged into it every few hours | 12:17:56 |
| K900 | In this case, https://github.com/NixOS/nixpkgs/commit/1e1cef625b2108f3d3cab7fb6daff2fe62233243 | 12:18:31 |
| Grimmauld (any/all) | Its a conflict between https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa and https://github.com/NixOS/nixpkgs/commit/1e1cef625b2108f3d3cab7fb6daff2fe62233243 | 12:18:35 |
| StepBroBD | "data race" i guess
the easiest way would be me reverting and re-create the same pr after staging-next workflow? | 12:18:39 |
| K900 | No | 12:18:45 |
| K900 | The easiest way is to tell me how to resolve the conflict and I'll do it manually and push | 12:19:02 |
| StepBroBD | keep ocamlformat 0.28 | 12:20:08 |
| StepBroBD | should be that ez | 12:20:15 |
| K900 | It's not the version that's conflicting | 12:20:26 |
