nixpkgs
nixpkgs copied to clipboard
ocamlPackages.git: 3.5.0 -> 3.9.1
Description of changes
Updated ocaml git package.
Built on top of #180724 and #180726
Things done
- Built on platform(s)
- [ ] x86_64-linux
- [ ] aarch64-linux
- [ ] x86_64-darwin
- [ ] aarch64-darwin
- [ ] For non-Linux: Is
sandbox = true
set innix.conf
? (See Nix manual) - [ ] Tested, as applicable:
- NixOS test(s) (look inside nixos/tests)
- and/or package tests
- or, for functions and "core" functionality, tests in lib/tests or pkgs/test
- made sure NixOS tests are linked to the relevant packages
- [ ] Tested compilation of all packages that depend on this change using
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage - [ ] Tested basic functionality of all binary files (usually in
./result/bin/
) -
22.11 Release Notes (or backporting 22.05 Release notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
- [ ] (Release notes changes) Ran
nixos/doc/manual/md-to-db.sh
to update generated release notes
- [ ] Fits CONTRIBUTING.md.
@vbgl This breaks irmin-git
, should I update irmin and friends in this PR as well or can I do it in a upcoming PR?
Supersedes #180436
Indeed, it seems that irmin
and git
must be updated simultaneously.
However, fixing git-unix
at the expenses of breaking irmin-git
might be a good deal (i.e., updating irmin
, repr
and who knows what more can wait for a follow-up PR).
@vbgl I already had a mostly OK irmin
commit so I did a fixup on that and pushed it here if you want to review again. I tried go through all the META
files to clean up dependencies as @superherointj suggested to me on Discord.
I removed irmin-unix
from wodan-unix
without fixing it since it's already marked as broken.
I tried go through all the
META
files to clean up dependencies as @superherointj suggested to me on Discord.
To clarify, I said that the list of propagatedBuildInputs
(usually) comes from META file.
Result of nixpkgs-review pr 188389
run on x86_64-linux 1
1 package failed to build:
- ligo
10 packages built:
- comby
- dune-release
- jackline
- libbap
- liquidsoap
- python310Packages.bap
- python39Packages.bap
- soupault
- stog
- wayland-proxy-virtwl
On Ligo:
- Ligo builds succesfully at master. This PR seems to break it.
logs: https://termbin.com/wus6
Marked LIGO as broken, it's super out of date (because I couldn't update it with old Irmin) anyway. I'll fix it in a follow up PR when I have time
Result of nixpkgs-review pr 188389
run on x86_64-linux 1
1 package marked as broken and skipped:
- ligo
10 packages built:
- comby
- dune-release
- jackline
- libbap
- liquidsoap
- python310Packages.bap
- python39Packages.bap
- soupault
- stog
- wayland-proxy-virtwl
On git
package, divergences are:
-
propagatedBuildInputs:
-
checkInputs:
- is missing: cmdliner
- has in excess:
mtime
,tls
(which is not listed at OPAM file)- Maybe some other package is missing to propagate this? (Needs check.)
There is an update of ligo
in #184394. Might be incorporated here.
At git-paf
:
mirage-stack
is not listed at:
https://github.com/ocaml/opam-repository/blob/master/packages/git-paf/git-paf.3.9.1/opam
Also bigarray-compat
is not listed too. Is it necessary?
At git-unix
:
Not listed in opam (shouldn't be included?):
- mmap
- cohttp-lwt-unix
Not listed in META: (Should be buildInputs
?)
- uri
- mtime
At carton
:
- Remove:
useDune2 = true;
-
stdlib-shims
is still at line 2 despite not being used anymore.
I'd prefer irmin
fix was made as a separate PR because it is already a fairly large PR for review. And irmin
is changing 19 files. I have mostly reviewed the git PR today exception being irmin
. In case you cherry-pick irmin to another PR, we can finish git
PR first.
There is an update of
ligo
in #184394. Might be incorporated here.
We need to update BLS12-381 (and maybe more) to update LIGO so I would rather do it in an other PR.
Other than that I have now update this PR and I think it's in good shape to merge.
@vbgl @superherointj
I’ve just added the ligo
and related updates from that other PR. cc @bezmuth.
I started creating a branch updating to 0.52 of LIGO as well but it needs a bunch of new and updated packages. I'll see if I can open a PR to update LIGO itself to use 0.15 of Jane Street packages so that we can remove the patch.
Fixed decompress
changes @vbgl