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.

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

dune: let dune 1 install itself #109143

Merged
merged 6 commits into from Jan 21, 2021
Merged

Conversation

sternenseemann
Copy link
Member

Motivation for this change

This removes the dependency on opaline and means we could use dune for opam-file-format and the likes.

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.

@sternenseemann
Copy link
Member Author

sternenseemann commented Jan 12, 2021

Build errors:

Result of nixpkgs-review pr 109143 1

6 packages failed to build:
  • dune-release
  • ocamlPackages.genspio
  • ocamlPackages.irmin-http
  • ocamlPackages.irmin-unix
  • ocamlPackages.nonstd
  • ocamlPackages.sosa
532 packages built:
  • acgtk
  • alt-ergo
  • beluga
  • compcert
  • coq (coqPackages.coq ,coq_8_11)
  • coqPackages.Cheerios
  • coqPackages.CoLoR
  • coqPackages.InfSeqExt
  • coqPackages.QuickChick
  • coqPackages.StructTact
  • coqPackages.VST
  • coqPackages.Verdi
  • coqPackages.bignums
  • coqPackages.contribs.zorns-lemma
  • coqPackages.coq-bits
  • coqPackages.coq-elpi
  • coqPackages.coq-ext-lib
  • coqPackages.coqeal
  • coqPackages.coqhammer
  • coqPackages.coqprime
  • coqPackages.coquelicot
  • coqPackages.dpdgraph
  • coqPackages.equations
  • coqPackages.flocq
  • coqPackages.gappalib
  • coqPackages.hierarchy-builder
  • coqPackages.interval
  • coqPackages.iris
  • coqPackages.math-classes
  • coqPackages.mathcomp
  • coqPackages.mathcomp-algebra
  • coqPackages.mathcomp-analysis
  • coqPackages.mathcomp-bigenough
  • coqPackages.mathcomp-character
  • coqPackages.mathcomp-field
  • coqPackages.mathcomp-fingroup
  • coqPackages.mathcomp-finmap
  • coqPackages.mathcomp-real-closed
  • coqPackages.mathcomp-solvable
  • coqPackages.ssreflect (coqPackages.mathcomp-ssreflect)
  • coqPackages.metalib
  • coqPackages.multinomials
  • coqPackages.paco
  • coqPackages.paramcoq
  • coqPackages.simple-io
  • coqPackages.stdpp
  • coqPackages.tlc
  • coq_8_10
  • coq_8_12
  • coq_8_13
  • dot-merlin-reader
  • dune (jbuilder)
  • eff
  • flow
  • framac
  • fstar
  • google-drive-ocamlfuse
  • jackline
  • libbap
  • libguestfs
  • libguestfs-with-appliance
  • liquidsoap
  • obelisk
  • ocaml-crunch
  • ocaml-top
  • ocamlPackages.accessor
  • ocamlPackages.accessor_async
  • ocamlPackages.accessor_base
  • ocamlPackages.accessor_core
  • ocamlPackages.alcotest
  • ocamlPackages.alcotest-lwt
  • ocamlPackages.angstrom
  • ocamlPackages.angstrom-async
  • ocamlPackages.angstrom-lwt-unix
  • ocamlPackages.angstrom-unix
  • ocamlPackages.arp
  • 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.atd
  • ocamlPackages.atdgen
  • ocamlPackages.base
  • ocamlPackages.base64
  • ocamlPackages.base_bigstring
  • ocamlPackages.base_quickcheck
  • ocamlPackages.batteries
  • ocamlPackages.bigarray-compat
  • ocamlPackages.bigarray-overlap
  • ocamlPackages.bignum
  • ocamlPackages.bigstring
  • ocamlPackages.bigstringaf
  • ocamlPackages.bin_prot
  • ocamlPackages.biniou
  • ocamlPackages.biocaml
  • ocamlPackages.bisect_ppx
  • ocamlPackages.bistro
  • ocamlPackages.bitstring
  • ocamlPackages.bonsai
  • ocamlPackages.bos
  • ocamlPackages.ca-certs
  • ocamlPackages.cairo2
  • ocamlPackages.camlimages
  • ocamlPackages.camomile
  • ocamlPackages.cfstream
  • ocamlPackages.charInfo_width
  • ocamlPackages.checkseum
  • ocamlPackages.cinaps
  • ocamlPackages.cmdliner
  • 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.cpu
  • ocamlPackages.cpuid
  • ocamlPackages.crowbar
  • ocamlPackages.crunch
  • ocamlPackages.cryptokit
  • ocamlPackages.csexp
  • ocamlPackages.cstruct
  • ocamlPackages.cstruct-lwt
  • ocamlPackages.cstruct-sexp
  • ocamlPackages.cstruct-unix
  • ocamlPackages.csv-lwt
  • ocamlPackages.csvfields
  • ocamlPackages.ctypes
  • ocamlPackages.curly
  • ocamlPackages.decompress
  • ocamlPackages.delimited_parsing
  • ocamlPackages.diet
  • 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.dtoa
  • ocamlPackages.duff
  • ocamlPackages.dune-configurator
  • ocamlPackages.duration
  • ocamlPackages.earley
  • ocamlPackages.ecaml
  • ocamlPackages.eigen
  • ocamlPackages.eliom
  • ocamlPackages.elpi
  • ocamlPackages.email_message
  • ocamlPackages.encore
  • ocamlPackages.eqaf
  • ocamlPackages.ethernet
  • ocamlPackages.expect_test_helpers_async
  • ocamlPackages.expect_test_helpers_core
  • ocamlPackages.ezjsonm
  • ocamlPackages.ezxmlm
  • ocamlPackages.facile
  • ocamlPackages.faraday
  • ocamlPackages.farfadet
  • ocamlPackages.fdkaac
  • ocamlPackages.fiat-p256
  • ocamlPackages.fieldslib
  • ocamlPackages.fileutils
  • ocamlPackages.fmt
  • ocamlPackages.functoria
  • ocamlPackages.functoria-runtime
  • ocamlPackages.gapi_ocaml
  • ocamlPackages.gen
  • ocamlPackages.gettext-stub
  • ocamlPackages.git
  • ocamlPackages.git-http
  • ocamlPackages.git-unix
  • ocamlPackages.gmap
  • ocamlPackages.gnuplot
  • ocamlPackages.graphics
  • ocamlPackages.graphql
  • ocamlPackages.graphql-cohttp
  • ocamlPackages.graphql-lwt
  • ocamlPackages.graphql_parser
  • ocamlPackages.graphql_ppx
  • ocamlPackages.gsl
  • ocamlPackages.hacl_x25519
  • ocamlPackages.hex
  • ocamlPackages.hidapi
  • ocamlPackages.higher_kinded
  • ocamlPackages.hkdf
  • ocamlPackages.httpaf
  • ocamlPackages.imagelib
  • ocamlPackages.imagelib-unix
  • ocamlPackages.incr_dom
  • ocamlPackages.incr_map
  • ocamlPackages.incr_select
  • ocamlPackages.incremental
  • ocamlPackages.index
  • ocamlPackages.inotify
  • ocamlPackages.integers
  • ocamlPackages.io-page
  • ocamlPackages.io-page-unix
  • 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-mem
  • ocamlPackages.irmin-pack
  • ocamlPackages.irmin-test
  • 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.lablgtk3
  • ocamlPackages.lablgtk3-gtkspell3
  • ocamlPackages.lablgtk3-sourceview3
  • ocamlPackages.lacaml
  • ocamlPackages.lambdaTerm
  • ocamlPackages.lambdasoup
  • ocamlPackages.linenoise
  • ocamlPackages.llvm
  • ocamlPackages.logs
  • ocamlPackages.lru
  • ocamlPackages.lua-ml
  • ocamlPackages.lwt
  • ocamlPackages.lwt-dllist
  • ocamlPackages.lwt_log
  • ocamlPackages.lwt_ppx
  • ocamlPackages.lwt_react
  • ocamlPackages.lwt_ssl
  • ocamlPackages.macaddr
  • ocamlPackages.macaddr-cstruct
  • ocamlPackages.macaddr-sexp
  • ocamlPackages.markup
  • ocamlPackages.mdx
  • ocamlPackages.merlin
  • ocamlPackages.merlin-extend
  • ocamlPackages.metrics
  • ocamlPackages.metrics-influx
  • ocamlPackages.metrics-lwt
  • ocamlPackages.metrics-mirage
  • ocamlPackages.metrics-unix
  • ocamlPackages.mew
  • ocamlPackages.mew_vi
  • ocamlPackages.minisat
  • 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-clock
  • ocamlPackages.mirage-clock-unix
  • ocamlPackages.mirage-console
  • ocamlPackages.mirage-console-unix
  • ocamlPackages.mirage-crypto
  • 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-random
  • ocamlPackages.mirage-random-test
  • ocamlPackages.mirage-runtime
  • ocamlPackages.mirage-stack
  • ocamlPackages.mirage-time
  • ocamlPackages.mirage-time-unix
  • ocamlPackages.mirage-types
  • ocamlPackages.mirage-types-lwt
  • ocamlPackages.mirage-unix
  • ocamlPackages.mirage-vnetif
  • ocamlPackages.mmap
  • ocamlPackages.mtime
  • ocamlPackages.mustache
  • ocamlPackages.nocrypto
  • ocamlPackages.notty
  • ocamlPackages.npy
  • ocamlPackages.ocaml-lsp
  • ocamlPackages.ocaml-migrate-parsetree
  • ocamlPackages.ocaml-migrate-parsetree-2-1
  • ocamlPackages.ocaml-monadic
  • ocamlPackages.ocaml-protoc
  • ocamlPackages.ocaml-r
  • ocamlPackages.ocaml-sat-solvers
  • ocamlPackages.ocaml-version
  • ocamlPackages.ocaml_expat
  • ocamlPackages.ocaml_gettext
  • ocamlPackages.ocaml_oasis
  • ocamlPackages.ocaml_sqlite3
  • ocamlPackages.ocamlfuse
  • ocamlPackages.ocamlmod
  • ocamlPackages.ocp-build
  • ocamlPackages.ocp-indent
  • ocamlPackages.ocp-index
  • 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.opam-core
  • ocamlPackages.opam-format
  • ocamlPackages.opam-repository
  • ocamlPackages.opam-state
  • ocamlPackages.opium
  • ocamlPackages.opium_kernel
  • ocamlPackages.opti
  • ocamlPackages.optint
  • ocamlPackages.otfm
  • ocamlPackages.otr
  • ocamlPackages.ounit
  • ocamlPackages.ounit2
  • ocamlPackages.owee
  • ocamlPackages.owl
  • ocamlPackages.parany
  • ocamlPackages.parmap
  • ocamlPackages.parse-argv
  • ocamlPackages.parsexp
  • ocamlPackages.patience_diff
  • ocamlPackages.pcap-format
  • ocamlPackages.pgocaml
  • ocamlPackages.pgocaml_ppx
  • ocamlPackages.pgsolver
  • ocamlPackages.phylogenetics
  • ocamlPackages.piqi
  • ocamlPackages.piqi-ocaml
  • ocamlPackages.posix-base
  • ocamlPackages.posix-socket
  • ocamlPackages.posix-types
  • 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_derivers
  • ocamlPackages.ppx_deriving
  • ocamlPackages.ppx_deriving_protobuf
  • ocamlPackages.ppx_deriving_rpc
  • ocamlPackages.ppx_deriving_yojson
  • ocamlPackages.ppx_enumerate
  • ocamlPackages.ppx_expect
  • ocamlPackages.ppx_fields_conv
  • ocamlPackages.ppx_fixed_literal
  • ocamlPackages.ppx_gen_rec
  • 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_sexp_conv
  • ocamlPackages.ppx_sexp_message
  • ocamlPackages.ppx_sexp_value
  • ocamlPackages.ppx_stable
  • ocamlPackages.ppx_string
  • ocamlPackages.ppx_tools
  • ocamlPackages.ppx_tools_versioned
  • ocamlPackages.ppx_typerep_conv
  • ocamlPackages.ppx_variants_conv
  • ocamlPackages.ppx_yojson_conv_lib
  • ocamlPackages.ppxfind
  • ocamlPackages.ppxlib
  • ocamlPackages.printbox
  • ocamlPackages.prof_spacetime
  • ocamlPackages.protocol_version_header
  • ocamlPackages.psq
  • ocamlPackages.ptime
  • ocamlPackages.ptmap
  • ocamlPackages.ptset
  • ocamlPackages.qcheck
  • ocamlPackages.qcheck-alcotest
  • ocamlPackages.qcheck-ounit
  • ocamlPackages.qtest
  • ocamlPackages.randomconv
  • ocamlPackages.re
  • ocamlPackages.re2
  • ocamlPackages.re2_stable
  • ocamlPackages.reason
  • ocamlPackages.resource-pooling
  • ocamlPackages.resource_cache
  • ocamlPackages.result
  • ocamlPackages.rope
  • ocamlPackages.rpclib
  • ocamlPackages.rpclib-lwt
  • ocamlPackages.rresult
  • ocamlPackages.safepass
  • ocamlPackages.secp256k1
  • ocamlPackages.sedlex
  • 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.spacetime_lib
  • ocamlPackages.spawn
  • ocamlPackages.spelll
  • ocamlPackages.splay_tree
  • ocamlPackages.splittable_random
  • ocamlPackages.srt
  • ocamlPackages.ssl
  • ocamlPackages.stdint
  • ocamlPackages.stdio
  • ocamlPackages.stdlib-shims
  • ocamlPackages.stringext
  • ocamlPackages.syslog-message
  • ocamlPackages.tcpip
  • ocamlPackages.tcslib
  • ocamlPackages.textutils
  • ocamlPackages.time_now
  • ocamlPackages.timezone
  • ocamlPackages.tls
  • ocamlPackages.toml
  • ocamlPackages.topological_sort
  • ocamlPackages.torch
  • ocamlPackages.tsdl
  • ocamlPackages.tsort
  • ocamlPackages.tuntap
  • ocamlPackages.typerep
  • ocamlPackages.tyxml
  • ocamlPackages.uri
  • ocamlPackages.uri-sexp
  • ocamlPackages.utop
  • ocamlPackages.uucp
  • ocamlPackages.uuidm
  • ocamlPackages.uunf
  • ocamlPackages.uuseg
  • ocamlPackages.uutf
  • ocamlPackages.variantslib
  • ocamlPackages.vcaml
  • ocamlPackages.vg
  • ocamlPackages.virtual_dom
  • ocamlPackages.visitors
  • ocamlPackages.webbrowser
  • ocamlPackages.webmachine
  • ocamlPackages.wtf8
  • ocamlPackages.x509
  • ocamlPackages.xtmpl
  • ocamlPackages.yaml
  • ocamlPackages.yojson
  • ocamlPackages.zed
  • ocamlPackages.zmq
  • ocamlPackages.zmq-lwt
  • 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
  • ocsigen-i18n
  • opa
  • orpie
  • patdiff
  • python37Packages.bap
  • python37Packages.guestfs
  • python38Packages.bap
  • python38Packages.guestfs
  • python39Packages.bap
  • python39Packages.guestfs
  • satallax
  • satysfi
  • stog
  • vagrant
  • virt-top
  • why3

@vbgl vbgl merged commit 095ef20 into NixOS:master Jan 21, 2021
@sternenseemann sternenseemann deleted the dune-install-itself branch January 21, 2021 11:31
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jan 28, 2021
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.
vbgl pushed a commit that referenced this pull request Jan 28, 2021
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.
aforemny pushed a commit to aforemny/nixpkgs that referenced this pull request Mar 4, 2021
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 sternenseemann restored the dune-install-itself branch July 24, 2021 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants