From e1a23eea2ada0132be3eb9f5c8e2e6405b33625b Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 19 Oct 2024 15:34:24 +0200 Subject: [PATCH] aliases: keep the `utillinux` alias until `node2nix` is phased out The code generated by `node2nix` checks that `pkgs.utillinux` exist and uses it over `pkgs.util-linux`. Replacing the alias by a `throw`, as was done in commit a9e1f4e0abe8f8b5f6b6169323d990a0954280e4, makes packages generated using `node2nix` fail. This removes the alias removal until `node2nix` has been phased out, which is a work in progress started in https://github.com/NixOS/nixpkgs/issues/229475. --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fad47d137f0fe..65ae1a490ecf4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1672,7 +1672,7 @@ mapAliases { usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 - utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2024-10-17 + utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475 ### V ###