3 files changed, 10 insertions, 14 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 61d0c5a..abdfa0f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,33 +2,27 @@ version: 2
 jobs:
   build:
     docker:
-      - image: fpco/stack-build
+      - image: nixorg/nix:circleci
     steps:
       - checkout
       - restore_cache:
           key: stack-deps-{{ checksum "stack.yaml" }}
       - run:
           name: Setup build toolchain
-          command: stack setup
+          command: stack --nix setup
       - run:
           name: Building dependencies
-          command: stack test --only-snapshot --prefetch
+          command: stack --nix test --only-snapshot --prefetch
       - save_cache:
           paths:
             - "~/.stack"
           key: stack-deps-{{ checksum "stack.yaml" }}
       - run:
-          name: Set up apt
-          command: apt update
-      - run:
-          name: Installing C packages
-          command: apt -y install libglpk-dev
-      - run:
           name: Building
-          command: stack build --pedantic
+          command: stack --nix build --pedantic
       - run:
           name: Building tests
-          command: stack test --pedantic --no-run-tests
+          command: stack --nix test --pedantic --no-run-tests
       - run:
           name: Running tests
-          command: stack test
+          command: stack --nix test
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index 960c777..4ed1462 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -514,7 +514,7 @@ indexProp g f x = a1 == g a2 && a2 == a3 && b1 == g b2 && b2 == b3
 
 --------------------------------------------------------------------------------
 
-_sliceTest = utest "slice test" $ and
+_sliceTest = TestList
     [ testSlice (chol . trustSym)  (gen 5 :: Matrix R)
     , testSlice (chol . trustSym)  (gen 5 :: Matrix C)
     , testSlice qr    (rec :: Matrix R)
diff --git a/shell.nix b/shell.nix
index 9566524..056cd5d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -32,7 +32,7 @@ let
   inherit (nixpkgs) pkgs;
 
 f = { mkDerivation, ad, base, diagrams-lib, diagrams-rasterific, gcc
-    , hmatrix, hmatrix-gsl, inline-c, plots, pretty, stdenv, sundials, vector }:
+    , hmatrix, hmatrix-gsl, HUnit, inline-c, plots, pretty, QuickCheck, stdenv, sundials, vector }:
 
 mkDerivation {
   pname = "haskell-sundials";
@@ -48,8 +48,10 @@ mkDerivation {
     gcc
     hmatrix
     hmatrix-gsl
+    HUnit
     inline-c
     plots
+    QuickCheck
     pretty
     vector
   ] ++ (if pkgs.stdenv.isDarwin then [pkgs.darwin.apple_sdk.frameworks.Cocoa] else []);