aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ci-builds.nix2
-rw-r--r--nix/yants/.skip-subtree1
-rw-r--r--nix/yants/README.md2
-rw-r--r--nix/yants/tests/default.nix (renamed from nix/yants/tests.nix)6
4 files changed, 5 insertions, 6 deletions
diff --git a/ci-builds.nix b/ci-builds.nix
index 46480c41a..5f3ae9bcf 100644
--- a/ci-builds.nix
+++ b/ci-builds.nix
@@ -7,12 +7,12 @@
let
pkgs = import ./default.nix {};
in with pkgs; [
+ nix.yants.tests
ops.journaldriver
ops.kms_pass
ops.sync-gcsr
tools.blog_cli
tools.emacs
web.cgit-taz
-
# web.tazblog # TODO(tazjin): Happstack build failure in nixos-unstable
]
diff --git a/nix/yants/.skip-subtree b/nix/yants/.skip-subtree
deleted file mode 100644
index 51a8e01d4..000000000
--- a/nix/yants/.skip-subtree
+++ /dev/null
@@ -1 +0,0 @@
-Yants subtree contains no further derivations.
diff --git a/nix/yants/README.md b/nix/yants/README.md
index 54e3e4a6a..5d551e5a4 100644
--- a/nix/yants/README.md
+++ b/nix/yants/README.md
@@ -1,8 +1,6 @@
yants
=====
-[![Build Status](https://travis-ci.org/tazjin/yants.svg?branch=master)](https://travis-ci.org/tazjin/yants)
-
This is a tiny type-checker for data in Nix, written in Nix.
# Features
diff --git a/nix/yants/tests.nix b/nix/yants/tests/default.nix
index 6863ced06..ae144db45 100644
--- a/nix/yants/tests.nix
+++ b/nix/yants/tests/default.nix
@@ -1,5 +1,7 @@
+{ pkgs, ... }:
+
with builtins;
-with (import ./default.nix {});
+with pkgs.nix.yants;
# Note: Derivations are not included in the tests below as they cause
# issues with deepSeq.
@@ -89,4 +91,4 @@ deepSeq rec {
(struct { a = int; b = option string; })
(sum { a = int; b = option string; })
];
-} "All tests passed!\n"
+} (pkgs.writeText "yants-tests" "All tests passed!")