diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/editors/jetbrains/patches/disable-sbom-generation.patch | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/jetbrains/patches/disable-sbom-generation.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/editors/jetbrains/patches/disable-sbom-generation.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/patches/disable-sbom-generation.patch b/nixpkgs/pkgs/applications/editors/jetbrains/patches/disable-sbom-generation.patch new file mode 100644 index 000000000000..ad7942cd9c1c --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jetbrains/patches/disable-sbom-generation.patch @@ -0,0 +1,11 @@ +--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/sbom/SoftwareBillOfMaterialsImpl.kt ++++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/sbom/SoftwareBillOfMaterialsImpl.kt +@@ -162,6 +162,8 @@ + } + + override suspend fun generate() { ++ Span.current().addEvent("SBOM generation are unavaliable due to requiring internet, skipping") ++ return + val skipReason = when { + !context.shouldBuildDistributions() -> "No distribution was built" + documentNamespace == null -> "Document namespace isn't specified" |