Move new config into place.

.circleci/config.yml

@@ -135,15 +135,6 @@ jobs:
             ZKAPAUTHORIZER_HYPOTHESIS_PROFILE: "ci"
 
   linux-tests: &LINUX_TESTS
-    parameters:
-      tahoe-version:
-        # A Tahoe-LAFS version number string like "1.15.0" which corresponds
-        # to a version known by default.nix .  This is the version that will
-        # be declared as a dependency of the Nix package of ZKAPAuthorizer
-        # (and therefore used in the test run and pulled in should you install
-        # this package).
-        type: "string"
-
     docker:
       # Run in a highly Nix-capable environment.
       - image: "nixos/nix:latest"
@@ -188,11 +179,9 @@ jobs:
             #
             # Further, we want the "doc" output built as well because that's
             # where the coverage data ends up.
-            nix-build \
+            nix-build tests.nix \
               --argstr hypothesisProfile ci \
               --arg collectCoverage true \
-              --argstr tahoe-lafs << parameters.tahoe-version >> \
-              --attr doc
 
       - run:
           name: "Push to Cachix"
@@ -223,13 +212,7 @@ workflows:
   everything:
     jobs:
     - "documentation"
-    - "linux-tests":
-        matrix:
-          parameters:
-            tahoe-version:
-            - "1.14.0"
-            - "1.16.0rc1"
-
+    - "linux-tests"
     - "macos-tests":
         matrix:
           parameters:

.circleci/report-coverage.sh

 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p "curl" -p "python.withPackages (ps: [ ps.coverage ])"
 set -x
-find ./result-doc/share/doc
-cp ./result-doc/share/doc/*/.coverage.* ./
+find ./result/share/doc
+cp ./result/share/doc/*/.coverage.* ./
 python -m coverage combine
 python -m coverage report
 python -m coverage xml

tests.nix

@@ -4,7 +4,7 @@ in
 { pkgs ? import sources.release2015 {}
 , pypiData ? sources.pypi-deps-db
 , mach-nix ? import sources.mach-nix { inherit pkgs pypiData; }
-, zkapauthorizer ? import ./new.nix { inherit pkgs pypiData mach-nix; }
+, zkapauthorizer ? import ./. { inherit pkgs pypiData mach-nix; }
 , ci-reports ? false
 , hypothesisProfile ? null
 , collectCoverage ? false