adetokunbo · adetokunbo · Mar 13, 2019 · Mar 11, 2019 · Mar 14, 2019 · Mar 14, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,8 +12,8 @@ aliases: &build
     - checkout
 
     - run:
-        name: create a fake /nix
-        command: sudo mkdir -m 0755 /nix && sudo chown circleci /nix
+        name: create a fake /nix, enable single-user install of nix as user circleci
+        command: sudo mkdir -m 0777 /nix && sudo chown -R circleci /nix
 
     # Restore the nix installation to its state after the previous test run.
     # This should prevent unnecessary rebuilds of dependencies without impacting
@@ -31,17 +31,17 @@ aliases: &build
         name: install nix
         command: |
           [[ -d ~/.nix-defexpr ]] ||
-          curl https://nixos.org/nix/install | sh
+          curl https://nixos.org/releases/nix/nix-2.2.1/install | sh
 
     - run:
         name: install nix dependencies used in the test script itself
         command: |
           nix-env -i cabal2nix
-          nix-env -i nix-prefetch-git
+          nix-env -i nix-prefetch-scripts
 
     - run:
-        name: run the tests (temporarily - just build to reset the cache)
-        command: nix-build --show-trace build.nix
+        name: run the tests
+        command: nix-shell --run 'cabal new-test haskell-overridez-tests'
 
     # Save /nix and the nix user folders to the cache.
 

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # haskell development
-result
+result*
 .ghc*
 dist
 dist-newstyle

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: nix
+nix: 2.2.1
+script: nix-shell --run 'cabal new-test haskell-overridez-tests'
diff --git a/build.nix b/build.nix
@@ -28,4 +28,5 @@ in
 pkgsMake pkgsMakeArgs ({ call, lib, ... }: rec {
   haskell-overridez-exe = call.haskell.cabal2nix.app ./.;
   haskell-overridez = call.package ./nix/wrapper;
+  haskell-overridez-tests = call.haskell.cabal2nix.lib ./haskell-overridez-tests;
 })
diff --git a/cabal.project b/cabal.project
@@ -0,0 +1,3 @@
+packages:
+  ./
+  ./haskell-overridez-tests
diff --git a/fixtures/gobanme-no-yagai-purojekuto/.gitignore b/fixtures/gobanme-no-yagai-purojekuto/.gitignore
diff --git a/fixtures/gobanme-no-yagai-purojekuto/DESC b/fixtures/gobanme-no-yagai-purojekuto/DESC
diff --git a/fixtures/gobanme-no-yagai-purojekuto/Main.hs b/fixtures/gobanme-no-yagai-purojekuto/Main.hs
diff --git a/fixtures/gobanme-no-yagai-purojekuto/default.nix b/fixtures/gobanme-no-yagai-purojekuto/default.nix
diff --git a/fixtures/gobanme-no-yagai-purojekuto/gobanme-no-yagai-purojekuto.cabal b/fixtures/gobanme-no-yagai-purojekuto/gobanme-no-yagai-purojekuto.cabal
diff --git a/fixtures/gobanme-no-yagai-purojekuto/setup_test.sh b/fixtures/gobanme-no-yagai-purojekuto/setup_test.sh
diff --git a/fixtures/hachibanme-no-purojekuto/.gitignore b/fixtures/hachibanme-no-purojekuto/.gitignore
diff --git a/fixtures/hachibanme-no-purojekuto/DESC b/fixtures/hachibanme-no-purojekuto/DESC
diff --git a/fixtures/hachibanme-no-purojekuto/Main.hs b/fixtures/hachibanme-no-purojekuto/Main.hs
diff --git a/fixtures/hachibanme-no-purojekuto/hachibanme-no-purojekuto.cabal b/fixtures/hachibanme-no-purojekuto/hachibanme-no-purojekuto.cabal
diff --git a/fixtures/hachibanme-no-purojekuto/setup_test.sh b/fixtures/hachibanme-no-purojekuto/setup_test.sh
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/.gitignore b/fixtures/ichibanme-no-yagai-purojekuto/.gitignore
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/DESC b/fixtures/ichibanme-no-yagai-purojekuto/DESC
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/LICENSE b/fixtures/ichibanme-no-yagai-purojekuto/LICENSE
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/Main.hs b/fixtures/ichibanme-no-yagai-purojekuto/Main.hs
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/default.nix b/fixtures/ichibanme-no-yagai-purojekuto/default.nix
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/ichibanme-no-yagai-purojekuto.cabal b/fixtures/ichibanme-no-yagai-purojekuto/ichibanme-no-yagai-purojekuto.cabal
diff --git a/fixtures/ichibanme-no-yagai-purojekuto/setup_test.sh b/fixtures/ichibanme-no-yagai-purojekuto/setup_test.sh
diff --git a/fixtures/kyuubanme-no-purojekuto/.gitignore b/fixtures/kyuubanme-no-purojekuto/.gitignore
diff --git a/fixtures/kyuubanme-no-purojekuto/DESC b/fixtures/kyuubanme-no-purojekuto/DESC
diff --git a/fixtures/kyuubanme-no-purojekuto/LICENSE b/fixtures/kyuubanme-no-purojekuto/LICENSE
diff --git a/fixtures/kyuubanme-no-purojekuto/Main.hs b/fixtures/kyuubanme-no-purojekuto/Main.hs
diff --git a/fixtures/kyuubanme-no-purojekuto/setup_test.sh b/fixtures/kyuubanme-no-purojekuto/setup_test.sh
diff --git a/fixtures/nanabanme-no-purojekuto/.gitignore b/fixtures/nanabanme-no-purojekuto/.gitignore
diff --git a/fixtures/nanabanme-no-purojekuto/DESC b/fixtures/nanabanme-no-purojekuto/DESC
diff --git a/fixtures/nanabanme-no-purojekuto/LICENSE b/fixtures/nanabanme-no-purojekuto/LICENSE
diff --git a/fixtures/nanabanme-no-purojekuto/Main.hs b/fixtures/nanabanme-no-purojekuto/Main.hs
diff --git a/fixtures/nanabanme-no-purojekuto/nanabanme-no-purojekuto.cabal b/fixtures/nanabanme-no-purojekuto/nanabanme-no-purojekuto.cabal
diff --git a/fixtures/nanabanme-no-purojekuto/setup_test.sh b/fixtures/nanabanme-no-purojekuto/setup_test.sh
diff --git a/fixtures/nanabanme-no-purojekuto/test.sh b/fixtures/nanabanme-no-purojekuto/test.sh
diff --git a/fixtures/nibanme-no-yagai-purojekuto/DESC b/fixtures/nibanme-no-yagai-purojekuto/DESC
diff --git a/fixtures/nibanme-no-yagai-purojekuto/nibanme-no-yagi-purojekuto.cabal b/fixtures/nibanme-no-yagai-purojekuto/nibanme-no-yagi-purojekuto.cabal
diff --git a/fixtures/nibanme-no-yagai-purojekuto/setup_test.sh b/fixtures/nibanme-no-yagai-purojekuto/setup_test.sh