1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-16 09:53:17 +00:00
Commit graph

1622 commits

Author SHA1 Message Date
Vincent Laporte d6eb9b5e0b
ocamlPackages.irmin-unix: init at 2.0.0 2019-12-09 17:02:13 +00:00
Vincent Laporte 583b483ebb
ocamlPackages.irmin-watcher: init at 0.4.1 2019-12-09 17:02:13 +00:00
Vincent Laporte bdd0a3fe8c
ocamlPackages.yaml: init at 2.0.1 2019-12-09 17:02:13 +00:00
Vincent Laporte ad95ea7223
ocamlPackages.irmin-pack: init at 2.0.0 2019-12-09 17:02:13 +00:00
Vincent Laporte 186e55f746
ocamlPackages.irmin-graphql: init at 2.0.0 2019-12-09 17:02:12 +00:00
Vincent Laporte 52be004a7c
ocamlPackages.irmin-fs: init at 2.0.0 2019-12-09 17:02:12 +00:00
Vincent Laporte 191f1c9a49
ocamlPackages.irmin-http: init at 2.0.0 2019-12-09 17:02:12 +00:00
Vincent Laporte 45d3c40cc4
ocamlPackages.irmin-git: init at 2.0.0 2019-12-09 17:02:12 +00:00
Vincent Laporte 5bbc1c1159
ocamlPackages.irmin-mem: init at 2.0.0 2019-12-09 17:02:11 +00:00
Vincent Laporte a21d658051
ocamlPackages.irmin-test: init at 2.0.0 2019-12-09 17:02:11 +00:00
Vincent Laporte c07de6cd86
ocamlPackages.irmin: init at 2.0.0 2019-12-09 17:02:11 +00:00
Vincent Laporte e7857f0d30
ocamlPackages.alcotest-lwt: init at 0.8.5 2019-12-09 17:02:11 +00:00
Vincent Laporte d7ec7abd1f
ocamlPackages.index: init at 1.0.1 2019-12-09 17:02:10 +00:00
Ben Darwin bfe5d1cc96 ocamlPackages.owl: 0.7.1 -> 0.7.2
- also enable tests (except on OSX) due to upstream fixes
2019-12-09 11:00:11 -05:00
Vincent Laporte c09e680e77 ocamlPackages.graphql-cohttp: init at 0.13.0 2019-12-09 09:53:40 +01:00
Vincent Laporte 9b834a210e ocamlPackages.graphql-lwt: init at 0.13.0 2019-12-09 09:53:40 +01:00
Vincent Laporte 187c657eab ocamlPackages.graphql: init at 0.13.0 2019-12-09 09:53:40 +01:00
Vincent Laporte 40a023a853 ocamlPackages.graphql_parser: init at 0.13.0 2019-12-09 09:53:40 +01:00
R. RyanTM f6bb473264 ocamlPackages.ocurl: 0.8.2 -> 0.9.0 2019-12-08 13:50:22 -08:00
Vincent Laporte 9ed43c870e ocamlPackages.webmachine: init at 0.6.1 2019-12-08 07:55:34 +01:00
Vincent Laporte 84d650ed2b ocamlPackages.dispatch: init at 0.4.1 2019-12-08 07:55:34 +01:00
Vincent Laporte 87774e094d ocamlPackages.logs: 0.6.3 → 0.7.0 2019-12-07 06:52:45 +00:00
Ben Darwin 3fa5a19cf8 ocamlPackages_latest.phylogenetics: init at unstable-2019-11-15 2019-12-06 12:00:44 -05:00
Ben Darwin 13f55534cb owl-base: remove unused input 2019-12-06 12:00:44 -05:00
Ben Darwin 6ac6e7ac0b owl: propagate eigen 2019-12-06 12:00:44 -05:00
Ben Darwin b103ec0911 ocamlPackages.gnuplot: init at 0.5.3 2019-12-06 12:00:44 -05:00
Ben Darwin eddfe95f29 ocamlPackages.biocaml: init at 0.10.0 2019-12-06 12:00:44 -05:00
Ben Darwin 6b8de994a1 ocamlPackages.cfstream: init at 1.3.0 2019-12-06 12:00:44 -05:00
Vincent Laporte 335d97fb34 ocamlPackages.containers: 2.6.1 → 2.7 2019-12-06 16:17:45 +00:00
Vincent Laporte b2aaa0559f ocamlPackages.git: 2.1.0 → 2.1.2 2019-12-05 14:21:47 +00:00
Vincent Laporte 485b09dce3 ocamlPackages.nocrypto: propagate “ppx_deriving” 2019-12-05 14:21:47 +00:00
Vincent Laporte 0b5dfa54e1 ocamlPackages.metrics-unix: init at 0.1.0 2019-12-04 15:37:36 +00:00
Vincent Laporte 8ad01c3362 ocamlPackages.metrics-lwt: init at 0.1.0 2019-12-04 15:37:36 +00:00
Vincent Laporte 5d0dd4e536 ocamlPackages.metrics: init at 0.1.0 2019-12-04 15:37:36 +00:00
Matthew Bauer 0505c5125c
Merge branch 'master' into static-fixes 2019-12-02 13:34:24 -05:00
Vincent Laporte f36ba34be3 ocamlPackages.cpuid: 0.1.0 → 0.1.2 2019-12-01 18:18:28 +00:00
Frederik Rietdijk d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
Ben Darwin d016a507ea ocamlPackages.{owl-base,owl}: init at 0.7.1 2019-11-29 17:22:45 +00:00
Ben Darwin 777efe8425 ocamlPackages.eigen: init at 0.1.4 2019-11-29 17:22:45 +00:00
Ben Darwin 06ddb4a49f ocamlPackages.parany: init at 7.0.0 2019-11-29 11:12:08 -05:00
Ben Darwin eb1efb718c ocamlPackages.setcore: init at 1.0.1 2019-11-29 11:12:02 -05:00
Cedric Cellier 724133984f ocaml-kafka: init at 0.4 2019-11-29 07:39:10 +00:00
Mario Rodas 5458a38e61
ocamlPackages.biniou: 1.2.0 -> 1.2.1 2019-11-27 04:24:00 -05:00
Mario Rodas 1cda2f9992
ocamlPackages.ppx_gen_rec: 1.0.0 -> 1.1.0 2019-11-27 04:23:00 -05:00
Mario Rodas ae7a96b10f
ocamlPackages.wtf8: 1.0.1 -> 1.0.2 2019-11-27 04:22:00 -05:00
Mario Rodas c44fdd592f
ocamlPackages.dtoa: 0.3.1 -> 0.3.2 2019-11-27 04:21:00 -05:00
Alexander Bantyev 78ec0e60c2
ocaml: nocrypto: fix dependency on ppx_tools 2019-11-26 18:03:55 +03:00
Alexander Bantyev 81384e0f0c
ocaml: num: add ability to link statically 2019-11-26 18:03:55 +03:00
Alexander Bantyev 08edfb6967
ocaml: uchar: add the ability to build without dynamic linking 2019-11-26 18:03:55 +03:00
Alexander Bantyev 484e0a89f9
ocaml: opam-file-format: Allow to disable dynamic linking 2019-11-26 18:03:55 +03:00
Alexander Bantyev 07b838f13b
ocaml: num: Allow to disable dynamic linking 2019-11-26 18:03:55 +03:00
Frederik Rietdijk 1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
Cedric Cellier 359e6446ef ocaml-sodium: init at 0.6.0 2019-11-22 07:48:55 +00:00
Vincent Laporte 6cffb5072f ocamlPackages.lwt4: 4.2.1 → 4.4.0 2019-11-21 07:35:51 +00:00
Frederik Rietdijk 5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
Vincent Laporte 17e0d73278 ocamlPackages.facile: 1.1.3 → 1.1.4 2019-11-16 10:36:34 +00:00
Ricardo M. Correia d5053d12eb ocamlPackages.lwt_ppx: fix dependency propagation
dune was showing this error when using lwt_ppx:

File "/nix/store/sz4cg32ph84lapgs50xv73s3a0baqq2s-ocaml4.08.1-lwt_ppx-4.2.1/lib/ocaml/4.08.1/site-lib/lwt_ppx/dune-package", line 11, characters 56-75:
11 |  (requires compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned)
                                                             ^^^^^^^^^^^^^^^^^^^
Error: Library "ppx_tools_versioned" not found.
-> required by library "lwt_ppx" in
   /nix/store/sz4cg32ph84lapgs50xv73s3a0baqq2s-ocaml4.08.1-lwt_ppx-4.2.1/lib/ocaml/4.08.1/site-lib/lwt_ppx
-> required by executable wizytests in dune:6
Hint: try: dune external-lib-deps --missing @@default
2019-11-16 04:15:28 +00:00
c0bw3b 9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
John Ericson bca2e8255e treewide: CAML_LD_LIBRARY_PATH may be undefined 2019-11-14 13:44:07 -05:00
Yorick van Pelt a1cc0f1d5f
ocamlPackages.zarith: 1.8 -> 1.9 2019-11-11 11:10:32 +03:00
Yorick van Pelt 5a40ccfa65
ocamlPackages.cpuid: 0.1.0 -> 0.1.2 2019-11-11 11:10:15 +03:00
Yorick van Pelt 2693fa4cea
ocamlPackages.ocamlgraph: allow building without lablgtk 2019-11-11 11:10:14 +03:00
Yorick van Pelt 4550405ac9
ocaml-modules: replace buildInputs with nativeBuildInputs where appropriate
The default has been to use buildInputs for build dependencies.
This doesn't work when cross-compiling.
2019-11-11 11:10:14 +03:00
Matthew Bauer 5ebd36403e
Merge pull request #70641 from maggesi/rename-z77z-into-maggesi
Rename z77z into maggesi
2019-11-07 17:18:20 -05:00
Vincent Laporte 82af060040 ocamlPackages.lwt3: remove at 3.3.0 2019-11-07 16:39:42 +00:00
Vincent Laporte 8632698b06 ocamlPackages.checkseum: 0.0.3 → 0.1.1
This fixes the “decompress” library on non-x86_64 platforms
2019-11-05 07:13:09 +00:00
R. RyanTM 1c336ed6fc ocamlPackages.mlgmpidl: 1.2.10 -> 1.2.11 2019-11-04 16:34:57 +00:00
Vincent Laporte d1ee1bd06a ocamlPackages.ecaml: init at 0.12.0 2019-11-01 06:54:04 +00:00
Vincent Laporte a17f7277a8 ocamlPackages.sawja: 1.5.6 → 1.5.7 2019-10-31 07:29:53 +00:00
Vincent Laporte 5a4e67ad03
Merge pull request #72171 from romildo/upd.ocamlearlybird
ocamlPackages.ocamlearlybird: init at 0.1.5; ocamlPackages.angstrom: 0.10.0 -> 0.12.1
2019-10-29 14:31:09 +00:00
José Romildo Malaquias 432258f0da ocamlPackages.ocamlearlybird: init at 0.1.5 2019-10-29 10:51:42 -03:00
Vincent Laporte a25381b019 ocamlPackages.ctypes: 0.13.1 → 0.15.1
ocamlPackages.integers: 0.2.2 → 0.3.0
2019-10-29 07:05:18 +00:00
José Romildo Malaquias a0f12b059a ocamlPackages.angstrom-unix: init at 0.12.1 2019-10-28 14:41:12 -03:00
José Romildo Malaquias 05a71af6a4 ocamlPackages.angstrom-lwt-unix: init at 0.12.1 2019-10-28 14:40:53 -03:00
José Romildo Malaquias 46eacf359b ocamlPackages.angstrom-async: init at 0.12.1 2019-10-28 14:40:35 -03:00
José Romildo Malaquias d3ff8e6359 ocamlPackages.angstrom: 0.10.0 -> 0.12.1 2019-10-28 12:00:00 -03:00
Vincent Laporte 8dc2173905 ocamlPackages.decompress: 0.6 → 0.9.0
ocamlPackages.git: 1.11.5 → 2.1.0

