From dae6f96a4178bfe3d4bd8782d553ac9e487abc3c Mon Sep 17 00:00:00 2001 From: Calvin Beck Date: Sat, 19 Feb 2022 23:17:29 -0500 Subject: [PATCH] haskellPackages.git-annex: Add shellPath for the git-annex-shell. Git annex provides a login shell for restricted access: https://git-annex.branchable.com/git-annex-shell/ This was not exposed with `passthru.shellPath` before, so you could not set a user's shell to `haskellPackages.git-annex` declaratively before this change. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4cf5867c6571..b95f53758fd0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -92,6 +92,12 @@ self: super: { rm -r $out/doc/?ndroid* ''; }; + + # Git annex provides a restricted login shell. Setting + # passthru.shellPath here allows a user's login shell to be set to + # `git-annex-shell` by making `shell = haskellPackages.git-annex`. + # https://git-annex.branchable.com/git-annex-shell/ + passthru.shellPath = "/bin/git-annex-shell"; }) super.git-annex; # Fix test trying to access /home directory