From f749ff770f0b268af8b48a0c4dd29bd6fd60080f Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 14 Jul 2017 17:33:14 +0200
Subject: [PATCH 01/15] Rewrote tests with specdris.

---
 tests/JsonTest.idr  | 58 +++++++++++++++++++--------------------------
 tests/SpecSuite.idr | 11 +++++++++
 tests/Test.idr      | 44 +++++++++++++---------------------
 tests/TestUtil.idr  | 25 +++++++++++++++++++
 tests/test.ipkg     |  7 ++++--
 5 files changed, 82 insertions(+), 63 deletions(-)
 create mode 100644 tests/SpecSuite.idr
 create mode 100644 tests/TestUtil.idr

diff --git a/tests/JsonTest.idr b/tests/JsonTest.idr
index c791868..7e23bc4 100644
--- a/tests/JsonTest.idr
+++ b/tests/JsonTest.idr
@@ -2,39 +2,32 @@ module JsonTest
 
 import Json
 
-import Lightyear.Testing
+import TestUtil
+import Specdris.Spec
 
-%access export
-
-test : String -> IO ()
-test s = case parse jsonToplevelValue s of
-  Left err => putStrLn $ "error: " ++ err
-  Right v  => printLn v
-
-jsonTests : IO ()
-jsonTests = runTests
-  [ parseTestCmpShow
-      "JSON 1"
-      jsonToplevelValue
-      "[1,2,4,[5,6],null,{\"some\":[\"object\"]},false]"
-      "[1, 2, 4, [5, 6], null, {\"some\": [\"object\"]}, false]"
-  , parseTestCmpShow
-      "JSON 2"
-      jsonToplevelValue
-      "{\n  \"hallo\":42,\"nichts\":null}"
-      "{\"hallo\": 42, \"nichts\": null}"
-
-  , parseTestCmpShow
-      "JSON 3"
-      jsonToplevelValue
-      "{\"hello\": [{\"world\": false}, 3, \"string\", true, null]}"
-      "{\"hello\": [{\"world\": false}, 3, \"string\", true, null]}"
-
-  , parseTestCmpNot
-      "JSON 4"
-      jsonToplevelValue
-      "{{\n  \"hallo\":42,\"nichts\":null}"
-      """at 1:1 expected:
+export
+specs : SpecTree
+specs = describe "Json parser (data from examples)" $ do
+         it "JSON 1" $ do
+           shouldParseShow 
+             jsonToplevelValue
+             "[1,2,4,[5,6],null,{\"some\":[\"object\"]},false]"
+             "[1, 2, 4, [5, 6], null, {\"some\": [\"object\"]}, false]"
+         it "JSON 2" $ do
+           shouldParseShow
+             jsonToplevelValue
+             "{\n  \"hallo\":42,\"nichts\":null}"
+             "{\"hallo\": 42, \"nichts\": null}"
+         it "JSON 3" $ do
+           shouldParseShow
+             jsonToplevelValue
+             "{\"hello\": [{\"world\": false}, 3, \"string\", true, null]}"
+             "{\"hello\": [{\"world\": false}, 3, \"string\", true, null]}"
+         it "JSON 4" $ do
+           shouldNotParse
+             jsonToplevelValue
+             "{{\n  \"hallo\":42,\"nichts\":null}"
+             """at 1:1 expected:
   character '['
 at 1:1 expected:
   a different token
@@ -43,4 +36,3 @@ at 1:2 expected:
 at 1:2 expected:
   a different token
 """
-  ]
diff --git a/tests/SpecSuite.idr b/tests/SpecSuite.idr
new file mode 100644
index 0000000..4639f2c
--- /dev/null
+++ b/tests/SpecSuite.idr
@@ -0,0 +1,11 @@
+module SpecSuite
+
+import Test
+import JsonTest
+
+import Specdris.Spec
+
+export
+specSuite : IO ()
+specSuite = spec $ do Test.specs
+                      JsonTest.specs
diff --git a/tests/Test.idr b/tests/Test.idr
index a39dbba..163eb3d 100644
--- a/tests/Test.idr
+++ b/tests/Test.idr
@@ -6,9 +6,9 @@ import Data.Fin
 import Lightyear
 import Lightyear.Char
 import Lightyear.Strings
-import Lightyear.Testing
 
-%access export
+import TestUtil
+import Specdris.Spec
 
 listOf : Parser a -> Parser (List a)
 listOf p = string "[" *!> (p `sepBy` string ",") <* string "]"
@@ -16,35 +16,23 @@ listOf p = string "[" *!> (p `sepBy` string ",") <* string "]"
 listOf' : Parser a -> Parser (List a)
 listOf' p = brackets (commaSep p)
 
-nat : Parser Nat
-nat = integer
-
-tests : IO ()
-tests = runTests
-  [ parseTestCmp "Test 1" nat          (==) "123"        123
-  , parseTestCmp "Test 2" (listOf nat) (==) "[1,2,3,99]" [1,2,3,99]
-
-  , parseTestCmpNot "Test 3" (listOf nat) "foo" """at 1:1 expected:
-  string "["
-at 1:1 expected:
-  character '['
-at 1:1 expected:
-  a different token
-"""
-
-  -- should commit and fail
-  , parseTestCmpNot "Test 4" (listOf nat <|> (string "[foo" *> pure List.Nil)) "[foo" """at 1:2 expected:
+export
+specs : SpecTree
+specs = describe "Parser" $ do
+         it "parse scalar values" $ do
+           shouldParse integer "123" 123
+         it "parse recursive structures" $ do
+           shouldParse (listOf integer) "[1,2,3,98]" [1, 2, 3, 98]
+           shouldParse (listOf' integer) "[1,2,3,99]" [1, 2, 3, 99]
+         it "parse nested structures" $ do
+           shouldParse (listOf $ listOf integer) "[[1,2],[],[3,4,5]]" [[1, 2], [], [3, 4, 5]]
+           shouldParse (listOf' $ listOf integer) "[[1,2],[],[3,4,5,6]]" [[1, 2], [], [3, 4, 5, 6]]
+         it "should commit and fail" $ do
+           shouldParse (listOf' integer <|> (string "[foo" *> pure List.Nil)) "[foo" []
+           shouldNotParse (listOf integer <|> (string "[foo" *> pure List.Nil)) "[foo" """at 1:2 expected:
   string "]"
 at 1:2 expected:
   character ']'
 at 1:2 expected:
   a different token
 """
-
-  , parseTestCmp "Test 5" (listOf $ listOf nat)   (==) "[[1,2],[],[3,4,5]]" [[1, 2], [], [3, 4, 5]]
-  , parseTestCmp "Test 6" (listOf' nat)           (==) "[1,2,3,99]"         [1, 2, 3, 99]
-  , parseTestCmp "Test 6" (listOf' $ listOf' nat) (==) "[[1,2],[],[3,4,5]]" [[1, 2], [], [3, 4, 5]]
-
-  -- should commit and fail
-  , parseTestCmp "Test 7" (listOf' nat <|> (string "[foo" *> pure List.Nil)) (==) "[foo" []
-  ]
diff --git a/tests/TestUtil.idr b/tests/TestUtil.idr
new file mode 100644
index 0000000..33ba05a
--- /dev/null
+++ b/tests/TestUtil.idr
@@ -0,0 +1,25 @@
+module TestUtil
+
+import Lightyear
+import Lightyear.Char
+import Lightyear.Strings
+
+import Specdris.Spec
+
+%access export
+%default total
+
+shouldParse : (Show a, Eq a) => Parser a -> (raw : String) -> (expected : a) -> SpecResult
+shouldParse p raw expected = case parse p raw of
+                               (Left err)     => (BinaryFailure raw expected err)
+                               (Right actual) => actual === expected
+
+shouldParseShow : Show a => Parser a -> (raw : String) -> (expected : String) -> SpecResult
+shouldParseShow p raw expected = case parse p raw of
+                                   (Left err)     => (BinaryFailure raw expected err)
+                                   (Right actual) => (show actual) === expected
+
+shouldNotParse : Show a => Parser a -> (raw : String) -> (expected : String) -> SpecResult
+shouldNotParse p raw expected = case parse p raw of
+                                  (Left actual)  => actual === expected
+                                  (Right err)    => (BinaryFailure err expected "should fail")
diff --git a/tests/test.ipkg b/tests/test.ipkg
index 7055394..189a51d 100644
--- a/tests/test.ipkg
+++ b/tests/test.ipkg
@@ -2,9 +2,12 @@ package test
 
 opts = "--sourcepath ../ --idrispath ../ -p contrib"
 
+pkgs = specdris -- github.com/pheymann/specdris
+
 modules = Json
         , JsonTest
         , Test
+        , TestUtil
+        , SpecSuite
 
-tests = JsonTest.jsonTests
-      , Test.tests
+tests = SpecSuite.specSuite

From 9e955dde16c02a1d848b2a856568f4b32e140b17 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 14 Jul 2017 17:37:11 +0200
Subject: [PATCH 02/15] Renamed Test to ParserTest.

---
 tests/{Test.idr => ParserTest.idr} | 2 +-
 tests/SpecSuite.idr                | 4 ++--
 tests/test.ipkg                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/{Test.idr => ParserTest.idr} (98%)

diff --git a/tests/Test.idr b/tests/ParserTest.idr
similarity index 98%
rename from tests/Test.idr
rename to tests/ParserTest.idr
index 163eb3d..0d524f8 100644
--- a/tests/Test.idr
+++ b/tests/ParserTest.idr
@@ -1,4 +1,4 @@
-module Test
+module ParserTest
 
 import Data.Vect
 import Data.Fin
diff --git a/tests/SpecSuite.idr b/tests/SpecSuite.idr
index 4639f2c..0dde552 100644
--- a/tests/SpecSuite.idr
+++ b/tests/SpecSuite.idr
@@ -1,11 +1,11 @@
 module SpecSuite
 
-import Test
+import ParserTest
 import JsonTest
 
 import Specdris.Spec
 
 export
 specSuite : IO ()
-specSuite = spec $ do Test.specs
+specSuite = spec $ do ParserTest.specs
                       JsonTest.specs
diff --git a/tests/test.ipkg b/tests/test.ipkg
index 189a51d..a9b06fa 100644
--- a/tests/test.ipkg
+++ b/tests/test.ipkg
@@ -6,7 +6,7 @@ pkgs = specdris -- github.com/pheymann/specdris
 
 modules = Json
         , JsonTest
-        , Test
+        , ParserTest
         , TestUtil
         , SpecSuite
 

From 9a54167763fd2375236b858104511f1c327cab65 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 14 Jul 2017 17:45:56 +0200
Subject: [PATCH 03/15] Updated Makefile and removed test-script.

This script isn't necessary anymore. Specdris
returns an error exit code when some test case
fails.
---
 Makefile          |  2 +-
 tests/expected    | 12 ----------
 tests/runtests.sh | 56 -----------------------------------------------
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 tests/expected
 delete mode 100755 tests/runtests.sh

diff --git a/Makefile b/Makefile
index a775534..71c8ede 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ build: Lightyear/*.idr
 	idris --build lightyear.ipkg
 
 test: build
-	(cd tests; bash runtests.sh)
+	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg)
 
 clean:
 	idris --clean lightyear.ipkg
diff --git a/tests/expected b/tests/expected
deleted file mode 100644
index 20081d1..0000000
--- a/tests/expected
+++ /dev/null
@@ -1,12 +0,0 @@
-[PASS] JSON 1
-[PASS] JSON 2
-[PASS] JSON 3
-[PASS] JSON 4
-[PASS] Test 1
-[PASS] Test 2
-[PASS] Test 3
-[PASS] Test 4
-[PASS] Test 5
-[PASS] Test 6
-[PASS] Test 6
-[PASS] Test 7
diff --git a/tests/runtests.sh b/tests/runtests.sh
deleted file mode 100755
index 6f83af4..0000000
--- a/tests/runtests.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-OS=`uname -s`
-
-# Timeout on Mac OS X is installed via brew install coreutils and called gtimeout
-if [ "$OS" = "Darwin" ]; then
-	TIMEOUTCMD=gtimeout
-else
-	TIMEOUTCMD=timeout
-fi
-
-echo "TIMOUTCMD set to ${TIMEOUTCMD}"
-
-die() {
-	echo "$1" >&2
-	exit 1
-}
-
-clean_up() {
-    idris --clean test.ipkg
-	rm -f *.ibc output
-}
-
-clean_up
-
-echo "compiling lightyear tests..."
-idris --build test.ipkg || die "* could not compile tests *"
-
-echo "compiled OK, running lightyear tests..."
-$TIMEOUTCMD 120s idris --testpkg test.ipkg | grep -v -e "idris" > output || die "* test failed or timed out *"
-
-#echo "compiling the JSON test..."
-#idris JsonTest.idr -p lightyear -p contrib -o json || die "* could not compile the json test *"
-#
-#echo "compiled OK, running the JSON test..."
-#$TIMEOUTCMD 5s ./json >> output || die "* test failed or timed out *"
-
-# use a default parameter if $1 is not set
-if [ "${1-}" = "believe_me" ]; then
-	echo '### marking current output as expected ###'
-	cat output > expected
-	clean_up
-	exit 0
-else
-	if diff output expected; then
-		echo "### everything PASS ###"
-		clean_up
-		exit 0
-	else
-		echo "### something FAIL ###"
-		clean_up
-		exit 1
-	fi
-fi

From 0dc1f572e2f71c8f9151fbd3ef71de7c156c9af0 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 14 Jul 2017 17:49:10 +0200
Subject: [PATCH 04/15] Fixed travis yml.

---
 .travis.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 796a163..86eb979 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
-os: osx
-install:
-  - brew install idris
+language: generic
+
+os: linux
+
+sudo: required
+
+services:
+  - docker
+
 script:
-  - make test 
+  - docker run -v $(pwd):/var/idris-project pheymann/idris-travis:1.0 make test

From 90f99bfbb7f2b6d16f7a94042c7fe76df3d64367 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 14 Jul 2017 18:52:55 +0200
Subject: [PATCH 05/15] Added specdris installation to ci build.

---
 .travis.yml | 2 +-
 Makefile    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 86eb979..a1939f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ services:
   - docker
 
 script:
-  - docker run -v $(pwd):/var/idris-project pheymann/idris-travis:1.0 make test
+  - docker run -v $(pwd):/var/idris-project pheymann/idris-travis:1.0 make testCI
diff --git a/Makefile b/Makefile
index 71c8ede..4de4a91 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,19 @@ all: install
 install: build
 	idris --install lightyear.ipkg
 
+dependencies:
+	mkdir dependencies
+	(cd dependencies; git clone https://github.com/pheymann/specdris; git fetch; cd specdris; git checkout v0.2.1; ./project --install; cd ../..)
+
 build: Lightyear/*.idr
 	idris --build lightyear.ipkg
 
 test: build
 	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg)
 
+testCI: dependencies
+	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg)
+
 clean:
 	idris --clean lightyear.ipkg
 	rm -f tests/*.ibc

From 3f5e5b44fff1ba40e70273b422805ec474fa2c78 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 14 Jul 2017 18:57:47 +0200
Subject: [PATCH 06/15] Added dependencies to gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1b655e0..0f7f94e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *_doc/
 *.ibc
 *~
+dependencies/
\ No newline at end of file

From 950e65510c3154459e195ffab49b27c2745c46c5 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 21 Jul 2017 16:24:33 +0200
Subject: [PATCH 07/15] Added nix script in travis build.

---
 .travis.yml | 13 ++-----------
 default.nix | 11 +++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 default.nix

diff --git a/.travis.yml b/.travis.yml
index a1939f4..5397158 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,2 @@
-language: generic
-
-os: linux
-
-sudo: required
-
-services:
-  - docker
-
-script:
-  - docker run -v $(pwd):/var/idris-project pheymann/idris-travis:1.0 make testCI
+language: nix
+script: nix-shell -A lightyear --command "make testCI"
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..e1d8caa
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,11 @@
+# This is used in the Travis build to install the Idris compiler.
+let
+  pkgs = import <nixpkgs> {};
+  stdenv = pkgs.stdenv;
+in {
+  lightyear = stdenv.mkDerivation {
+    name = "lightyear";
+    src = ./.;
+    buildInputs = with pkgs; [ haskellPackages.idris gmp ];
+  };
+}
\ No newline at end of file

From e60eb0d016ca140fecad1a6a232efaea5a4e4816 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 21 Jul 2017 20:29:43 +0200
Subject: [PATCH 08/15] Added sudo rights.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5397158..24fe37d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,5 @@
 language: nix
+
+sudo: required
+
 script: nix-shell -A lightyear --command "make testCI"

From a11033f12a396af80340e5099af5f9adf7d6f8e6 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 21 Jul 2017 20:41:33 +0200
Subject: [PATCH 09/15] Revert / Added sudo rights.

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24fe37d..5397158 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,2 @@
 language: nix
-
-sudo: required
-
 script: nix-shell -A lightyear --command "make testCI"

From 82a056cbcf9fd41c7807043d222e0aaf46b7178c Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 21 Jul 2017 20:41:53 +0200
Subject: [PATCH 10/15] Revert / Added nix script in travis build.

---
 .travis.yml | 13 +++++++++++--
 default.nix | 11 -----------
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 default.nix

diff --git a/.travis.yml b/.travis.yml
index 5397158..a1939f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,11 @@
-language: nix
-script: nix-shell -A lightyear --command "make testCI"
+language: generic
+
+os: linux
+
+sudo: required
+
+services:
+  - docker
+
+script:
+  - docker run -v $(pwd):/var/idris-project pheymann/idris-travis:1.0 make testCI
diff --git a/default.nix b/default.nix
deleted file mode 100644
index e1d8caa..0000000
--- a/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is used in the Travis build to install the Idris compiler.
-let
-  pkgs = import <nixpkgs> {};
-  stdenv = pkgs.stdenv;
-in {
-  lightyear = stdenv.mkDerivation {
-    name = "lightyear";
-    src = ./.;
-    buildInputs = with pkgs; [ haskellPackages.idris gmp ];
-  };
-}
\ No newline at end of file

From 16ae8a93dae856cdff1cb23f0ce1b237554f606d Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Fri, 21 Jul 2017 20:44:07 +0200
Subject: [PATCH 11/15] Added travis docker file.

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9b37d97
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+FROM dgellow/idris:v1.0
+
+WORKDIR /var/idris-project
\ No newline at end of file

From efb6f51cfe51a52f97caf3240cf75efbfacc3b75 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Sun, 30 Jul 2017 12:59:14 +0200
Subject: [PATCH 12/15] Nix script with relative include path.

---
 .travis.yml | 13 ++-----------
 Makefile    |  6 +++---
 default.nix | 11 +++++++++++
 3 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 default.nix

diff --git a/.travis.yml b/.travis.yml
index a1939f4..5397158 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,2 @@
-language: generic
-
-os: linux
-
-sudo: required
-
-services:
-  - docker
-
-script:
-  - docker run -v $(pwd):/var/idris-project pheymann/idris-travis:1.0 make testCI
+language: nix
+script: nix-shell -A lightyear --command "make testCI"
diff --git a/Makefile b/Makefile
index 4de4a91..81f4aaf 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,16 @@ install: build
 
 dependencies:
 	mkdir dependencies
-	(cd dependencies; git clone https://github.com/pheymann/specdris; git fetch; cd specdris; git checkout v0.2.1; ./project --install; cd ../..)
+	(cd dependencies; git clone https://github.com/pheymann/specdris; git fetch; cd specdris; git checkout v0.2.1; ./project --build; cd ../..)
 
 build: Lightyear/*.idr
 	idris --build lightyear.ipkg
 
 test: build
-	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg)
+	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../dependencies/specdris/src)
 
 testCI: dependencies
-	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg)
+	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../dependencies/specdris/src)
 
 clean:
 	idris --clean lightyear.ipkg
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..e1d8caa
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,11 @@
+# This is used in the Travis build to install the Idris compiler.
+let
+  pkgs = import <nixpkgs> {};
+  stdenv = pkgs.stdenv;
+in {
+  lightyear = stdenv.mkDerivation {
+    name = "lightyear";
+    src = ./.;
+    buildInputs = with pkgs; [ haskellPackages.idris gmp ];
+  };
+}
\ No newline at end of file

From 689289e742a499400db857e9b96b13782a4736fa Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Sun, 30 Jul 2017 13:05:46 +0200
Subject: [PATCH 13/15] Fixed test.ipkg.

---
 Makefile        | 2 +-
 tests/test.ipkg | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 81f4aaf..d9a3c96 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ test: build
 	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../dependencies/specdris/src)
 
 testCI: dependencies
-	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../dependencies/specdris/src)
+	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../../dependencies/specdris/src)
 
 clean:
 	idris --clean lightyear.ipkg
diff --git a/tests/test.ipkg b/tests/test.ipkg
index 8df0a17..f7a0853 100644
--- a/tests/test.ipkg
+++ b/tests/test.ipkg
@@ -2,8 +2,6 @@ package test
 
 opts = "--sourcepath ../ --idrispath ../ -p contrib"
 
-pkgs = specdris -- github.com/pheymann/specdris
-
 modules = Json
         , JsonTest
         , ParserTest

From fd13efec72a56e1b672670d118587c9d9bd071f8 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Sun, 30 Jul 2017 13:12:54 +0200
Subject: [PATCH 14/15] Fixed travis yml.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d9a3c96..81f4aaf 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ test: build
 	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../dependencies/specdris/src)
 
 testCI: dependencies
-	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../../dependencies/specdris/src)
+	(cd tests; idris --clean test.ipkg; idris --testpkg test.ipkg --idrispath ../dependencies/specdris/src)
 
 clean:
 	idris --clean lightyear.ipkg

From db1b25e82ed14d22e63d5ff17012f517a25d92e6 Mon Sep 17 00:00:00 2001
From: paul-heymann <paul.heymann@xing.com>
Date: Sun, 30 Jul 2017 13:20:17 +0200
Subject: [PATCH 15/15] Deleted Dockerfile and use new specdris version.

---
 Dockerfile | 3 ---
 Makefile   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 9b37d97..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM dgellow/idris:v1.0
-
-WORKDIR /var/idris-project
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 81f4aaf..b8091a2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ install: build
 
 dependencies:
 	mkdir dependencies
-	(cd dependencies; git clone https://github.com/pheymann/specdris; git fetch; cd specdris; git checkout v0.2.1; ./project --build; cd ../..)
+	(cd dependencies; git clone https://github.com/pheymann/specdris; git fetch; cd specdris; git checkout v0.2.2; ./project --build; cd ../..)
 
 build: Lightyear/*.idr
 	idris --build lightyear.ipkg