diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix deleted file mode 100644 index 6755796b5d99..000000000000 --- a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Ideally, this file would have been placed in -# pkgs/by-name/ss/sshd-openpgp-auth/package.nix, but since `./generic.nix` is -# outside of the directory, the `nixpkgs-vet` test will fail the CI. So -# we call this file in all-packages.nix like in the old days. -{ callPackage }: - -callPackage ./generic.nix { - pname = "sshd-openpgp-auth"; - version = "0.3.1"; - srcHash = "sha256-YS8/q8faWSRNciR03wwiiGGgkvZqb5Euto22pde53C8="; - cargoHash = "sha256-rBkKQAq1IAc4udS65RvprQe6knxyAFKxCWKGW5k5te4="; - metaDescription = "Command-line tool for creating and managing OpenPGP based trust anchors for SSH host keys"; -} diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix deleted file mode 100644 index f94b99a4037d..000000000000 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ /dev/null @@ -1,81 +0,0 @@ -# This file is based upon upstream's package.nix shared among both -# "ssh-openpgp-auth" and "sshd-openpgpg-auth" -{ - lib, - rustPlatform, - fetchFromCodeberg, - pkg-config, - just, - rust-script, - installShellFiles, - nettle, - openssl, - sqlite, - openssh, - # Arguments not supplied by callPackage - pname, - version, - srcHash, - cargoHash, - metaDescription, -}: - -rustPlatform.buildRustPackage { - inherit pname version; - - src = fetchFromCodeberg { - owner = "wiktor"; - repo = "ssh-openpgp-auth"; - # See also: https://codeberg.org/wiktor/ssh-openpgp-auth/pulls/92#issuecomment-1635274 - rev = "${pname}/${version}"; - hash = srcHash; - }; - buildAndTestSubdir = pname; - - inherit cargoHash; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - just - rust-script - installShellFiles - ]; - # Otherwise just's build, check and install phases take precedence over - # buildRustPackage's phases. - dontUseJustBuild = true; - dontUseJustCheck = true; - dontUseJustInstall = true; - - postInstall = '' - export HOME=$(mktemp -d) - just generate manpages ${pname} $out/share/man/man1 - just generate shell_completions ${pname} shell_completions - installShellCompletion --cmd ${pname} \ - --bash shell_completions/${pname}.bash \ - --fish shell_completions/${pname}.fish \ - --zsh shell_completions/_${pname} - ''; - - buildInputs = [ - nettle - openssl - sqlite - ]; - - doCheck = true; - nativeCheckInputs = [ - openssh - ]; - - meta = { - description = metaDescription; - homepage = "https://codeberg.org/wiktor/ssh-openpgp-auth"; - license = with lib.licenses; [ - mit # or - asl20 - ]; - maintainers = with lib.maintainers; [ doronbehar ]; - mainProgram = pname; - }; -} diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix b/pkgs/by-name/ss/ssh-openpgp-auth/package.nix deleted file mode 100644 index 38c8e026ca14..000000000000 --- a/pkgs/by-name/ss/ssh-openpgp-auth/package.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage }: - -callPackage ./generic.nix { - pname = "ssh-openpgp-auth"; - version = "0.2.3"; - srcHash = "sha256-YS8/q8faWSRNciR03wwiiGGgkvZqb5Euto22pde53C8="; - cargoHash = "sha256-rBkKQAq1IAc4udS65RvprQe6knxyAFKxCWKGW5k5te4="; - metaDescription = "Command-line tool that provides client-side functionality to transparently verify the identity of remote SSH hosts"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a276b2f082eb..61d4f5512889 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2523,6 +2523,8 @@ mapAliases { squirreldisk = throw "'squirreldisk' has been removed as it depended on webkitgtk 4.0"; # Added 2026-06-07 src = throw "The \"src\" package has been renamed to \"simple-revision-control\". If you encounter this error and did not intend to use that package you may have a falsely constructed overlay."; # Added 2025-11-19 ssh-ashkpass-fullscreen = throw "'ssh-askpass-fullscreen' has been removed as it depended on the deprecated GTK2 engine."; # Added 2026-08-03 + ssh-openpgpg-auth = throw "'ssh-openpgpg-auth' has been removed as it is no longer maintained."; # Added 2026-10-23 + sshd-openpgpg-auth = throw "'sshd-openpgpg-auth' has been removed as it is no longer maintained and fails a few tests."; # Added 2026-10-23 ssl-proxy = throw "'ssl-proxy' has been removed as it was unmaintained both upstream and in nixpkgs, pinned to dangerously old version of go crypto."; # Added 2026-10-17 ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27 stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 789956f34e18..69be1af5bed4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2524,8 +2524,6 @@ with pkgs; withKerberos = true; }; - sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { }; - openvpn = callPackage ../tools/networking/openvpn { }; openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix {