Merge pull request #89 from Kha/master

more nix
parttimenerd · Jul 12, 2019 · eba6f13 · eba6f13
2 parents 8259a1b + 94804fd
commit eba6f13
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,11 @@ matrix:
   include:
     - language: nix
       os: linux
+      # work around weird `fetchGit` behavior...
+      script: nix-build --arg src ./.
     - language: nix
       os: osx
+      script: nix-build --arg src ./.
     - language: python
       python: "3.6"
       install:
@@ -18,4 +21,4 @@ matrix:
         - pip3 install -e .
       script:
         - pytest
-        - TEMCI_TEST_CMD=1 pytest
+        - TEMCI_TEST_CMD=1 pytest
diff --git a/default.nix b/default.nix
@@ -1,4 +1,6 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> {},
+  # ignore untracked files in local checkout
+  src ? if builtins.pathExists ./.git then builtins.fetchGit { url = ./.; } else ./. }:
 with pkgs.python3Packages;
 let
   python = import ./requirements.nix { inherit pkgs; };
@@ -9,7 +11,7 @@ let
 in buildPythonApplication rec {
   name = "temci-${version}";
   version = "local";
-  src = pkgs.lib.sourceFilesBySuffices ./. [ "py" "setup.cfg" "README.rst" ];
+  inherit src;
   checkInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [
     click_git
@@ -23,6 +25,9 @@ in buildPythonApplication rec {
     scipy seaborn
     pyyaml
   ] ++ pkgs.lib.optional pkgs.stdenv.isLinux perf;
+  postInstall = ''
+    $out/bin/temci setup
+  '';
   postPatch = ''
     substituteInPlace temci/run/cpuset.py --replace python3 ${pkgs.python3.withPackages (ps: [ pypi.cpuset-py3 ])}/bin/python3
     substituteInPlace temci/run/run_driver.py \