From 9ae4281a5d30a34992844574abb707e949f0d9f9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 16 Jun 2021 00:17:32 +0200 Subject: pkgs/profpatsch: Replace s6PortableUtils alias Similar to 4701a995cb865c5d7178f574a3eae5872595e768, where I replaced the libtidy alias for html-tidy because it broke evaluation of the PSI test, I found another test for nman which uses an alias. The background is that aliases are now[1] no longer allowed in NixOS VM tests and since "s6PortableUtils" is indirectly referenced, we get an evaluation error on Hydra. Using the unaliased name fixes evaluation and should not change anything in functionality. [1]: https://github.com/NixOS/nixpkgs/commit/3edde6562e19698da69a499881e0a2e4f5a497a2 Signed-off-by: aszlig Cc: @Profpatsch --- pkgs/profpatsch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/profpatsch') diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix index bc962e68..499979a5 100644 --- a/pkgs/profpatsch/default.nix +++ b/pkgs/profpatsch/default.nix @@ -48,7 +48,7 @@ let inherit lib; inherit (runExeclineFns) runExecline; inherit (pkgs) runCommandLocal; - bin = getBins pkgs.s6PortableUtils [ "s6-touch" "s6-echo" ]; + bin = getBins pkgs.s6-portable-utils [ "s6-touch" "s6-echo" ]; }; # TODO: upstream @@ -90,7 +90,7 @@ let { use = "if"; as = "execlineIf"; } "redirfd" "importas" ]) - // (getBins pkgs.s6PortableUtils + // (getBins pkgs.s6-portable-utils [ "s6-cat" "s6-grep" "s6-touch" "s6-test" "s6-chmod" ]); }; in { -- cgit 1.4.1