Nixpkgs 25.05

flake.nix

@@ -2,7 +2,7 @@
   description = "OpenStack Packages and Modules for NixOS";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
     pre-commit-hooks-nix = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";

packages/default.nix

@@ -156,6 +156,7 @@ let
         osprofiler
         python-keystoneclient
         python3Packages
+        sqlalchemy
         ;
     };
     keystoneauth1 = callPackage ./keystoneauth1.nix {
@@ -190,7 +191,7 @@ let
         python3Packages
         ;
     };
-    openstacksdk = python3Packages.openstacksdk.override {
+    openstacksdk = callPackage ./openstacksdk.nix {
       inherit keystoneauth1;
     };
     neutron-lib = callPackage ./neutron-lib.nix {
@@ -213,6 +214,7 @@ let
         oslotest
         osprofiler
         python3Packages
+        sqlalchemy
         ;
     };
     neutron = callPackage ./neutron.nix {
@@ -252,6 +254,7 @@ let
         python-neutronclient
         python-novaclient
         python3Packages
+        sqlalchemy
         tooz
         ;
     };
@@ -295,6 +298,7 @@ let
         python-glanceclient
         python-neutronclient
         python3Packages
+        sqlalchemy
         tooz
         ;
     };
@@ -315,6 +319,7 @@ let
         oslo-utils
         oslotest
         python3Packages
+        sqlalchemy
         ;
     };
     os-brick = callPackage ./os-brick.nix {
@@ -392,7 +397,7 @@ let
         python3Packages
         ;
     };
-    osc-lib = python3Packages.osc-lib.override {
+    osc-lib = callPackage ./osc-lib.nix {
       inherit
         openstacksdk
         oslo-i18n
@@ -440,6 +445,7 @@ let
         oslotest
         pre-commit
         python3Packages
+        sqlalchemy
         ;
     };
     oslo-i18n = callPackage ./oslo-i18n.nix { inherit python3Packages; };
@@ -644,7 +650,7 @@ let
         reno
         ;
     };
