Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ocamlPackages.janeStreet: 0.13 → 0.14 #106386

Merged
merged 5 commits into from Dec 18, 2020
Merged

ocamlPackages.janeStreet: 0.13 → 0.14 #106386

merged 5 commits into from Dec 18, 2020

Conversation

vbgl
Copy link
Contributor

@vbgl vbgl commented Dec 8, 2020 •
edited

Motivation for this change

#106356

This removes sqlexpr as it cannot be built with dune 2.

Closes #106344.
Closes #102451.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@vbgl vbgl mentioned this pull request Dec 8, 2020
Closed
@ofborg ofborg bot requested review from Zimmi48 and marsam December 8, 2020 21:44
@vbgl vbgl changed the title ocamlPackage.janeStreet: 0.13 → 0.14 ocamlPackages.janeStreet: 0.13 → 0.14 Dec 9, 2020
@vbgl vbgl mentioned this pull request Dec 9, 2020
Closed
@vbgl vbgl mentioned this pull request Dec 11, 2020
Closed
10 tasks
@bcc32 bcc32 mentioned this pull request Dec 11, 2020
Closed
@vbgl
Copy link
Contributor Author

vbgl commented Dec 13, 2020

Rebased on top of #106752.

@bcc32
Copy link
Contributor

bcc32 commented Dec 14, 2020

I think this update is missing expect_test_helpers_async (the successor to expect_test_helpers) and topological_sort. Might be missing a few others but those are the ones I noticed when building some personal projects.

@vbgl vbgl force-pushed the ocaml-janestreet-0.14 branch 2 times, most recently from 114d673 to 5e5f541 Compare December 14, 2020 07:39
@vbgl
Copy link
Contributor Author

vbgl commented Dec 14, 2020

Thanks. I’ve just added some of the missing libraries.

@vbgl
Copy link
Contributor Author

vbgl commented Dec 16, 2020

Are there objections to merging this?

@sternenseemann
Copy link
Member

I've dabbled around a bit and went through the opam files of the packages. I've noticed the following things

  • We could enable tests
  • Some minimumOCamlVersions differ from 4.08

I've implemented changes based on that, you can see the changes comparing to your branch here.

I've also changed some dependencies around based on my testing and the opam files, I'm not 100% sure about those, maybe I missed a propagation here or there, I guess a second pair of eyes would help there :)

vbgl and others added 5 commits December 17, 2020 21:34
@vbgl
ocamlPackages.sqlexpr: remove at 0.9.0
0de597b
@vbgl
ocamlPackages.ppxlib: 0.12.0 → 0.13.0
65125f5 
Also refactor to ease selection of a custom version
@vbgl
ocamlPackages.cfstream: use Dune 2
1938f16
@vbgl
ocamlformat: build legacy versions with OCaml 4.07
3e02de6
@vbgl @sternenseemann
ocamlPackages.janeStreet: 0.13 → 0.14
9d4d232 
ocamlPackages.biocaml: 0.10.1 → 0.11.1

ocamlPackages.bistro: fix for Core 0.14

ocamlPackages.js_of_ocaml: 3.7.0 → 3.7.1

ocamlPackages.ocaml-r: 0.2.0 → 0.4.0

ocamlPackages.phylogenetics: 2020-01-25 → 2020-11-23

Co-authored-by: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
@vbgl
Copy link
Contributor Author

vbgl commented Dec 17, 2020

Thanks a lot! I’ve added your changes to the last commit of this PR.

@sternenseemann
Copy link
Member

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

