Update 2025 05

.circleci/config.yml

@@ -55,7 +55,7 @@ aliases:
 
   - nix_docker: &NIX_DOCKER
       # Run in a highly Nix-capable environment.
-      - image: "nixos/nix:2.15.0"
+      - image: "nixos/nix:2.18.9"
 
   - nix_environ: &NIX_ENVIRON
       # Let us use features marked "experimental".  For example, most/all of
@@ -515,6 +515,8 @@ workflows:
             py-version:
               - "39"
               - "310"
+              - "311"
+              - "312"
             tahoe-lafs:
               - "1_18_0"
               # This is usually not master@HEAD because it is still pinned to

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "A Tahoe-LAFS storage-system plugin which authorizes storage operations based on privacy-respecting tokens.";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
     challenge-bypass-ristretto.url = github:LeastAuthority/python-challenge-bypass-ristretto;
     challenge-bypass-ristretto.inputs.nixpkgs.follows = "nixpkgs";
@@ -31,7 +31,7 @@
 
       # The names of the nixpkgs Python derivations for which we will expose
       # packages.
-      pyVersions = [ "python310" "python39" ];
+      pyVersions = [ "python312" "python311" "python310" "python39" ];
 
       # All of the versions our Tahoe-LAFS dependency for which we will expose
       # packages.

nix/collections-extended.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hypothesis,
+  poetry-core,
+  pytestCheckHook,
+  pythonOlder,
+  pythonAtLeast,
+}:
+
+buildPythonPackage rec {
+  pname = "collections-extended";
+  version = "2.0.2.post1";
+  format = "pyproject";
+
+  # https://github.com/mlenzen/collections-extended/issues/198
+  # My own running the test suggest Python 3.12 is still fine.
+  disabled = pythonOlder "3.6" || pythonAtLeast "3.13";
+
+  src = fetchFromGitHub {
+    owner = "mlenzen";
+    repo = pname;
+    # This version includes our hero JP's patches for Python 3.11.
+    rev = "8b93390636d58d28012b8e9d22334ee64ca37d73";
+    hash = "sha256-e7RCpNsqyS1d3q0E+uaE4UOEQziueYsRkKEvy3gCHt0=";
+  };
+
+  nativeBuildInputs = [ poetry-core ];
+
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "collections_extended" ];
+
+  meta = with lib; {
+    description = "Extra Python Collections - bags (multisets), setlists (unique list/indexed set), RangeMap and IndexedDict";
+    homepage = "https://github.com/mlenzen/collections-extended";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ exarkun ];
+  };
+}

nix/compose.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "compose";
-  version = "1.4.8";
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-mpRabfC4LE6xYlHmQbHb1yXxLDtH5idwN4GbUnCPGTo=";
+    sha256 = "sha256-yUP6goTByziSklOIhi4gPJiISE5M4/1RcVBnaWkNi00=";
   };
 
   meta = with lib; {

nix/lib.nix

@@ -40,8 +40,6 @@ rec {
       # our override recursively to the package set until the return value is
       # the same as the input.
       packageOverrides = self: super: {
-        pycddl = self.callPackage ./pycddl.nix {};
-
         # The foolscap test suite has one failing test when run against the
         # new version of Twisted, so disable the test suite for now.  XXX
         # Maybe we could just disable the one failing test,
@@ -51,15 +49,6 @@ rec {
         compose = self.callPackage ./compose.nix {};
         tahoe-capabilities = self.callPackage ./tahoe-capabilities.nix {};
 
-        pyopenssl = self.callPackage ./pyopenssl.nix {
-          inherit (super) pyopenssl;
-        };
-
-        # The klein test suite is a little broken so ... don't run it.
-        klein = dontCheck (self.callPackage ./klein.nix {
-          inherit (super) klein;
-        });
-
         # Disable some expensive dependencies that we don't care about.
         black = dontCheck (super.black.override {
           aiohttp = null;
@@ -69,6 +58,9 @@ rec {
           # tokenize-rt = null;
         });
 
+        # Something wants ipython - it breaks Python39 though, so we turn it off.
+        ipython = null;
+
         tqdm = dontCheck super.tqdm;
 
         isort = dontCheck super.isort;
@@ -79,25 +71,17 @@ rec {
           postPatch = tahoe-lafs.buildArgs.postPatch or null;
         };
 
-        flake8-isort = self.callPackage ./flake8-isort.nix {};
-        flake8-black = self.callPackage ./flake8-black.nix {};
-        mypy-zope = self.callPackage ./mypy-zope.nix {};
-        types-PyYAML = self.callPackage ./types-pyyaml.nix {};
-
-        # Hypothesis 6.54-ish has a bug that causes our test suite to fail.
-        # Get a newer one.
-        hypothesis = self.callPackage ./hypothesis.nix {
-          inherit (super) hypothesis;
-        };
+        # collections-extended isn't maintained anymore.
+        collections-extended = self.callPackage ./collections-extended.nix {};
       };
     }); in with python.pkgs;
     buildPythonPackage rec {
       inherit src;
       pname = "ZKAPAuthorizer";
       # Don't forget to bump the version number in
       # src/_zkapauthorizer/__init__.py too.
-      version = "2022.8.21";
-      format = "setuptools";
+      version = "2025.5.15";
+      # format = "setuptools";
 
       # Should this be nativeCheckInputs?  It might matter for
       # cross-compilation.  It's not clear cross-compilation works for Python

nix/tahoe-lafs.nix

@@ -3,16 +3,17 @@ buildPythonPackage {
   pname = "tahoe-lafs";
   version = tahoe-lafs-version;
   src = tahoe-lafs-src;
+  pyproject = true;
 
-  postPatch =
-    (if postPatch == null then "" else postPatch) +
-    # This < is really trying to be a !=.  We provide a new-enough Autobahn
-    # that it actually works, so remove the constraint from the Python metadata.
-    ''
-      sed -i -e "s/autobahn < 22.4.1/autobahn/" setup.py
-    '';
+  # postPatch =
+  #   (if postPatch == null then "" else postPatch) +
+  #   # This < is really trying to be a !=.  We provide a new-enough Autobahn
+  #   # that it actually works, so remove the constraint from the Python metadata.
+  #   ''
+  #     sed -i -e "s/autobahn < 22.4.1/autobahn/" setup.py
+  #   '';
 
-  dontUseSetuptoolsCheck = true;
+  # dontUseSetuptoolsCheck = true;
   propagatedBuildInputs = with pythonPackages; [
     zfec
     zope_interface
@@ -30,6 +31,8 @@ buildPythonPackage {
     netifaces
     pyutil
     collections-extended
+    hatchling
+    hatch-vcs
     klein
     werkzeug
     treq
@@ -42,5 +45,7 @@ buildPythonPackage {
     appdirs
     bcrypt
     aniso8601
+    pip
+    orjson
   ];
 }