diff options
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 2 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index ee9920dccc38e..5b9e561fd48ff 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -682,6 +682,12 @@ </listitem> <listitem> <para> + The top-level <literal>termonad-with-packages</literal> alias + for <literal>termonad</literal> has been removed. + </para> + </listitem> + <listitem> + <para> (Neo)Vim can not be configured with <literal>configure.pathogen</literal> anymore to reduce maintainance burden. Use <literal>configure.packages</literal> diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index e8571bee3a6af..6bdd19d8e414d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -220,6 +220,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone. +- The top-level `termonad-with-packages` alias for `termonad` has been removed. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. - Neovim can not be configured with plug anymore (still works for vim). diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 183d93114cfd9..b90704a161842 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1142,6 +1142,7 @@ mapAliases ({ telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 + termonad-with-packages = throw "termonad-with-packages has been renamed to just 'termonad'"; # Added 2022-10-15 terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02 terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fb151d41755b..0c725a0d36e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1919,9 +1919,7 @@ with pkgs; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { }; - - termonad = termonad-with-packages; + termonad = callPackage ../applications/terminal-emulators/termonad { }; tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ef66710b75105..61e577bb31aa1 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -248,7 +248,7 @@ let taffybar tamarin-prover taskell - termonad-with-packages + termonad tldr-hs tweet-hs update-nix-fetchgit |