From 5cd6c650545dbfe1d040bfbd00ad7ecc2f4f4763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 22 Oct 2018 16:41:11 +0900 Subject: [PATCH] wasm: remove alias to unbreak the channel Nixpkgs' channel currently can't move forward so long as there is a trace in evaluating the top-level arguments. Which means that it isn't possible to add a warning message to warn users of future package removal. So the only way forward appears to be just removing the alias altogether. (cherry picked from commit b4133ebc17c2742a76d912f4f0bf46719bc7800e) --- nixos/doc/manual/release-notes/rl-1903.xml | 7 +++++++ pkgs/top-level/aliases.nix | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index baddbcd8c68d..839d75b53bd1 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -130,6 +130,13 @@ were removed. They were never used for anything and can therefore safely be removed. + + + Package wasm has been renamed proglodyte-wasm. The package + wasm will be pointed to ocamlPackages.wasm in 19.09, so + make sure to update your configuration if you want to keep proglodyte-wasm + + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2964d6d46de2..a0f611dd9611 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -322,13 +322,8 @@ mapAliases ({ xpraGtk3 = xpra; # added 2018-09-13 youtubeDL = youtube-dl; # added 2014-10-26 - # added 2018-10-16 - # TODO(ekleog): remove after 19.03 branch-off - # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.09 + # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - wasm = lib.warn - "‘wasm’ package has been renamed ‘proglodyte-wasm’, and will be dropped in the next release" - proglodyte-wasm; # added 2017-05-27 wineMinimal = winePackages.minimal;