!UNVBThoJtlIiVwiDjU:nixos.org

Staging

344 Members
Staging merges | Running staging cycles: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+head%3Astaging-next+head%3Astaging-next-25.05 | Review Reports: https://malob.github.io/nix-review-tools-reports/114 Servers

Load older messages


SenderMessageTime
3 Nov 2025
@grimmauld:grapevine.grimmauld.deGrimmauld (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:grapevine.grimmauld.deGrimmauld (any/all)(+ formatting)12:15:24
@grimmauld:grapevine.grimmauld.deGrimmauld (any/all)not sure12:15:28
@stepbrobd:matrix.org@stepbrobd:matrix.org joined the room.12:15:39
@stepbrobd:matrix.org@stepbrobd:matrix.org i saw K900 pining someone doing ocaml 12:16:04
@stepbrobd:matrix.org@stepbrobd:matrix.org did i mess smth up lmfao 12:16:26
@k900:0upti.meK900Yes12:16:35
@grimmauld:grapevine.grimmauld.deGrimmauld (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:0upti.meK900Not really12:16:57
@k900:0upti.meK900Merge conflicts on staging are not uncommon12:16:58
@k900:0upti.meK900But with this particular instance I have no idea what the correct resolution looks like12:17:10
@stepbrobd:matrix.org@stepbrobd:matrix.org i guess its due to staging next dont have what we have on master right? 12:17:34
@k900:0upti.meK900The other way around usually12:17:43
@k900:0upti.meK900 staging-next has more things than master 12:17:49
@k900:0upti.meK900And master is automatically merged into it every few hours12:17:56
@k900:0upti.meK900In this case, https://github.com/NixOS/nixpkgs/commit/1e1cef625b2108f3d3cab7fb6daff2fe6223324312:18:31
@grimmauld:grapevine.grimmauld.deGrimmauld (any/all)Its a conflict between https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa and https://github.com/NixOS/nixpkgs/commit/1e1cef625b2108f3d3cab7fb6daff2fe6223324312:18:35
@stepbrobd:matrix.org@stepbrobd:matrix.org "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:0upti.meK900No12:18:45
@k900:0upti.meK900The easiest way is to tell me how to resolve the conflict and I'll do it manually and push12:19:02
@stepbrobd:matrix.org@stepbrobd:matrix.org keep ocamlformat 0.28 12:20:08
@stepbrobd:matrix.org@stepbrobd:matrix.org should be that ez 12:20:15
@k900:0upti.meK900It's not the version that's conflicting12:20:26
@k900:0upti.meK900 ^ 12:20:31
@k900:0upti.meK900 I think the correct resolution is to move the newly added version check down to meta.broken as Jo did in their big commit 12:21:02
@grimmauld:grapevine.grimmauld.deGrimmauld (any/all)Can't we just cherry-pick https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa to staging-next individually and then accept the staging-next version explicitly for the conflicting files?12:21:04
@k900:0upti.meK900And the rest already applies cleanly12:21:47
@k900:0upti.meK900https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa#diff-87747fec8c7dfe5d924b47da9425f32fdc332203161b00ff7f754389d86b66be is the only change that doesn't12:22:06
@stepbrobd:matrix.org@stepbrobd:matrix.org problem solved? 12:22:23
@stepbrobd:matrix.org@stepbrobd:matrix.org scared me for a bit 12:22:30

Show newer messages


Back to Room ListRoom Version: 6