From 727778bf681a13dceb4ec7ad5810e6794f443963 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:43:40 +0200 Subject: [PATCH] tomb: remove top-level override --- pkgs/by-name/to/tomb/package.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix index 1ebfad7df23d..d495097d34a4 100644 --- a/pkgs/by-name/to/tomb/package.nix +++ b/pkgs/by-name/to/tomb/package.nix @@ -15,7 +15,7 @@ lsof, makeBinaryWrapper, nix-update-script, - pinentry, + pinentry-curses, stdenvNoCC, util-linuxMinimal, versionCheckHook, @@ -36,7 +36,7 @@ let gnupg libargon2 lsof - pinentry + pinentry-curses util-linuxMinimal ]; @@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper ]; buildInputs = [ - pinentry + pinentry-curses zsh ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23bb93c1d767..85a509f1e381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13476,10 +13476,6 @@ with pkgs; discord-development ; - tomb = callPackage ../by-name/to/tomb/package.nix { - pinentry = pinentry-curses; - }; - tora = libsForQt5.callPackage ../development/tools/tora { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };