Merge branch 'master' into staging-next

(a trivial conflict in transmission)
2021-05-09 09:31:27 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -1,4 +1,4 @@
-{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re }:
+{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re, nixosTests }:

 buildDunePackage rec {
  pname = "atd";
@@ -18,6 +18,10 @@ buildDunePackage rec {

  doCheck = true;

+  passthru.tests = {
+    smoke-test = nixosTests.atd;
+  };
+
  meta = with lib; {
    homepage = "https://github.com/mjambon/atd";
    description = "Syntax for cross-language type definitions";