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.opam-file-format: build using dune #110353

Merged
merged 1 commit into from Jan 28, 2021
Merged

ocamlPackages.opam-file-format: build using dune #110353

merged 1 commit into from Jan 28, 2021

Conversation

sternenseemann
Copy link
Member

Since #109143 has been merged,
switching opam-file-format doesn't create a cyclical dependency of
opam-file-format -> dune -> opaline -> opam-file-format anymore.

Thus we switch to dune which seems to be supported better by upstream
and doesn't require us to patch the 2.1.2 release.

Motivation for this change
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
Copy link
Contributor

vbgl commented Jan 28, 2021

Please set useDune2.

@sternenseemann
ocamlPackages.opam-file-format: build using dune
919223b 
Since <NixOS#109143> has been merged,
switching opam-file-format doesn't create a cyclical dependency of
opam-file-format -> dune -> opaline -> opam-file-format anymore.

Thus we switch to dune which seems to be supported better by upstream
and doesn't require us to patch the 2.1.2 release.
@sternenseemann
Copy link
Member Author

Done, will have to check if it breaks anything though.

@sternenseemann
Copy link
Member Author

sternenseemann commented Jan 28, 2021 •
edited

Looks good: Result of nixpkgs-review pr 110353 1

389 packages built:
  • acgtk
  • beluga
  • coqPackages.coq-elpi
  • coqPackages.hierarchy-builder
  • dune-release
  • eff
  • flow
  • framac
  • jackline
  • libbap
  • liquidsoap
  • ocaml-crunch
  • ocaml-top
  • ocamlPackages.accessor
  • ocamlPackages.accessor_async
  • ocamlPackages.accessor_base
  • ocamlPackages.accessor_core
  • ocamlPackages.afl-persistent
  • ocamlPackages.alcotest
  • ocamlPackages.alcotest-lwt
  • ocamlPackages.angstrom
  • ocamlPackages.angstrom-async
  • ocamlPackages.angstrom-lwt-unix
  • ocamlPackages.angstrom-unix
  • ocamlPackages.arp
  • ocamlPackages.asn1-combinators
  • ocamlPackages.astring
  • 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.awa
  • ocamlPackages.awa-lwt
  • ocamlPackages.awa-mirage
  • ocamlPackages.base
  • ocamlPackages.base64
  • ocamlPackages.base_bigstring
  • ocamlPackages.base_quickcheck
  • ocamlPackages.bigarray-overlap
  • ocamlPackages.bignum
  • ocamlPackages.bigstringaf
  • ocamlPackages.bin_prot
  • ocamlPackages.biocaml
  • ocamlPackages.bisect_ppx
  • ocamlPackages.bistro
  • ocamlPackages.bonsai
  • ocamlPackages.bos
  • ocamlPackages.ca-certs
  • ocamlPackages.camlimages
  • ocamlPackages.cfstream
  • ocamlPackages.checkseum
  • ocamlPackages.cinaps
  • ocamlPackages.cmdliner
  • ocamlPackages.cohttp
  • ocamlPackages.cohttp-async
  • ocamlPackages.cohttp-lwt
  • ocamlPackages.cohttp-lwt-unix
  • ocamlPackages.cohttp-mirage
  • ocamlPackages.conduit
  • ocamlPackages.conduit-async
  • ocamlPackages.conduit-lwt
  • ocamlPackages.conduit-lwt-unix
  • ocamlPackages.conduit-mirage
  • ocamlPackages.containers
  • ocamlPackages.containers-data
  • ocamlPackages.core
  • ocamlPackages.core_bench
  • ocamlPackages.core_extended
  • ocamlPackages.core_kernel
  • ocamlPackages.cow
  • ocamlPackages.crowbar
  • ocamlPackages.crunch
  • ocamlPackages.cstruct-sexp
  • ocamlPackages.csvfields
  • ocamlPackages.curly
  • ocamlPackages.decompress
  • ocamlPackages.delimited_parsing
  • ocamlPackages.digestif
  • ocamlPackages.dispatch
  • ocamlPackages.dns
  • ocamlPackages.dns-certify
  • ocamlPackages.dns-cli
  • ocamlPackages.dns-client
  • ocamlPackages.dns-mirage
  • ocamlPackages.dns-resolver
  • ocamlPackages.dns-server
  • ocamlPackages.dns-stub
  • ocamlPackages.dns-tsig
  • ocamlPackages.domain-name
  • ocamlPackages.duff
  • ocamlPackages.duration
  • ocamlPackages.ecaml
  • ocamlPackages.eliom
  • ocamlPackages.elpi
  • ocamlPackages.email_message
  • ocamlPackages.emile
  • ocamlPackages.encore
  • ocamlPackages.ethernet
  • ocamlPackages.expect_test_helpers_async
  • ocamlPackages.expect_test_helpers_core
  • ocamlPackages.ezjsonm
  • ocamlPackages.ezxmlm
  • ocamlPackages.faraday
  • ocamlPackages.farfadet
  • ocamlPackages.fiat-p256
  • ocamlPackages.fieldslib
  • ocamlPackages.fmt
  • ocamlPackages.fpath
  • ocamlPackages.functoria
  • ocamlPackages.functoria-runtime
  • ocamlPackages.gg
  • ocamlPackages.git
  • ocamlPackages.git-http
  • ocamlPackages.git-unix
  • ocamlPackages.gmap
  • ocamlPackages.graphql
  • ocamlPackages.graphql-cohttp
  • ocamlPackages.graphql-lwt
  • ocamlPackages.graphql_parser
  • ocamlPackages.graphql_ppx
  • ocamlPackages.hacl_x25519
  • ocamlPackages.higher_kinded
  • ocamlPackages.hkdf
  • ocamlPackages.hmap
  • ocamlPackages.httpaf
  • ocamlPackages.hxd
  • ocamlPackages.imagelib
  • ocamlPackages.imagelib-unix
  • ocamlPackages.incr_dom
  • ocamlPackages.incr_map
  • ocamlPackages.incr_select
  • ocamlPackages.incremental
  • ocamlPackages.index
  • ocamlPackages.ipaddr
  • ocamlPackages.ipaddr-cstruct
  • ocamlPackages.ipaddr-sexp
  • ocamlPackages.iri
  • ocamlPackages.irmin
  • ocamlPackages.irmin-chunk
  • 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.irmin-watcher
  • ocamlPackages.iter
  • ocamlPackages.jingoo
  • ocamlPackages.js_of_ocaml
  • ocamlPackages.js_of_ocaml-compiler
  • ocamlPackages.js_of_ocaml-lwt
  • ocamlPackages.js_of_ocaml-ppx
  • ocamlPackages.js_of_ocaml-ppx_deriving_json
  • ocamlPackages.js_of_ocaml-tyxml
  • ocamlPackages.jsonm
  • ocamlPackages.jst-config
  • ocamlPackages.jwto
  • ocamlPackages.kafka
  • ocamlPackages.ke
  • ocamlPackages.lambdaTerm
  • ocamlPackages.lambdasoup
  • ocamlPackages.logs
  • ocamlPackages.lua-ml
  • ocamlPackages.lwt_ppx
  • ocamlPackages.lwt_react
  • ocamlPackages.macaddr
  • ocamlPackages.macaddr-cstruct
  • ocamlPackages.macaddr-sexp
  • ocamlPackages.markup
  • ocamlPackages.mdx
  • ocamlPackages.metrics
  • ocamlPackages.metrics-influx
  • ocamlPackages.metrics-lwt
  • ocamlPackages.metrics-mirage
  • ocamlPackages.metrics-unix
  • ocamlPackages.mew_vi
  • ocamlPackages.mimic
  • ocamlPackages.mirage
  • ocamlPackages.mirage-block
  • ocamlPackages.mirage-block-combinators
  • ocamlPackages.mirage-block-ramdisk
  • ocamlPackages.mirage-block-unix
  • ocamlPackages.mirage-bootvar-unix
  • ocamlPackages.mirage-channel
  • ocamlPackages.mirage-console
  • ocamlPackages.mirage-console-unix
  • ocamlPackages.mirage-crypto-pk
  • ocamlPackages.mirage-crypto-rng
  • ocamlPackages.mirage-crypto-rng-async
  • ocamlPackages.mirage-crypto-rng-mirage
  • ocamlPackages.mirage-device
  • ocamlPackages.mirage-flow
  • ocamlPackages.mirage-flow-combinators
  • ocamlPackages.mirage-flow-unix
  • ocamlPackages.mirage-fs
  • ocamlPackages.mirage-kv
  • ocamlPackages.mirage-logs
  • ocamlPackages.mirage-nat
  • ocamlPackages.mirage-net
  • ocamlPackages.mirage-profile
  • ocamlPackages.mirage-protocols
  • ocamlPackages.mirage-runtime
  • ocamlPackages.mirage-stack
  • ocamlPackages.mirage-time-unix
  • ocamlPackages.mirage-types
  • ocamlPackages.mirage-types-lwt
  • ocamlPackages.mirage-unix
  • ocamlPackages.mirage-vnetif
  • ocamlPackages.mtime
  • ocamlPackages.mustache
  • ocamlPackages.nocrypto
  • ocamlPackages.notty
  • ocamlPackages.ocaml-lsp
  • ocamlPackages.ocaml-r
  • ocamlPackages.ocb-stubblr
  • ocamlPackages.ocp-build
  • ocamlPackages.ocp-indent
  • ocamlPackages.ocp-index
  • ocamlPackages.ocp-ocamlres
  • ocamlPackages.ocplib-json-typed
  • ocamlPackages.ocplib-json-typed-browser
  • ocamlPackages.ocplib-json-typed-bson
  • ocamlPackages.ocsigen-start
  • ocamlPackages.ocsigen-toolkit
  • ocamlPackages.ocsigen_server
  • ocamlPackages.octavius
  • ocamlPackages.odoc
  • ocamlPackages.opam-file-format
  • ocamlPackages.opam-format
  • ocamlPackages.opam-repository
  • ocamlPackages.opam-state
  • ocamlPackages.opium
  • ocamlPackages.opium_kernel
  • ocamlPackages.otfm
  • ocamlPackages.otr
  • ocamlPackages.owl
  • ocamlPackages.parse-argv
  • ocamlPackages.parsexp
  • ocamlPackages.patience_diff
  • ocamlPackages.pcap-format
  • ocamlPackages.pecu
  • ocamlPackages.pgocaml
  • ocamlPackages.pgocaml_ppx
  • ocamlPackages.phylogenetics
  • ocamlPackages.piqi
  • ocamlPackages.piqi-ocaml
  • ocamlPackages.posixat
  • ocamlPackages.ppx_accessor
  • ocamlPackages.ppx_assert
  • ocamlPackages.ppx_base
  • ocamlPackages.ppx_bench
  • ocamlPackages.ppx_bin_prot
  • ocamlPackages.ppx_bitstring
  • ocamlPackages.ppx_blob
  • 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_import
  • 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_repr
  • 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.printbox
  • ocamlPackages.prof_spacetime
  • ocamlPackages.protocol_version_header
  • ocamlPackages.ptime
  • ocamlPackages.qcheck-alcotest
  • ocamlPackages.re2
  • ocamlPackages.re2_stable
  • ocamlPackages.react
  • ocamlPackages.reactivedata
  • ocamlPackages.reason
  • ocamlPackages.repr
  • ocamlPackages.resource_cache
  • ocamlPackages.rpclib
  • ocamlPackages.rpclib-lwt
  • ocamlPackages.rresult
  • ocamlPackages.secp256k1
  • ocamlPackages.sedlex_2
  • ocamlPackages.sexp
  • ocamlPackages.sexp_diff_kernel
  • ocamlPackages.sexp_macro
  • ocamlPackages.sexp_pretty
  • ocamlPackages.sexp_select
  • ocamlPackages.sexplib
  • ocamlPackages.shell
  • ocamlPackages.shexp
  • ocamlPackages.spawn
  • ocamlPackages.splay_tree
  • ocamlPackages.splittable_random
  • ocamlPackages.stdio
  • ocamlPackages.syslog-message
  • ocamlPackages.tcpip
  • ocamlPackages.textutils
  • ocamlPackages.time_now
  • ocamlPackages.timezone
  • ocamlPackages.tls
  • ocamlPackages.tls-mirage
  • ocamlPackages.topkg
  • ocamlPackages.topological_sort
  • ocamlPackages.torch
  • ocamlPackages.tsdl
  • ocamlPackages.tsort
  • ocamlPackages.tuntap
  • ocamlPackages.typerep
  • ocamlPackages.tyxml
  • ocamlPackages.uchar
  • ocamlPackages.uri
  • ocamlPackages.uri-sexp
  • ocamlPackages.utop
  • ocamlPackages.uucd
  • ocamlPackages.uucp
  • ocamlPackages.uuidm
  • ocamlPackages.uunf
  • ocamlPackages.uuseg
  • ocamlPackages.uutf
  • ocamlPackages.variantslib
  • ocamlPackages.vcaml
  • ocamlPackages.vchan
  • ocamlPackages.vg
  • ocamlPackages.virtual_dom
  • ocamlPackages.webbrowser
  • ocamlPackages.webmachine
  • ocamlPackages.wodan
  • ocamlPackages.wodan-irmin
  • ocamlPackages.wodan-unix
  • ocamlPackages.x509
  • ocamlPackages.xenstore
  • ocamlPackages.xenstore-tool
  • ocamlPackages.xenstore_transport
  • ocamlPackages.xmlm
  • ocamlPackages.xtmpl
  • ocamlPackages.yaml
  • ocamlPackages.zed
  • ocamlPackages.zstandard
  • ocamlformat (ocamlformat_0_16_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
  • ocamlformat_0_15_0
  • ocamlformat_0_15_1
  • opaline
  • opam-installer
  • ott
  • patdiff
  • python37Packages.bap
  • python38Packages.bap
  • python39Packages.bap
  • satysfi
  • stog
  • why3

@vbgl vbgl merged commit d226cb4 into NixOS:master Jan 28, 2021
@sternenseemann sternenseemann deleted the opam-file-format-dune branch January 28, 2021 21:41
@sternenseemann sternenseemann restored the opam-file-format-dune branch July 24, 2021 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbgl vbgl Awaiting requested review from vbgl

Assignees
No one assigned
Labels
6.topic: ocaml 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
2 participants
@sternenseemann @vbgl