From afdf5811b43eeca35059a8f312107471f384e8c9 Mon Sep 17 00:00:00 2001 From: April John Date: Thu, 17 Apr 2025 15:33:11 +0200 Subject: [PATCH] zsh-history: drop Dropped upstream and has no maintainer. No upstream commits since 6 years. aliases: add change date Co-authored-by: Acid Bong --- nixos/tests/all-tests.nix | 1 - nixos/tests/zsh-history.nix | 38 ---------------------- pkgs/by-name/zs/zsh-history/package.nix | 43 ------------------------- pkgs/by-name/zs/zsh/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 5 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 nixos/tests/zsh-history.nix delete mode 100644 pkgs/by-name/zs/zsh-history/package.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8e83095a7ded..e30e30aacb88 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1494,7 +1494,6 @@ in zookeeper = runTest ./zookeeper.nix; zram-generator = runTest ./zram-generator.nix; zrepl = runTest ./zrepl.nix; - zsh-history = runTest ./zsh-history.nix; zwave-js = runTest ./zwave-js.nix; zwave-js-ui = runTest ./zwave-js-ui.nix; } diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix deleted file mode 100644 index fe3dd44a25e2..000000000000 --- a/nixos/tests/zsh-history.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, ... }: -{ - name = "zsh-history"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; - }; - - nodes.default = - { ... }: - { - programs = { - zsh.enable = true; - }; - environment.systemPackages = [ pkgs.zsh-history ]; - programs.zsh.interactiveShellInit = '' - source ${pkgs.zsh-history.out}/share/zsh/init.zsh - ''; - users.users.root.shell = "${pkgs.zsh}/bin/zsh"; - }; - - testScript = '' - start_all() - default.wait_for_unit("multi-user.target") - default.wait_until_succeeds("pgrep -f 'agetty.*tty1'") - - # Login - default.wait_until_tty_matches("1", "login: ") - default.send_chars("root\n") - default.wait_until_tty_matches("1", r"\nroot@default\b") - - # Generate some history - default.send_chars("echo foobar\n") - default.wait_until_tty_matches("1", "foobar") - - # Ensure that command was recorded in history - default.succeed("/run/current-system/sw/bin/history list | grep -q foobar") - ''; -} diff --git a/pkgs/by-name/zs/zsh-history/package.nix b/pkgs/by-name/zs/zsh-history/package.nix deleted file mode 100644 index e9b7f80eb0d6..000000000000 --- a/pkgs/by-name/zs/zsh-history/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - installShellFiles, - nixosTests, -}: - -buildGoModule { - pname = "zsh-history"; - version = "2019-12-10"; - - src = fetchFromGitHub { - owner = "b4b4r07"; - repo = "history"; - rev = "8da016bd91b0c2eb53c9980f00eee6abdbb097e2"; - sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3"; - }; - - vendorHash = "sha256-n5QFN1B2GjbzylFuW9Y4r0+ioIJlfKwcGK8X3ZwKLI8="; - - nativeBuildInputs = [ installShellFiles ]; - - doCheck = false; - - postInstall = '' - install -d $out/share - cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share" - installShellCompletion --zsh --name _history $out/share/zsh/completions/_history - ''; - - passthru.tests = { - zsh-history-shell-integration = nixosTests.zsh-history; - }; - - meta = with lib; { - description = "CLI to provide enhanced history for your ZSH shell"; - homepage = "https://github.com/b4b4r07/history"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "history"; - }; -} diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix index e84ddddd9fcf..bfdeff8325b1 100644 --- a/pkgs/by-name/zs/zsh/package.nix +++ b/pkgs/by-name/zs/zsh/package.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation { passthru = { shellPath = "/bin/zsh"; tests = { - inherit (nixosTests) zsh-history oh-my-zsh; + inherit (nixosTests) oh-my-zsh; }; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5cd67e0b58e4..2a9224580939 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1918,6 +1918,7 @@ mapAliases { zinc = zincsearch; # Added 2023-05-28 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 zkg = throw "'zkg' has been replaced by 'zeek'"; + zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17 zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq";