about summary refs log tree commit diff
path: root/pkgs/top-level/aliases.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-01-23 12:01:17 +0000
committerGitHub <noreply@github.com>2024-01-23 12:01:17 +0000
commit568f38122138d407fd65867055a6f4ec4dfd52cd (patch)
treed190dc9ec048265e28814725eda8ab80c1ea37ac /pkgs/top-level/aliases.nix
parentb7a76c8b5e99302632017bd4066c689503567d86 (diff)
parent05f11d5cf849d11eca3863409f3608f8068bb72d (diff)
downloadnixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar
nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.gz
nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.bz2
nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.lz
nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.xz
nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.zst
nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r--pkgs/top-level/aliases.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bff2291f8bac..ae93c37acbff 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -172,6 +172,7 @@ mapAliases ({
   compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10
   concurrencykit = libck; # Added 2021-03
   connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08
+  convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
   cvs_fast_export = cvs-fast-export; # Added 2021-06-10
 
@@ -211,6 +212,9 @@ mapAliases ({
   devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13
   dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
   dnnl = oneDNN; # Added 2020-04-22
+  docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27
+  docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
+  docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
   dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
   dolphinEmu = dolphin-emu; # Added 2021-11-10
   dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10