cyclonedx-cli: 0.25.1 -> 0.27.2 (#359842)

This commit is contained in:
Alexander Sieg
2024-12-03 19:31:29 +01:00
committed by GitHub
2 changed files with 17 additions and 12 deletions
+8 -8
View File
@@ -5,10 +5,10 @@
(fetchNuGet { pname = "CoderPatros.AntPathMatching"; version = "0.1.1"; hash = "sha256-U6xUTX5iuCM84QfwOpOtYK5RfKqojYcPfYQtw1+EPak="; })
(fetchNuGet { pname = "coverlet.collector"; version = "3.1.2"; hash = "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8="; })
(fetchNuGet { pname = "CsvHelper"; version = "29.0.0"; hash = "sha256-nELjcMLQgfUxzOSWX8Z62pqGcfZvuf+0QLFnLEsfsXQ="; })
(fetchNuGet { pname = "CycloneDX.Core"; version = "7.0.0"; hash = "sha256-OzsHjO5V3rN2N2Zo35W2iboVR2iEOw0KKQ0cSu+1WkM="; })
(fetchNuGet { pname = "CycloneDX.Spdx"; version = "7.0.0"; hash = "sha256-RkD17CBuXSdte2kOZpUtKbp0mdM1jMQo9/uoYQAFCkM="; })
(fetchNuGet { pname = "CycloneDX.Spdx.Interop"; version = "7.0.0"; hash = "sha256-cPeSfJPRdLZWBhkyvVvgPLp4ueQw0AJUvQsP8s40Q4U="; })
(fetchNuGet { pname = "CycloneDX.Utils"; version = "7.0.0"; hash = "sha256-iwQPhNI4H1WxvWtZGuQnpX74aLPFE1XvCIkxtNvB4e4="; })
(fetchNuGet { pname = "CycloneDX.Core"; version = "8.0.3"; hash = "sha256-d9GiOXYxQ1Sv35rN5jywhgTS+HKHSydHVcJNbKs7Htg="; })
(fetchNuGet { pname = "CycloneDX.Spdx"; version = "8.0.3"; hash = "sha256-86E8rIXeE6gu+W3yK33abZ5w5zwuDR0Qv5texxJnsv0="; })
(fetchNuGet { pname = "CycloneDX.Spdx.Interop"; version = "8.0.3"; hash = "sha256-WpM0VZAjhN2f/IckRIzIeMIkpir9ZNAW+0ZGxL2cBNY="; })
(fetchNuGet { pname = "CycloneDX.Utils"; version = "8.0.3"; hash = "sha256-CW6e3uPmCP1U98fcQsiDvn3fLkQOGcchPiUNq4aXDbQ="; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.2.0"; hash = "sha256-NtTiowrMQgoTiQQheioseb/eGGLH+qR/NXDFAsWrO08="; })
(fetchNuGet { pname = "Json.More.Net"; version = "1.9.0"; hash = "sha256-ySIEHWZJLk6LeWYdAA9Ci3coKXkRgpu4N79MD4pRXdk="; })
(fetchNuGet { pname = "JsonPointer.Net"; version = "3.0.3"; hash = "sha256-fWR1aCDWyc6flBLFaGSJmXg9vg2qMlAIN5wnj2RYqLY="; })
@@ -29,8 +29,8 @@
(fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; hash = "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; hash = "sha256-C1tvk/KSswIr2hxWK7kR8VKfx90TSeOZkhw/aLshj9U="; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; hash = "sha256-vJwiCTQkLzwcXsl8YkDl6oY/SQsL0bmCCM6q9jwaOfM="; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.45"; hash = "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA="; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.45"; hash = "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ="; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
@@ -164,8 +164,8 @@
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; })
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; hash = "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; })
(fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; hash = "sha256-YLpB48NRiQ8oCuUx0AHJzqUHYgUwXW/60shFkkN/5tM="; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
+9 -4
View File
@@ -6,16 +6,16 @@
buildDotnetModule rec {
pname = "cyclonedx-cli";
version = "0.25.1";
version = "0.27.2";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-cli";
rev = "refs/tags/v${version}";
hash = "sha256-9G9g4bfH6EGSTZQlaiLsRjnryl+mQ3uNXdBUBVcKwlg=";
hash = "sha256-QU/MaT8iIf/9VpOb2mixOfOtG/J+sE7S0mT6BKYQnlI=";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
nugetDeps = ./deps.nix;
preFixup = ''
@@ -23,11 +23,16 @@ buildDotnetModule rec {
find . ! -name 'cyclonedx' -type f -exec rm -f {} +
'';
postPatch = ''
substituteInPlace src/cyclonedx/cyclonedx.csproj tests/cyclonedx.tests/cyclonedx.tests.csproj \
--replace-fail 'net6.0' 'net8.0'
'';
meta = with lib; {
description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions";
homepage = "https://github.com/CycloneDX/cyclonedx-cli";
changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}";
maintainers = with maintainers; [ thillux ];
maintainers = (with maintainers; [ thillux ]) ++ teams.cyberus.members;
license = licenses.asl20;
platforms = with platforms; (linux ++ darwin);
mainProgram = "cyclonedx";