Skip to content

Comments

Add two missing ocamlPackages.cohttp-* packages#226662

Merged
ulrikstrid merged 2 commits intoNixOS:masterfrom
Niols:cohttp-missing-2-packages
Apr 19, 2023
Merged

Add two missing ocamlPackages.cohttp-* packages#226662
ulrikstrid merged 2 commits intoNixOS:masterfrom
Niols:cohttp-missing-2-packages

Conversation

@Niols
Copy link
Contributor

@Niols Niols commented Apr 17, 2023

Description of changes

As of 5.1.0, cohttp contains two packages that are not in nixpkgs, namely cohttp-lwt-jsoo and cohttp-top. This PR adds the two packages in question. Three notes:

  1. This PR builds on top of ocamlPackages.cohttp*: 5.0.0 -> 5.1.0 #226657. Changes to pkgs/development/ocaml-modules/cohttp/default.nix should therefore be discussed there instead. I did this to avoid a situation where (a) we test bumping the version on one hand and (b) we test adding the two packages on the other hand, but we don't (c) test adding the two packages with the bumped version, where (a) and (b) would be fine but (c) wouldn't. The two packages in question already exist in version 5.0.0 of cohttp, though, so if my reasoning isn't the best I could also make this PR independent.

  2. By inheriting metadata from cohttp and cohttp-lwt, I am effectively making you, @vbgl, maintainer of these two new packages. I thought it was odd for me to put myself as maintainer of these two when you were already handling the rest, but this solution is also a bit odd. WDYT?

  3. The current master branch of cohttp includes yet another set of new packages that will probably land in cohttp 6.0.0, namely:

    • cohttp-bench
    • cohttp-curl
    • cohttp-curl-async
    • cohttp-curl-lwt
    • cohttp-eio
    • cohttp-server-lwt-unix
    • http
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. label Apr 17, 2023
@Niols Niols requested a review from vbgl April 17, 2023 15:21
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 17, 2023
@Alizter
Copy link
Contributor

Alizter commented Apr 17, 2023

Result of nixpkgs-review pr 226662 run on x86_64-linux 1

4 packages built:
  • comby
  • dune-release
  • ligo
  • liquidsoap

@ulrikstrid
Copy link
Member

If you rebase on master we should be able to merge this

@Niols Niols force-pushed the cohttp-missing-2-packages branch from f99d115 to d0b92d9 Compare April 18, 2023 22:41
@Niols
Copy link
Contributor Author

Niols commented Apr 18, 2023

Done. Both packages build fine for me on x86_64-linux, x86_64-darwin and aarch64-darwin.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 18, 2023
@ulrikstrid ulrikstrid merged commit 8daa70a into NixOS:master Apr 19, 2023
@Niols Niols deleted the cohttp-missing-2-packages branch April 19, 2023 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants