Commit Graph

1420 Commits

Author SHA1 Message Date
Symphorien Gibol
55ac8ffa43 ocamlPackages.llvm: propagate needed libs, fix missing build parameter
The opam patch makes ocaml link dependent executables with
-L${LLVM_OCAML_EXTERNAL_LLVM_LIBDIR}. This variable was previously
undefined and as a result the linker would previously be called with
just -L which makes it ignore the next argument. This would lead strange
linking errors, like missing caml_apply2.

Despite defining this variable correctly, propagating llvm is still
necessary for linking to complete. In case ocaml-llvm is a transitive
dependency only, propagatedBuildInputs is not enough. To avoid having to
guess which version of llvm was used, we provide the right one in
passthrough.
2019-10-11 08:19:51 +02:00
Marco Maggesi
2b05a35e08 Merge branch 'master' of github.com:NixOS/nixpkgs 2019-10-07 16:04:15 +02:00
Marco Maggesi
c70d7fa760 elpi: 1.6.0 -> 1.7.0 2019-10-07 15:47:37 +02:00
Vincent Laporte
8acf4cd06c ocamlPackages.pgocaml: 3.2 → 4.0
Ensures compatibility with OCaml 4.08
2019-10-06 07:57:37 +02:00
Vincent Laporte
dc6b299e09 ocamlPackages.patience_diff: init at 0.12.0 2019-10-03 08:26:41 +02:00
Vincent Laporte
33c36dd2f4 ocamlPackages.expect_test_helpers: init at 0.12.0 2019-10-03 08:26:41 +02:00
Vincent Laporte
2c87f4f07e ocamlPackages.expect_test_helpers_kernel: init at 0.12.0 2019-10-03 08:26:41 +02:00
Vincent Laporte
e0dcde83b0 ocamlPackages.sexp_pretty: init at 0.12.0 2019-10-03 08:26:41 +02:00
Vincent Laporte
2f43ae44c5 ocamlPackages.cpdf: 2.2.1 → 2.3 2019-09-30 21:52:34 +02:00
Vincent Laporte
c2ef0a0875 ocamlPackages.camlpdf: 2.2.1 → 2.3 2019-09-30 21:52:34 +02:00
Cedric Cellier
94560d77ec lacaml: Use propagatedBuildInputs for stublibs
This frees the packages depending on lacaml to have to repeat this.
2019-09-29 17:00:18 +02:00
R. RyanTM
23961502e1 ocamlPackages.zarith: 1.8 -> 1.9.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocaml4.06.1-zarith/versions
2019-09-29 16:24:07 +02:00
Vincent Laporte
718b6d980f ocamlPackages.ptmap: 2.0.3 → 2.0.4
Ensures compatibility with OCaml 4.07
2019-09-28 18:40:00 +02:00
Dmitry Kalinkin
c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
Jörg Thalheim
646dd55d16
ocamlPackages.containers: 1.4 → 2.6.1, and related fixes (#69132)
ocamlPackages.containers: 1.4 → 2.6.1, and related fixes
2019-09-24 07:48:26 +01:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Vincent Laporte
31aab48a0a
ocamlPackages.odoc: 1.3.0 → 1.4.2
Ensures compatibility with OCaml 4.08
2019-09-23 05:53:29 +00:00
Vincent Laporte
8e3d4ec580 ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
Ensures compatibility with OCaml 4.08
2019-09-22 20:12:05 +00:00
Vincent Laporte
1623510119 ocamlPackages.owee: 0.2 -> 0.3
Ensures compatibility with OCaml 4.08
2019-09-22 20:12:05 +00:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Vincent Laporte
827f62ef01 ocamlPackages.optint: 0.0.2 -> 0.0.3
Ensures compatibility with OCaml ≥ 4.08
2019-09-20 17:04:52 +00:00
Vasiliy Yorkin
0cf81af50c ocamlPackages.ppx_deriving_rpc: init at 5.9.0 2019-09-20 05:54:29 +00:00
Vasiliy Yorkin
fac7453117 ocamlPackages.ocaml-protoc: init at 1.2.0 (#68962) 2019-09-20 05:53:30 +00:00
Vincent Laporte
424c20414a
ocamlPackages.containers: 1.4 → 2.6.1
ocamlPackages.sequence/iter: 1.1 → 1.2.1

Ensures compatibility with OCaml 4.08
2019-09-20 05:29:05 +00:00
Vincent Laporte
59a07abdb2
ocamlPackages.printbox: disable tests for OCaml ≥ 4.08 2019-09-20 05:28:59 +00:00
Vincent Laporte
011dd72d6a
ocamlPackages.mdx: disable tests for OCaml ≥ 4.08
Don’t strip for OCaml 4.04
2019-09-20 05:28:52 +00:00
Frederik Rietdijk
0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
Maxime Dénès
4e626be87d ocamlPackages.ppx_deriving_yojson: 3.3 -> 3.5.1 2019-09-19 11:47:24 +00:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
Vincent Laporte
2173d47560
ocamlPackages.ocsigen_server: fix loading of shared libraries 2019-09-16 16:06:35 +00:00
Vincent Laporte
61c9725ff4
ocamlPackages.cryptokit: fix installation of shared libraries
Fixes #68874
2019-09-16 16:06:28 +00:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Vincent Laporte
912f03d0d4 ocamlPackages.xtmpl: fix for jsoo ≥ 3.4.0 2019-09-14 06:54:35 +00:00
Vincent Laporte
5a5a87cd00 ocamlPackages.mtime: disable jsoo support for OCaml < 4.03 2019-09-14 06:54:35 +00:00
Vasiliy Yorkin
2b921136f0 ocamlPackages.ppx_deriving_protobuf: init at 2.7 2019-09-13 16:18:27 +00:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Vincent Laporte
748046d594 ocamlPackages.janeStreet: init at 0.12 (for OCaml ≥ 4.07)
Also add a few legacy packages at version 0.11 for OCaml ≥ 4.07: configurator,
ppx_core, ppx_driver, ppx_type_conv

ocamlPackages.bap: disable for OCaml ≥ 4.07

ocamlPackages.bistro: 0.4.0 -> 0.5.0
2019-09-10 14:05:26 +00:00
Vincent Laporte
764724a631 ocamlPackages.nocrypto: add explicit dependency to ppx_deriving 2019-09-10 14:05:26 +00:00
Vasiliy Yorkin
300464ec67 ocamlPackages.rpclib: init at 5.9.0 2019-09-10 06:40:20 +00:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk
5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Vincent Laporte
22c50545f2 ocamlPackages.ocaml_lwt: 4.1.0 -> 4.2.1
Ensures compatibility with OCaml 4.08
2019-09-06 16:03:33 +00:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00