Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 17 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/ocaml-modules/qcheck/lin.nix b/nixpkgs/pkgs/development/ocaml-modules/qcheck/lin.nix
new file mode 100644
index 000000000000..23164901ab6e
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/qcheck/lin.nix
@@ -0,0 +1,17 @@
+{ buildDunePackage
+, qcheck-multicoretests-util
+}:
+
+buildDunePackage {
+  pname = "qcheck-lin";
+
+  inherit (qcheck-multicoretests-util) version src;
+
+  propagatedBuildInputs = [ qcheck-multicoretests-util ];
+
+  doCheck = true;
+
+  meta = qcheck-multicoretests-util.meta // {
+    description = "A multicore testing library for OCaml";
+  };
+}