1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

2393 commits

Author SHA1 Message Date
sternenseemann b0e2820ae2 ocamlPackages.luv: 0.5.7 -> 0.5.8 2021-05-18 22:28:27 +02:00
Vincent Laporte 7d9b6264b4 ocamlPackages.containers: 3.0.1 → 3.4 2021-05-18 18:15:55 +02:00
sternenseemann 2d3225a6c2 ocamlPackages.bap: fix for multiple outputs llvmPackages
7869d16545 split all packages in
llvmPackages into multiple outputs. The default output of llvm doesn't
contain llvm-config, so we need to explicitly choose llvm.dev here.
2021-05-18 01:44:31 +02:00
github-actions[bot] 10e16ec9ab
Merge master into staging-next 2021-05-11 06:20:33 +00:00
sterni f93d83d21b
ocamlPackages: cohttp: 2.5.0 -> 4.0.0; conduit: 2.2.2 -> 4.0.0 (#118144)
* ocamlPackages.x509: 0.12.0 -> 0.13.0

https://github.com/mirleft/ocaml-x509/releases/tag/v0.13.0

* ocamlPackages.tls{,-mirage}: 0.12.8 -> 0.13.1

https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.0
https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.1

* ocamlPackages.ca-certs: 0.2.0 -> 0.2.1

Adds support for NIX_SSL_CERT_FILE, so we can finally run its test
suite! https://github.com/mirage/ca-certs/releases/tag/v0.2.1

* ocamlPackages.dns*: 4.6.3 -> 5.0.0

* jackline: unstable-2020-09-03 -> unstable-2021-04-23

Compatibility with tls >= 0.13.0

* ocamlPackages.ca-certs-nss: init at 3.64.0.1

* ocamlPackages.conduit: 2.2.2 -> 2.3.0

https://github.com/mirage/ocaml-conduit/releases/tag/v2.3.0

* ocamlPackages.curly: fix tests with new ca-certs behavior

* ocamlPackages.cohttp: 2.5.0 -> 4.0.0

ocamlPackages.cohttp-lwt-unix: add description

https://github.com/mirage/ocaml-cohttp/releases/tag/v4.0.0

* ocamlPackages.mirage{,-runtime,-types*}: 3.10.1 -> 3.10.3

Adjust to a few changed dependencies:
https://github.com/mirage/mirage/releases/tag/v3.10.2
https://github.com/mirage/mirage/releases/tag/v3.10.3

* ocamlPackages.conduit*: 2.3.0 -> 4.0.0

https://github.com/mirage/ocaml-conduit/releases/tag/v4.0.0

* ocamlPackages.cohttp-lwt-unix: disable tests

* ocamlPackages.dns*: 5.0.0 -> 5.0.1

https://github.com/mirage/ocaml-dns/releases/tag/v5.0.1

* ocamlPackages.awa*: 0.0.1 -> 0.0.3

https://github.com/mirage/awa-ssh/releases/tag/v0.0.2
https://github.com/mirage/awa-ssh/releases/tag/v0.0.3

* ocamlPackages.optint: 0.0.4 -> 0.1.0

https://github.com/mirage/optint/releases/tag/v0.0.5
https://github.com/mirage/optint/releases/tag/v0.1.0

* ocamlPackages.decompress: 1.3.0 -> 1.4.0

https://github.com/mirage/decompress/releases/tag/v1.4.0

* ocamlPackages.checkseum: 0.2.1 -> 0.3.1

https://github.com/mirage/checkseum/releases/tag/v0.3.0
https://github.com/mirage/checkseum/releases/tag/v0.3.1

* ocamlPackages.checkseum: allow compilation with ocaml-freestanding

* ocamlPackages.carton: 0.4.0 -> 0.4.1

https://github.com/mirage/ocaml-git/releases/tag/carton-v0.4.1

* ocamlPackages.mimic: 0.0.2 -> 0.0.3

* Upstream changed.
* https://github.com/dinosaure/mimic/releases/tag/0.0.3

* ocamlPackages.letsencrypt: 0.2.4 -> 0.2.5

* ocamlPackages.paf: 0.0.1 -> 0.0.3

* ocamlPackages.git-cohttp-mirage: remove at 3.3.3

Will be replaced by git-paf 3.4.0.

* ocamlPackages.git*: 3.3.3 -> 3.4.0

ocamlPackages.git-paf: init at 3.4.0

https://github.com/mirage/ocaml-git/releases/tag/3.4.0

* ocamlPackages.irmin*: 2.5.3 -> 2.6.0

https://github.com/mirage/irmin/releases/tag/2.6.0
2021-05-11 06:54:15 +02:00
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Léo Gaspard 4b3d07eae2 ocamlPackages.atd: add link to nixos test 2021-05-08 21:41:13 +02:00
github-actions[bot] 0e4580d4d0
Merge staging-next into staging 2021-05-02 18:24:58 +00:00
José Romildo Malaquias bc33b23cd0 ppx_deriving_cmdliner: init at 0.6.0 2021-05-02 14:52:52 +02:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
github-actions[bot] b4766e97ee
Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Ulrik Strid 4d79ce4091 ocamlPackages.caqti-*: 1.3.0 -> 1.5.1 2021-04-29 21:49:50 +02:00
github-actions[bot] c01456266d
Merge staging-next into staging 2021-04-27 12:07:01 +00:00
Vincent Laporte 8984dee07e ocamlPackages.accessor_core: mark as broken with OCaml ≥ 4.12 2021-04-27 08:42:50 +02:00
Vincent Laporte ab51ade9a3 haxe: build versions < 4.2 with OCaml 4.10 2021-04-27 08:42:50 +02:00
github-actions[bot] f0290a5d27
Merge staging-next into staging 2021-04-26 18:14:28 +00:00
sternenseemann 5955013253 ocamlPackages.paf: init at 0.0.1 2021-04-26 15:23:08 +02:00
sternenseemann 6c95bce8b6 ocamlPackages.letsencrypt: init at 0.2.4 2021-04-26 15:23:08 +02:00
Luflosi ecb3b74a43 ocamlPackages.dtoa: disable hardening feature based on more accurate condition
The `strictoverflow` hardening feature causes a build failure when using Clang as the compiler, not just on Darwin.
2021-04-26 15:03:59 +02:00
sternenseemann c5120548fc ocamlPackages.mirage-crypto*: 0.10.0 -> 0.10.1
https://github.com/mirage/mirage-crypto/releases/tag/v0.10.1
2021-04-26 14:59:50 +02:00
github-actions[bot] e30742adc3
Merge staging-next into staging 2021-04-26 12:06:35 +00:00
sternenseemann f4c229058d ocamlPackages.h2: init at 0.8.0 2021-04-26 08:31:53 +02:00
sternenseemann 4d53880408 ocamlPackages.hpack: init at 0.8.0 2021-04-26 08:31:53 +02:00
github-actions[bot] 9a945aac72
Merge staging-next into staging 2021-04-25 18:14:18 +00:00
John Ericson a86418ac62
Merge pull request #118066 from sternenseemann/mirage-xen
ocamlPackages: init a bunch of libraries for the MirageOS xen target
2021-04-25 10:13:11 -04:00
sternenseemann 4f7a6610f7 ocamlPackages.mirage-bootvar-xen: init at 0.8.0 2021-04-25 13:15:10 +02:00
sternenseemann 2fe8239172 ocamlPackages.{mirage-net-xen,netchannel}: init at 2.0.0 2021-04-25 13:15:10 +02:00
sternenseemann 980a2bed3b ocamlPackages.mirage-xen: init at 6.0.0
Unfortunately this requires a bit of trickery with pkg-config to get to
work. The root issue is that the mirage-xen assumes that we use the
default libdir of dune ($out/lib) whereas we install to an OCaml
version-specific site-lib directory. Thus the manually created
pkg-config file makes wrong assumptions (which warrants a patch) and the
.pc file is installed to the wrong location (which is fixed with a mv
invocation).
2021-04-25 13:13:23 +02:00
sternenseemann b5f7ed7cc8 ocamlPackages.shared-memory-ring(-lwt): init at 3.1.0 2021-04-25 13:08:25 +02:00
Jan Tojnar c1f851b2ee
Merge branch 'staging-next' into staging 2021-04-25 08:22:13 +02:00
Mario Rodas 53a3fc2856 ocamlPackages.sedlex_2: 2.2 -> 2.3 2021-04-24 17:04:32 +02:00
sternenseemann 31014c4a28 ocamlPackages.mirage-crypto*: 0.9.2 -> 0.10.0
https://github.com/mirage/mirage-crypto/releases/tag/v0.10.0
2021-04-24 09:56:10 +02:00
Alyssa Ross 892d3fd7a0 ocamlPackages.camlimages_4_1: fix meta
I should have changed meta.branch in 70e33e3ae3 ("glsurf: use current giflib"),
but I overlooked it.

The bitbucket URL doesn't seem to exist any more, so I've updated the
homepage to the GitLab repository we fetch the sources from.

Fixes: 70e33e3ae3 ("glsurf: use current giflib")
2021-04-23 00:00:20 +02:00
github-actions[bot] b28a233fef
Merge staging-next into staging 2021-04-22 00:16:19 +00:00
sternenseemann fb8c527586 ocamlPackages.irmin: 2.5.2 -> 2.5.3
https://github.com/mirage/irmin/releases/tag/2.5.3
2021-04-21 22:32:06 +02:00
github-actions[bot] a260b67879
Merge staging-next into staging 2021-04-21 12:06:26 +00:00
Vincent Laporte 1f1a77bdb7 ocamlPackages.labltk: fix ocamlbrowser by wrapping
Also remove legacy versions
2021-04-21 13:56:54 +02:00
github-actions[bot] 5fe3cbef9a
Merge staging-next into staging 2021-04-20 00:15:41 +00:00
Vincent Laporte d2caa11ce0 ocamlPackages.earlybird: 0.1.5 → 1.1.0 2021-04-19 22:12:38 +02:00
Vincent Laporte 95341f082c ocamlPackages.path_glob: init at 0.2 2021-04-19 22:12:38 +02:00
Vincent Laporte cdff996ed3 ocamlPackages.dap: init at 1.0.6 2021-04-19 22:12:38 +02:00
github-actions[bot] ea5bd4364e
Merge staging-next into staging 2021-04-19 18:11:54 +00:00
sternenseemann 5252b4bd1b ocamlPackages.ocaml_extlib-1-7-7: init at 1.7.7
Unfortunately there's no way to get Haxe 4.0 and 4.1 to work with extlib
1.7.8 (not even without the minimal install), so we need to package
1.7.7 again, at least until 1.7.9 (?) brings backwards compatibility
packages, hopefully.
2021-04-19 14:42:42 +02:00
github-actions[bot] c577e0ee09
Merge staging-next into staging 2021-04-19 00:15:24 +00:00
Ulrik 1a2c0d2213 ocamlPackages.x509: 0.11.2 -> 0.12.0
Adds support for EC DSA from mirage-crypto

Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
2021-04-18 21:07:26 +02:00
github-actions[bot] 5478217883
Merge staging-next into staging 2021-04-18 06:05:34 +00:00
Enrico Tassi 5594aa424c elpi: 1.13.0 -> 1.13.1 2021-04-18 06:09:28 +02:00
github-actions[bot] 33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
Pavol Rusnak 29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Jörg Thalheim b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00