From dff3ce95922d63c47e21f0095f4d3e49f5cedc62 Mon Sep 17 00:00:00 2001 From: Sven Tennie Date: Fri, 20 Mar 2026 14:17:10 +0100 Subject: [PATCH 1/2] Remove sbomqs from Nix dev env It probably hasn't been used for two years. Removing this to keep our Nix env small. --- nix/overlay.nix | 2 -- nix/pkgs/sbomqs/default.nix | 21 --------------------- nix/wire-server.nix | 1 - 3 files changed, 24 deletions(-) delete mode 100644 nix/pkgs/sbomqs/default.nix diff --git a/nix/overlay.nix b/nix/overlay.nix index 460e9c0e425..3d458be2076 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -32,8 +32,6 @@ self: super: { rabbitmqadmin = super.callPackage ./pkgs/rabbitmqadmin { }; - sbomqs = super.callPackage ./pkgs/sbomqs { }; - # Disable hlint in HLS to get around this bug: # https://github.com/haskell/haskell-language-server/issues/4674 haskell = super.haskell // { diff --git a/nix/pkgs/sbomqs/default.nix b/nix/pkgs/sbomqs/default.nix deleted file mode 100644 index d0e41ad5785..00000000000 --- a/nix/pkgs/sbomqs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib, ... }: -buildGoModule rec { - pname = "sbomqs"; - version = "0.0.30"; - - src = fetchFromGitHub { - owner = "interlynk-io"; - repo = "sbomqs"; - rev = "v${version}"; - hash = "sha256-+y7+xi+E8kjGUjhIRKNk6ogcQMP+Dp39LrL66B1XdrQ="; - }; - - vendorHash = "sha256-V6k7nF2ovyl4ELE8Cqe/xjpmPAKI0t5BNlssf41kd0Y="; - - meta = with lib; { - description = "SBOM quality score - Quality metrics for your sboms"; - homepage = "https://github.com/interlynk-io/sbomqs"; - license = licenses.asl20; - mainProgram = "sbomqs"; - }; -} diff --git a/nix/wire-server.nix b/nix/wire-server.nix index 17e8c58d371..e0a29567a3f 100644 --- a/nix/wire-server.nix +++ b/nix/wire-server.nix @@ -515,7 +515,6 @@ let pkgs.yq pkgs.nginz pkgs.rabbitmqadmin - pkgs.sbomqs pkgs.postgresql pkgs_24_11.cabal-install From f3d5d99caa3ab5996f9ae9f56a60e4e9c312c8ec Mon Sep 17 00:00:00 2001 From: Sven Tennie Date: Fri, 20 Mar 2026 14:23:23 +0100 Subject: [PATCH 2/2] Add changelog --- changelog.d/5-internal/drop-sbomqs | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5-internal/drop-sbomqs diff --git a/changelog.d/5-internal/drop-sbomqs b/changelog.d/5-internal/drop-sbomqs new file mode 100644 index 00000000000..dff2077179b --- /dev/null +++ b/changelog.d/5-internal/drop-sbomqs @@ -0,0 +1 @@ +`sbomqs` has been unused for years now. Thus, dropping it from our Nix env.