Un-mach

.circleci/config.yml

@@ -381,22 +381,26 @@ jobs:
       - run:
           name: "Check Black"
           command: |
-            nix run .#black -- --check --diff src
+            source .circleci/lib.sh
+            cache_if_able nix run -v .#black -- --check --diff src
 
       - run:
           name: "Check isort"
           command: |
-            nix run .#isort -- --check --diff src
+            source .circleci/lib.sh
+            cache_if_able nix run .#isort -- --check --diff src
 
       - run:
           name: "Check flake8"
           command: |
-            nix run .#flake8 -- src
+            source .circleci/lib.sh
+            cache_if_able nix run .#flake8 -- src
 
       - run:
           name: "Run Type Checks"
           command: |
-            nix run .#mypy -- src
+            source .circleci/lib.sh
+            cache_if_able nix run .#mypy -- src
 
 
   # A job that merges all of the coverage data and generates a report.

CONTRIBUTING.rst

@@ -28,14 +28,28 @@ Updating Dependencies
 Python Dependencies
 ...................
 
-We use `mach-nix <https://github.com/DavHau/mach-nix/>`_ to build python packages.
-It uses a snapshot of PyPI to expose python dependencies to nix,
+We use Nix to build python packages.
+We take a snapshot of our Python dependencies from nixpkgs,
 thus our python depedencies (on nix) are automatically pinned.
-To update the PyPI snapshot (and thus our python dependencies), run
+To do a minor nixpkgs update (and thus a python dependency update),
+run
 
 .. code:: shell
 
-   nix flake lock --update-input pypi-deps-db
+   nix flake lock --update-input nixpkgs
+
+To do a major nixpkgs update (and thus a python dependency update),
+edit ``flake.nix`` and change this line::
+
+.. code:: nix
+
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-22.11";
+
+Change the ``ref`` query argument to a suitable value.
+Then run the minor update command above.
+
+For dependencies or versions of dependencies that are required but not available from nixpkgs,
+we maintain our own packages in the ``nix/`` directory.
 
 tahoe-lafs
 ..........