From eacc33e4cfb849cdd973ba4d6228fb7fff0f1dcc Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 27 Apr 2026 20:18:37 +0100 Subject: [PATCH 1/3] badrobot: fix changelog --- pkgs/by-name/ba/badrobot/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix index 66ef63c07eb9..628c41978e11 100644 --- a/pkgs/by-name/ba/badrobot/package.nix +++ b/pkgs/by-name/ba/badrobot/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "controlplaneio"; repo = "badrobot"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-U3b5Xw+GjnAEXteivztHdcAcXx7DYtgaUbW5oax0mIk="; }; vendorHash = "sha256-oYdkCEdrw1eE5tnKveeJM3upRy8hOVc24JNN1bLX+ec="; @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/controlplaneio/badrobot"; - changelog = "https://github.com/controlplaneio/badrobot/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/controlplaneio/badrobot/releases/tag/v${finalAttrs.src.tag}"; description = "Operator Security Audit Tool"; mainProgram = "badrobot"; longDescription = '' @@ -47,6 +47,8 @@ buildGoModule (finalAttrs: { cluster permissions. ''; license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ jk ]; + maintainers = with lib.maintainers; [ + jk + ]; }; }) From 8aa784b17646066c7d147082f2363f0648881bbd Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 28 Apr 2026 13:58:07 +0100 Subject: [PATCH 2/3] ryubing: fix changelog --- pkgs/by-name/ry/ryubing/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index 1596cf56a0aa..5684f57ac98d 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -135,7 +135,8 @@ buildDotnetModule rec { meta = { homepage = "https://ryujinx.app"; - changelog = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/changelog"; + # historical changelog https://git.ryujinx.app/projects/Ryubing/wiki/Changelog + changelog = "https://git.ryujinx.app/projects/Ryubing/releases/tag/${src.tag}"; description = "Experimental Nintendo Switch Emulator written in C# (community fork of Ryujinx)"; longDescription = '' Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, From d00e5c41bfa77e877b70a0954f26ad22080ef673 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 28 Apr 2026 13:56:41 +0100 Subject: [PATCH 3/3] shisho: drop --- doc/release-notes/rl-2605.section.md | 2 + pkgs/by-name/sh/shisho/package.nix | 63 ---------------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 pkgs/by-name/sh/shisho/package.nix diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 9ce8921e827d..55eb84685c12 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -262,6 +262,8 @@ - `opensmtpd-filter-dkimsign` is now installed into `libexec/smtpd` instead of `libexec/opensmtpd` so that now it is properly linked into the environment built by `services.opensmtpd.procPackages`. If you hardcoded path to `filter-dkimsign` please consider using this option. +- `shisho` has been removed because it's archived. `semgrep`, `opengrep`, and `ast-grep` provide similar functionality. + - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported. - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11. diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix deleted file mode 100644 index 80a54a90f3d1..000000000000 --- a/pkgs/by-name/sh/shisho/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - installShellFiles, - rustfmt, - stdenv, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "shisho"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "flatt-security"; - repo = "shisho"; - tag = "v${finalAttrs.version}"; - hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-gv3qvDzqwuuAVpbaOpMI7DuapSALMr/qzyhor3avYQI="; - - nativeBuildInputs = [ - installShellFiles - # required to build serde-sarif dependency - rustfmt - ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd shisho \ - --bash <($out/bin/shisho completion bash) \ - --fish <($out/bin/shisho completion fish) \ - --zsh <($out/bin/shisho completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/shisho --help - $out/bin/shisho --version | grep "${finalAttrs.version}" - - runHook postInstallCheck - ''; - - meta = { - homepage = "https://docs.shisho.dev/shisho/"; - changelog = "https://docs.shisho.dev/changelog/"; - description = "Lightweight static analyzer for several programming languages"; - mainProgram = "shisho"; - longDescription = '' - Shisho is a lightweight static code analyzer designed for developers and - is the core engine for Shisho products. It is, so to speak, like a - pluggable and configurable linter; it gives developers a way to codify - your domain knowledge over your code as rules. With powerful automation - and integration capabilities, the rules will help you find and fix issues - semiautomatically. - ''; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ jk ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 11c1707ba984..c05e977419a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1855,6 +1855,7 @@ mapAliases { shades-of-gray-theme = throw "'shades-of-gray-theme' has been removed because upstream is a 404"; # Added 2025-12-20 shared_desktop_ontologies = throw "'shared_desktop_ontologies' has been removed as it had been abandoned upstream"; # Added 2025-11-09 shipyard = throw "'shipyard' has been renamed to/replaced by 'jumppad'"; # Converted to throw 2025-10-27 + shisho = throw "'shisho' has been removed, as it is archived upstream. Consider using 'semgrep', 'opengrep', or 'ast-grep' instead"; # Added 2026-04-28 sic-image-cli = warnAlias "'sic-image-cli' has been renamed to 'imagineer'" imagineer; # Added 2026-03-29 siduck76-st = throw "'siduck76-st' has been renamed to/replaced by 'st-snazzy'"; # Converted to throw 2025-10-27 sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20