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#69210 to master that doesn't yet have
329a88efa7
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 41af38f372f0fec244ca
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
Franz Pletz
bd85a832c1
bap: build with llvm_8
2019-09-03 21:26:27 +02:00
Franz Pletz
e7b6d8790f
ocamlPackages.llvm: build with llvm_8
2019-09-03 21:25:23 +02:00
Vincent Laporte
ff392e8190
ocamlPackages.ocplib-json-typed: 0.5 -> 0.7.1
2019-09-03 05:31:11 +00:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging
2019-09-02 23:25:24 +02:00
Vincent Laporte
8d70f49cbd
ocamlPackages.lablgtk: 2.18.6 -> 2.18.8
...
Ensures compatibility with OCaml 4.08.
2019-09-02 16:19:24 +00:00
Frederik Rietdijk
ad1d58c622
Merge staging-next into staging
2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291
Merge master into staging-next
2019-08-31 09:50:38 +02:00
Vincent Laporte
81760f3235
ocamlPackages.cstruct: 3.1.1 -> 4.0.0
...
ocamlPackages.cstruct-sexp: init at 4.0.0
ocamlPackages.x509: 0.6.1 -> 0.7.1
ocamlPackages.tls: 0.9.0 -> 0.10.4
jackline: 2018-05-11 -> 2019-08-08
2019-08-31 06:55:26 +00:00
Vincent Laporte
10ffd51a96
ocamlPackages.bigarray-compat: init at 1.0.0
2019-08-31 06:55:26 +00:00
Vincent Laporte
e9edc7537a
ocamlPackages.gmap: init at 0.3.0
2019-08-31 06:55:26 +00:00
Vincent Laporte
d33df05f50
ocamlPackages.domain-name: init at 0.3.0
2019-08-31 06:55:26 +00:00
Vincent Laporte
3f63225309
ocamlPackages.batteries: 2.9.0 -> 2.10.0
...
Ensures compatibility with OCaml 4.08.
2019-08-29 05:42:43 +00:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
