From fda42f1beeda22cfe110562f5da943420eb06a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 May 2024 20:47:16 +0200 Subject: [PATCH 1/2] editline: enable sigstop SIGSTOP is send when a user presses CTRL-Z. It will send the application to the background. Without this option, ctrl-z will be ignored. With this option, it's possible to suspend editline-based applications such as Nix. --- pkgs/development/libraries/editline/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 4f891a24f1f0..e3c9ba32f392 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = [ (lib.enableFeature true "sigstop") ]; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ]; From 59135e4435c961f37784ac703dcc01e108828820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 May 2024 08:07:00 +0200 Subject: [PATCH 2/2] jush: drop shell It hasn't received significant updates after its initial development 5 years ago. It seems more like a proof of concept of editline. I was trivially able to crash the shell multiple times by providing invalid syntax. Given the feature set I doubt that it has many users. --- pkgs/shells/jush/default.nix | 29 ----------------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/shells/jush/default.nix diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix deleted file mode 100644 index 42e8e13cceae..000000000000 --- a/pkgs/shells/jush/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, editline }: - -stdenv.mkDerivation rec { - pname = "jush"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "troglobit"; - repo = pname; - rev = "v${version}"; - sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8"; - }; - - strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ editline ]; - - passthru.shellPath = "/bin/jush"; - - meta = with lib; { - description = "just a useless shell"; - mainProgram = "jush"; - homepage = "https://github.com/troglobit/jush"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ffbaf10eb743..7a29eefc5f7e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -583,6 +583,8 @@ mapAliases ({ julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 + jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28 + ### K ### k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac124ee6dc06..3caa2326f8a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15039,8 +15039,6 @@ with pkgs; ion = callPackage ../shells/ion { }; - jush = callPackage ../shells/jush { }; - ksh = callPackage ../shells/ksh { }; liquidprompt = callPackage ../shells/liquidprompt { };