From acdaa6a6e5b7c15369c092d00ea5ecca18e5dc73 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 8 Mar 2024 22:51:41 +0100 Subject: [PATCH] tests: remove now superfluous substitution of schema --- nix/tests/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nix/tests/default.nix b/nix/tests/default.nix index cbc3d6e..a23f5d6 100644 --- a/nix/tests/default.nix +++ b/nix/tests/default.nix @@ -30,17 +30,11 @@ let sha256 = "sha256-N9aEK2oYk3SoCczrRMt5ycdgXCPA5SHTKsS2CffFY14="; }; - # To avoid network access, the base URL is replaced with a local URI to the above downloaded schemas - name = "bom-1.4.schema.json"; - relativeReferencesSchema = pkgs.runCommand name { } '' - substitute "${cycloneDxSpec}/schema/${name}" "$out" \ - --replace 'http://cyclonedx.org/schema/${name}' 'file://${cycloneDxSpec}/schema/' - ''; - buildBomAndValidate = drv: options: pkgs.runCommand "${drv.name}-bom-validation" { nativeBuildInputs = [ pkgs.check-jsonschema ]; } '' check-jsonschema \ - --schemafile "${relativeReferencesSchema}" \ + --schemafile "${cycloneDxSpec}/schema/bom-1.4.schema.json" \ + --base-uri "${cycloneDxSpec}/schema/bom-1.4.schema.json" \ "${buildBom drv options}" touch $out '';