-    python-cinderclient = python3Packages.python-cinderclient.override {
+    python-cinderclient = callPackage ./python-cinderclient.nix {
       inherit
         keystoneauth1
         oslo-i18n
@@ -705,6 +711,7 @@ let
     sphinxcontrib-svg2pdfconverter = callPackage ./sphinxcontrib-svg2pdfconverter.nix {
       inherit python3Packages;
     };
+    sqlalchemy = callPackage ./sqlalchemy.nix { inherit python3Packages; };
     suds-community = callPackage ./suds-community.nix { inherit python3Packages; };
     taskflow = callPackage ./taskflow.nix {
       inherit

packages/jsonpath-rw-ext.nix

@@ -1,5 +1,4 @@
 {
-  discover,
   fetchPypi,
   python3Packages,
 }:
@@ -32,7 +31,6 @@ python3Packages.buildPythonPackage rec {
 
   checkInputs = [
     coverage
-    discover
     hacking
     oslotest
     python-subunit

packages/keystone.nix

@@ -13,6 +13,7 @@
   osprofiler,
   python-keystoneclient,
   python3Packages,
+  sqlalchemy,
   which,
 }:
 let
@@ -36,7 +37,6 @@ let
     pymysql
     pysaml2
     requests
-    sqlalchemy
     stestr
     tempest
     testresources

packages/neutron-lib.nix

@@ -18,6 +18,7 @@
   oslotest,
   osprofiler,
   python3Packages,
+  sqlalchemy,
 }:
 let
   inherit (python3Packages)
@@ -33,7 +34,6 @@ let
     pylint
     python-subunit
     setproctitle
-    sqlalchemy
     stestr
     stevedore
     testresources

packages/neutron.nix

@@ -37,6 +37,7 @@
   python-neutronclient,
   python-novaclient,
   python3Packages,
+  sqlalchemy,
   tooz,
   writeScript,
 }:
@@ -64,7 +65,6 @@ let
     python-subunit
     requests
     routes
-    sqlalchemy
     stestr
     tenacity
     testresources

packages/nova.nix

@@ -40,6 +40,7 @@
   python-glanceclient,
   python-neutronclient,
   python3Packages,
+  sqlalchemy,
   tooz,
   writeScript,
 }:
@@ -79,7 +80,6 @@ let
     retrying
     rfc3986
     routes
-    sqlalchemy
     stestr
     stevedore
     testresources
@@ -108,7 +108,7 @@ python3Packages.buildPythonPackage (rec {
   ];
 
   propagatedBuildInputs = [
-    alembic
+    (alembic.override { inherit sqlalchemy; })
     castellan
     cryptography
     cursive

packages/openstack-placement.nix

@@ -15,14 +15,14 @@
   oslo-utils,
   oslotest,
   python3Packages,
+  sqlalchemy,
 }:
 let
   inherit (python3Packages)
     jsonschema
     pbr
     pymysql
     routes
-    sqlalchemy
     stestr
     ;
 in

packages/openstacksdk.nix

@@ -0,0 +1,79 @@
+{
+  keystoneauth1,
+  python3Packages,
+}:
+let
+  inherit (python3Packages)
+    platformdirs
+    cryptography
+    dogpile-cache
+    jmespath
+    jsonpatch
+    munch
+    netifaces
+    openstackdocstheme
+    os-service-types
+    pbr
+    pythonOlder
+    pyyaml
+    requestsexceptions
+    setuptools
+    sphinxHook
+    ;
+in
+python3Packages.buildPythonPackage rec {
+  pname = "openstacksdk";
+  version = "4.0.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    hash = "sha256-54YN2WtwUxMJI8EdVx0lgCuWjx4xOIRct8rHxrMzv0s=";
+  };
+
+  postPatch = ''
+    # Disable rsvgconverter not needed to build manpage
+    substituteInPlace doc/source/conf.py \
+      --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter',"
+  '';
+
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    platformdirs
+    cryptography
+    dogpile-cache
+    jmespath
+    jsonpatch
+    keystoneauth1
+    munch
+    netifaces
+    os-service-types
+    pbr
+    requestsexceptions
+    pyyaml
+  ];
+
+  # Checks moved to 'passthru.tests' to workaround slowness
+  doCheck = false;
+
+  #passthru.tests = {
+  #  tests = callPackage ./tests.nix { };
+  #};
+
+  pythonImportsCheck = [ "openstack" ];
+}

packages/osc-lib.nix

@@ -0,0 +1,65 @@
+{
+  python3Packages,
+  fetchFromGitHub,
+  oslo-i18n,
+  oslo-utils,
+  openstacksdk,
+}:
+let
+  inherit (python3Packages)
+    cliff
+    pbr
+    pythonOlder
+    requests-mock
+    setuptools
+    requests
+    stestr
+    ;
+in
+python3Packages.buildPythonPackage rec {
+  pname = "osc-lib";
+  version = "3.1.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "osc-lib";
+    rev = version;
+    hash = "sha256-DDjWM4hjHPXYDeAJ6FDZZPzi65DG1rJ3efs8MouX1WY=";
+  };
+
+  # fake version to make pbr.packaging happy and not reject it...
+  PBR_VERSION = version;
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  dependencies = [
+    cliff
+    openstacksdk
+    oslo-i18n
+    oslo-utils
+    requests
+  ];
+
+  nativeCheckInputs = [
+    requests-mock
+    stestr
+  ];
+
+  checkPhase = ''
+    # tests parse cli output which slightly changed
+    stestr run -e <(echo "
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_filtering_option_to_parser
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_create
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_set
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_unset
+    ")
+  '';
+
+  pythonImportsCheck = [ "osc_lib" ];
+}

packages/oslo-db.nix

@@ -8,6 +8,7 @@
   pifpaf,
   pre-commit,
   python3Packages,
+  sqlalchemy,
 }:
 let
   inherit (python3Packages)
@@ -21,7 +22,6 @@ let
     psycopg2
     pymysql
     python-subunit
-    sqlalchemy
     stestr
     stevedore
     testresources
@@ -34,7 +34,7 @@ python3Packages.buildPythonPackage rec {
   version = "17.0.0";
 
   propagatedBuildInputs = [
-    alembic
+    (alembic.override { inherit sqlalchemy; })
     debtcollector
     oslo-config
     oslo-i18n