244 packages built:
  • acgtk
  • coqPackages.coq-elpi
  • coqPackages.hierarchy-builder
  • dune-release
  • eff
  • flow
  • framac
  • jackline
  • libbap
  • ocaml-crunch
  • ocamlPackages.accessor
  • ocamlPackages.accessor_async
  • ocamlPackages.accessor_base
  • ocamlPackages.accessor_core
  • ocamlPackages.angstrom
  • ocamlPackages.angstrom-async
  • ocamlPackages.angstrom-lwt-unix
  • ocamlPackages.angstrom-unix
  • ocamlPackages.asn1-combinators
  • ocamlPackages.async
  • ocamlPackages.async_extra
  • ocamlPackages.async_find
  • ocamlPackages.async_inotify
  • ocamlPackages.async_interactive
  • ocamlPackages.async_js
  • ocamlPackages.async_kernel
  • ocamlPackages.async_rpc_kernel
  • ocamlPackages.async_sendfile
  • ocamlPackages.async_shell
  • ocamlPackages.async_smtp
  • ocamlPackages.async_ssl
  • ocamlPackages.async_unix
  • ocamlPackages.base
  • ocamlPackages.base_bigstring
  • ocamlPackages.base_quickcheck
  • ocamlPackages.bignum
  • ocamlPackages.bin_prot
  • ocamlPackages.biocaml
  • ocamlPackages.bistro
  • ocamlPackages.bonsai
  • ocamlPackages.ca-certs
  • ocamlPackages.camlimages
  • ocamlPackages.cfstream
  • ocamlPackages.cinaps
  • ocamlPackages.cohttp
  • ocamlPackages.cohttp-async
  • ocamlPackages.cohttp-lwt
  • ocamlPackages.cohttp-lwt-unix
  • ocamlPackages.conduit
  • ocamlPackages.conduit-async
  • ocamlPackages.conduit-lwt
  • ocamlPackages.conduit-lwt-unix
  • ocamlPackages.containers
  • ocamlPackages.containers-data
  • ocamlPackages.core
  • ocamlPackages.core_bench
  • ocamlPackages.core_extended
  • ocamlPackages.core_kernel
  • ocamlPackages.cow
  • ocamlPackages.crunch
  • ocamlPackages.cstruct-sexp
  • ocamlPackages.csvfields
  • ocamlPackages.curly
  • ocamlPackages.delimited_parsing
  • ocamlPackages.dns
  • ocamlPackages.dns-client
  • ocamlPackages.ecaml
  • ocamlPackages.eliom
  • ocamlPackages.elpi
  • ocamlPackages.email_message
  • ocamlPackages.encore
  • ocamlPackages.expect_test_helpers_async
  • ocamlPackages.expect_test_helpers_core
  • ocamlPackages.ezjsonm
  • ocamlPackages.fiat-p256
  • ocamlPackages.fieldslib
  • ocamlPackages.functoria
  • ocamlPackages.functoria-runtime
  • ocamlPackages.git
  • ocamlPackages.git-http
  • ocamlPackages.git-unix
  • ocamlPackages.graphql-cohttp
  • ocamlPackages.higher_kinded
  • ocamlPackages.httpaf
  • ocamlPackages.incr_dom
  • ocamlPackages.incr_map
  • ocamlPackages.incr_select
  • ocamlPackages.incremental
  • ocamlPackages.index
  • ocamlPackages.ipaddr
  • ocamlPackages.ipaddr-cstruct
  • ocamlPackages.ipaddr-sexp
  • ocamlPackages.irmin
  • ocamlPackages.irmin-fs
  • ocamlPackages.irmin-git
  • ocamlPackages.irmin-graphql
  • ocamlPackages.irmin-http
  • ocamlPackages.irmin-mem
  • ocamlPackages.irmin-pack
  • ocamlPackages.irmin-test
  • ocamlPackages.irmin-unix
  • ocamlPackages.iter
  • ocamlPackages.jane-street-headers
  • ocamlPackages.js_of_ocaml
  • ocamlPackages.js_of_ocaml-compiler
  • ocamlPackages.js_of_ocaml-lwt
  • ocamlPackages.js_of_ocaml-ocamlbuild
  • ocamlPackages.js_of_ocaml-ppx
  • ocamlPackages.js_of_ocaml-ppx_deriving_json
  • ocamlPackages.js_of_ocaml-tyxml
  • ocamlPackages.jst-config
  • ocamlPackages.kafka
  • ocamlPackages.macaddr
  • ocamlPackages.macaddr-cstruct
  • ocamlPackages.macaddr-sexp
  • ocamlPackages.mdx
  • ocamlPackages.metrics-mirage
  • ocamlPackages.metrics-unix
  • ocamlPackages.mirage
  • ocamlPackages.mirage-crypto-pk
  • ocamlPackages.mirage-crypto-rng
  • ocamlPackages.mirage-crypto-rng-mirage
  • ocamlPackages.mirage-logs
  • ocamlPackages.mirage-net
  • ocamlPackages.mirage-profile
  • ocamlPackages.mirage-protocols
  • ocamlPackages.mirage-runtime
  • ocamlPackages.mirage-stack
  • ocamlPackages.mirage-types
  • ocamlPackages.mirage-types-lwt
  • ocamlPackages.mirage-unix
  • ocamlPackages.mtime
  • ocamlPackages.mustache
  • ocamlPackages.nocrypto
  • ocamlPackages.ocaml-compiler-libs
  • ocamlPackages.ocaml-r
  • ocamlPackages.ocplib-json-typed
  • ocamlPackages.ocplib-json-typed-browser
  • ocamlPackages.ocplib-json-typed-bson
  • ocamlPackages.ocsigen-start
  • ocamlPackages.ocsigen-toolkit
  • ocamlPackages.ocsigen_server
  • ocamlPackages.odoc
  • ocamlPackages.opium
  • ocamlPackages.opium_kernel
  • ocamlPackages.otr
  • ocamlPackages.owl
  • ocamlPackages.parsexp
  • ocamlPackages.patience_diff
  • ocamlPackages.pgocaml
  • ocamlPackages.pgocaml_ppx
  • ocamlPackages.phylogenetics
  • ocamlPackages.posixat
  • ocamlPackages.ppx_accessor
  • ocamlPackages.ppx_assert
  • ocamlPackages.ppx_base
  • ocamlPackages.ppx_bench
  • ocamlPackages.ppx_bin_prot
  • ocamlPackages.ppx_cold
  • ocamlPackages.ppx_compare
  • ocamlPackages.ppx_cstruct
  • ocamlPackages.ppx_custom_printf
  • ocamlPackages.ppx_deriving_rpc
  • ocamlPackages.ppx_enumerate
  • ocamlPackages.ppx_expect
  • ocamlPackages.ppx_fields_conv
  • ocamlPackages.ppx_fixed_literal
  • ocamlPackages.ppx_hash
  • ocamlPackages.ppx_here
  • ocamlPackages.ppx_inline_test
  • ocamlPackages.ppx_irmin
  • ocamlPackages.ppx_jane
  • ocamlPackages.ppx_js_style
  • ocamlPackages.ppx_let
  • ocamlPackages.ppx_module_timer
  • ocamlPackages.ppx_optcomp
  • ocamlPackages.ppx_optional
  • ocamlPackages.ppx_pattern_bind
  • ocamlPackages.ppx_pipebang
  • ocamlPackages.ppx_sexp_conv
  • ocamlPackages.ppx_sexp_message
  • ocamlPackages.ppx_sexp_value
  • ocamlPackages.ppx_stable
  • ocamlPackages.ppx_string
  • ocamlPackages.ppx_typerep_conv
  • ocamlPackages.ppx_variants_conv
  • ocamlPackages.ppxlib
  • ocamlPackages.prof_spacetime
  • ocamlPackages.protocol_version_header
  • ocamlPackages.ptime
  • ocamlPackages.re2
  • ocamlPackages.re2_stable
  • ocamlPackages.resource_cache
  • ocamlPackages.rpclib-lwt
  • ocamlPackages.secp256k1
  • ocamlPackages.sexp
  • ocamlPackages.sexp_diff_kernel
  • ocamlPackages.sexp_macro
  • ocamlPackages.sexp_pretty
  • ocamlPackages.sexp_select
  • ocamlPackages.sexplib
  • ocamlPackages.sexplib0
  • ocamlPackages.shell
  • ocamlPackages.shexp
  • ocamlPackages.spawn
  • ocamlPackages.splay_tree
  • ocamlPackages.splittable_random
  • ocamlPackages.stdio
  • ocamlPackages.textutils
  • ocamlPackages.time_now
  • ocamlPackages.timezone
  • ocamlPackages.tls
  • ocamlPackages.topological_sort
  • ocamlPackages.torch
  • ocamlPackages.tsort
  • ocamlPackages.tuntap
  • ocamlPackages.typerep
  • ocamlPackages.uri
  • ocamlPackages.uri-sexp
  • ocamlPackages.variantslib
  • ocamlPackages.vcaml
  • ocamlPackages.vg
  • ocamlPackages.virtual_dom
  • ocamlPackages.webmachine
  • ocamlPackages.x509
  • ocamlPackages.xtmpl
  • ocamlPackages.yaml
  • ocamlPackages.zarith_stubs_js
  • ocamlPackages.zstandard
  • ocamlformat (ocamlformat_0_15_0)
  • ocamlformat_0_11_0
  • ocamlformat_0_12
  • ocamlformat_0_13_0
  • ocamlformat_0_14_0
  • ocamlformat_0_14_1
  • ocamlformat_0_14_2
  • ocamlformat_0_14_3
  • patdiff
  • python37Packages.bap
  • python38Packages.bap
  • python39Packages.bap
  • satysfi
  • stog
  • why3

sternenseemann
sternenseemann approved these changes Dec 18, 2020
View reviewed changes
Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No objections from my side.

@vbgl vbgl merged commit b6f7f1f into NixOS:master Dec 18, 2020
@vbgl vbgl deleted the ocaml-janestreet-0.14 branch December 18, 2020 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sternenseemann sternenseemann sternenseemann approved these changes

@Zimmi48 Zimmi48 Awaiting requested review from Zimmi48

@marsam marsam Awaiting requested review from marsam

Assignees
No one assigned
Labels
6.topic: ocaml 8.has: package (update) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vbgl @bcc32 @sternenseemann