Merge pull request #1759 from therealpxc/fix-cyclonedx-and-sarif-libs

overrides/build-systems.json

@@ -21771,6 +21771,9 @@
  "pbr",
  "setuptools"
  ],
+ "sarif-tools": [
+ "poetry-core"
+ ],
  "sasmodels": [
  "setuptools"
  ],

overrides/default.nix

@@ -1415,6 +1415,10 @@ lib.composeManyExtensions [
  }
  );
 
+ license-expression = prev.license-expression.overridePythonAttrs (_old: {
+ dontConfigure = true;
+ });
+
  llama-cpp-python = prev.llama-cpp-python.overridePythonAttrs (
  old: {
  buildInputs = with pkgs; lib.optionals stdenv.isDarwin [

tests/cyclonedx-and-sarif-tools/default.nix

@@ -0,0 +1,13 @@
+{ poetry2nix, python3, runCommand }:
+let
+ env = poetry2nix.mkPoetryEnv {
+ python = python3;
+ pyproject = ./pyproject.toml;
+ poetrylock = ./poetry.lock;
+ };
+in
+runCommand "cyclonedx-and-sarif-tools-test" { } ''
+ export HOME=$(mktemp -d)
+ ${env}/bin/python -c 'import cyclonedx; print(f"cyclonedx {cyclonedx.__version__}")' | tee $out
+ ${env}/bin/sarif --version | tee -a $out
+''