ocamlPackages.imagelib: 20171028 → 20191011

ocamlPackages.imagelib-unix: init
2019-10-28 07:37:24 +00:00
Vincent Laporte ea5684b438 ocamlPackages.encore: init at 0.3 2019-10-28 07:37:24 +00:00
Vincent Laporte 9f26063077 ocamlPackages.ke: init at 0.4 2019-10-28 07:37:24 +00:00
Vincent Laporte 0c2aa9dd33 ocamlPackages.ppx_tools: enable at 5.3+4.08.0 for OCaml 4.09 2019-10-25 07:09:42 +00:00
Vincent Laporte bbce011c13 ocamlPackages.duff: init at 0.2 2019-10-21 05:31:00 +00:00
Vincent Laporte be3f40bb99 ocamlPackages.eliom: 6.7.0 → 6.8.0
Ensures compatibility with OCaml 4.08
2019-10-20 06:44:41 +00:00
Vincent Laporte 430e5ce04c compcert: 3.5 → 3.6
ocamlPackages.menhir: 20181113 → 20190626
2019-10-19 20:30:48 +00:00
Vincent Laporte 69d5465431 ocamlPackages.bigstringaf: 0.3.0 → 0.6.0 2019-10-18 05:59:29 +00:00
Vincent Laporte 734119c74d ocamlPackages.httpaf: disable tests with OCaml 4.07 2019-10-18 05:59:29 +00:00
Vincent Laporte 33f003e930 ocamlPackages.faraday: disable tests with OCaml 4.07 2019-10-18 05:59:29 +00:00
Vincent Laporte 7264e96053 ocamlPackages.spelll: init at 0.3
Fuzzy string searching, using Levenshtein automaton. Can be used for
spell-checking.

Homepage: https://github.com/c-cube/spelll
2019-10-17 05:50:26 +00:00
Marek Mahut 214c5b326a
Merge pull request #71167 from vbgl/ocaml-doc-ock+remove
ocamlPackages.doc-ock: remove at 1.2.1
2019-10-16 21:13:47 +02:00
Vincent Laporte 8dd417eed6 ocamlPackages.lru: 0.2.0 → 0.3.0
ocamlPackages.psq: 0.1.0 → 0.2.0
2019-10-16 02:42:25 +00:00
Vincent Laporte 7c6026019e
ocamlPackages.doc-ock: remove at 1.2.1
This is now part of ocamlPackages.odoc
2019-10-15 06:03:53 +00:00
Vincent Laporte e33563438e
ocamlPackages.doc-ock-xml: remove at 1.2.1
This is now part of ocamlPackages.odoc
2019-10-15 06:03:48 +00:00
Vincent Laporte 960dfbc5b4
ocamlPackages.doc-ock-html: remove at 1.2.1
This is now part of ocamlPackages.odoc
2019-10-15 06:03:42 +00:00
Vincent Laporte 0feb4e8729 ocamlPackages.digestif: 0.5 → 0.8.0 2019-10-15 07:08:13 +02:00
Vincent Laporte e191a69e8d ocamlPackages.eqaf: init at 0.5 2019-10-15 07:08:13 +02:00
Marco Maggesi b23ce210ec
Fix reference to maintainer 2019-10-13 18:33:38 +02:00
Marco Maggesi 24d0bd37b5
Merge branch 'master' into rename-z77z-into-maggesi 2019-10-13 18:06:23 +02:00
Vincent Laporte e1b9556f87 ocamlPackages.ocsigen_server: 2.11.0 → 2.15.0
ocamlPackages.ssl: 0.5.5 → 0.5.9
2019-10-13 06:52:00 +02:00
Vincent Laporte a9435c8db8 ocamlPackages.labltk: init at 8.06.7 for OCaml ≥ 4.08 2019-10-12 09:37:34 +02:00
Vincent Laporte 632f69857d ocamlPackages.ocaml-monadic: init at 0.4.1 2019-10-12 07:41:49 +02:00
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 ff1ed720e2 Rename z77z into maggesi
Make the "handle" of the maintainer match the name of the github account.
Also update the email address.
2019-10-07 17:05:25 +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