Merge pull request #250193 from K900/more-fixes

[staging-next] More misc fixes
NixOS · Aug 19, 2023 · 604294d · 604294d
2 parents d3b2560 + ce17978
commit 604294d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
@@ -43,7 +43,8 @@ buildPythonPackage rec {
 
  postPatch = ''
  substituteInPlace pyproject.toml \
- --replace "numba>=0.57.0" "numba"
+ --replace "numba>=0.57.0" "numba" \
+ --replace "numpy>=1.22.0,<1.25" "numpy"
  '';
 
  nativeBuildInputs = [

diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -74,6 +74,12 @@ buildPythonPackage rec {
  "tests/test_setuptools_pep518.py"
  ];
 
+ # Tries to access ninja.__version__ which our stub doesn't have.
+ # FIXME: remove for next cycle
+ disabledTests = [
+ "test_get_ninja_programs_cmake_module"
+ ];
+
  pythonImportsCheck = [
  "scikit_build_core"
  ];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -24697,7 +24697,9 @@ with pkgs;
 
  qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };
 
- qradiolink = callPackage ../applications/radio/qradiolink { };
+ qradiolink = callPackage ../applications/radio/qradiolink {
+ protobuf = protobuf3_21;
+ };
 
  qrupdate = callPackage ../development/libraries/qrupdate { };
 

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -7371,7 +7371,9 @@ self: super: with self; {
  protobuf = protobuf3;
  };
 
- onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { };
+ onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
+ protobuf = protobuf3;
+ };
 
  onnxmltools = callPackage ../development/python-modules/onnxmltools { };
 
@@ -11708,7 +11710,9 @@ self: super: with self; {
 
  skidl = callPackage ../development/python-modules/skidl { };
 
- skl2onnx = callPackage ../development/python-modules/skl2onnx { };
+ skl2onnx = callPackage ../development/python-modules/skl2onnx {
+ protobuf = protobuf3;
+ };
 
  sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };