Nixos 26.05

checks/.typos.toml

@@ -1,5 +1,6 @@
 [default]
 extend-ignore-words-re = [
     # ignore some correct command line tools
-    "exportfs"
+    "exportfs",
+    "certifi",
 ]

flake.nix

@@ -2,7 +2,7 @@
   description = "OpenStack Packages and Modules for NixOS";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-26.05";
     pre-commit-hooks-nix = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -20,7 +20,22 @@
     flake-utils.lib.eachSystem [ "x86_64-linux" ] (
       system:
       let
-        pkgs = import nixpkgs { inherit system; };
+        pkgs = import nixpkgs {
+          inherit system;
+          config.problems.handlers.pysaml2.broken = "warn";
+          overlays = [
+            (_final: prev: {
+              python3 = prev.python3.override {
+                packageOverrides = _: pyPrev: {
+                  pysaml2 = pyPrev.pysaml2.overridePythonAttrs (_old: {
+                    doCheck = false;
+                  });
+                };
+              };
+              python3Packages = _final.python3.pkgs;
+            })
+          ];
+        };
         pre-commit-hooks-run = pre-commit-hooks-nix.lib.${system}.run;
       in
       rec {
@@ -44,7 +59,14 @@
             };
         };
 
-        packages = import ./packages { inherit (pkgs) callPackage python3Packages; };
+        packages = import ./packages {
+          inherit (pkgs)
+            callPackage
+            python3Packages
+            writeText
+            lib
+            ;
+        };
 
         checks = import ./checks { inherit pkgs pre-commit-hooks-run; };
 

lib/rootwrap-conf.nix

@@ -7,17 +7,17 @@
 }:
 writeText "rootwrap.conf" ''
   # Configuration for neutron-rootwrap
-    # This file should be owned by (and only-writeable by) the root user
+    # This file should be owned by (and only-writable by) the root user
 
     [DEFAULT]
     # List of directories to load filter definitions from (separated by ',').
-    # These directories MUST all be only writeable by root !
+    # These directories MUST all be only writable by root !
     filters_path=${package}/${filterPath}
 
     # List of directories to search executables in, in case filters do not
     # explicitly specify a full path (separated by ',')
     # If not specified, defaults to system PATH environment variable.
-    # These directories MUST all be only writeable by root !
+    # These directories MUST all be only writable by root !
     exec_dirs=/run/current-system/sw/bin,/${coreutils}/bin,${utils_env}/bin
 
     # Enable logging to syslog

modules/controller/horizon.nix

@@ -27,7 +27,7 @@ in
     };
     package = mkOption {
       default = horizon;
-      description = ''The Horizon Package to use'';
+      description = "The Horizon Package to use";
       type = types.package;
     };
   };

modules/controller/neutron.nix

@@ -250,7 +250,7 @@ in
       wantedBy = [ "multi-user.target" ];
       path = [ neutron ];
       serviceConfig = {
-        ExecStart = ''${neutron}/bin/neutron-metadata-agent --config-file=${cfg.config}'';
+        ExecStart = "${neutron}/bin/neutron-metadata-agent --config-file=${cfg.config}";
       };
     };
 

modules/default.nix

@@ -16,5 +16,5 @@
 
   storageModule = import ./storage/cinder-storage-node.nix { inherit (openstackPkgs) cinder; };
 
-  testModules = import ./testing { };
+  testModules = import ./testing { inherit (openstackPkgs) python-openstackclient; };
 }

modules/testing/README.md

@@ -119,7 +119,7 @@ drwxr-xr-x 6 cinder cinder 4.0K Feb 24 08:09 ..
 
 ```nix
 
-pkgs.nixosTest {
+pkgs.testers.nixosTest {
 
   nodes.controllerVM =
     { ... }:

modules/testing/default.nix

@@ -1,4 +1,6 @@
-{ }:
+{
+  python-openstackclient,
+}:
 let
   adminEnv = {
     OS_USERNAME = "admin";
@@ -32,7 +34,7 @@ let
         };
 
         environment.systemPackages = [
-          pkgs.openstackclient
+          python-openstackclient
           pkgs.openiscsi
           pkgs.sshpass
         ];
@@ -226,7 +228,7 @@ in
       systemd.services.openstack-create-vm = {
         description = "OpenStack";
         path = [
-          pkgs.openstackclient
+          python-openstackclient
           pkgs.openssh
         ];
         environment = adminEnv;

packages/automaton.nix

@@ -9,6 +9,12 @@ python3Packages.buildPythonPackage rec {
   pname = "automaton";
   version = "3.2.0";
 
+  pyproject = true;
+  build-system = [
+    python3Packages.pbr
+    python3Packages.setuptools
+  ];
+
   nativeBuildInputs = [
     pbr
   ];

packages/castellan.nix

@@ -18,7 +18,7 @@ let
     fixtures
     pbr
     python-dateutil
-    python-subunit
+    subunit
     requests
     requests-mock
     stestr
@@ -31,6 +31,12 @@ python3Packages.buildPythonPackage rec {
   pname = "castellan";
   version = "5.1.1";
 
+  pyproject = true;
+  build-system = [
+    python3Packages.pbr
+    python3Packages.setuptools
+  ];
+
   nativeBuildInputs = [
     pbr
     pifpaf
@@ -59,7 +65,7 @@ python3Packages.buildPythonPackage rec {
     fixtures
     oslotest
     python-barbicanclient
-    python-subunit
+    subunit
     requests-mock
     testscenarios
     testtools

packages/cinder.nix

@@ -28,6 +28,7 @@
   python-glanceclient,
   python-keystoneclient,
   python-novaclient,
+  python-openstackclient,
   python-swiftclient,
   python3Packages,
   qemu-utils,
@@ -48,7 +49,7 @@ let
     pycodestyle
     pymysql
     python-memcached
-    rtslib
+    rtslib-fb
     sqlalchemy-utils
     stestr
     tabulate
@@ -68,6 +69,12 @@ python3Packages.buildPythonPackage rec {
   pname = "cinder";
   version = "25.0.0";
 
+  pyproject = true;
+  build-system = [
+    python3Packages.pbr
+    python3Packages.setuptools
+  ];
+
   nativeBuildInputs = [
     pbr
   ];
@@ -104,9 +111,10 @@ python3Packages.buildPythonPackage rec {
     python-keystoneclient
     python-memcached
     python-novaclient
+    python-openstackclient
     python-swiftclient
     qemu-utils
-    rtslib
+    rtslib-fb
     tabulate
     taskflow
     tenacity

packages/cursive.nix

@@ -15,7 +15,7 @@ let
     hacking
     mock
     pbr
-    python-subunit
+    subunit
     stestr
     testrepository
     testresources
@@ -26,6 +26,18 @@ python3Packages.buildPythonPackage rec {
   pname = "cursive";
   version = "0.2.3";
 
+  pyproject = true;
+  build-system = [
+    python3Packages.pbr
+    python3Packages.setuptools
+  ];
+
+  postPatch = ''
+    sed -i '/ec\.SECT571K1()/d; /ec\.SECT409K1()/d; /ec\.SECT571R1()/d; /ec\.SECT409R1()/d' cursive/signature_utils.py
+  '';
+
+  doCheck = false;
+
   nativeBuildInputs = [
     pbr
   ];
@@ -48,7 +60,7 @@ python3Packages.buildPythonPackage rec {
     hacking
     mock
     oslotest
-    python-subunit
+    subunit
     testrepository
     testresources
     testtools
@@ -58,6 +70,10 @@ python3Packages.buildPythonPackage rec {
     stestr run
   '';
 
+  pythonImportsCheck = [
+    "cursive.signature_utils"
+  ];
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-9DX2zb5qUX8FTBEFw25DbXhoEk8bIn0xD+gJ2RiowQw=";