diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-08-11 16:22:42 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-08-11 16:22:42 +0200 |
| commit | 4e7e464ae8e897d487fc412b50560f9f5f744353 (patch) | |
| tree | 606f3898906c89a001671f51e6c0315d73e79277 /pkgs/top-level/aliases.nix | |
| parent | 610ef47b2030813fcc9017eeda5bfd7621851bc3 (diff) | |
| parent | 59287a7ba19cafec0301f77acf16ee28b4f5fd84 (diff) | |
| download | nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.gz nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.bz2 nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.lz nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.xz nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.zst nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.zip | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/tools/system/sg3_utils/default.nix
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae0194850666..54d112a31d95 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -182,6 +182,7 @@ mapAliases ({ debian_devscripts = debian-devscripts; # added 2016-03-23 deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 + deltachat-electron = deltachat-desktop; # added 2021-07-18 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 @@ -338,6 +339,7 @@ mapAliases ({ htmlTidy = html-tidy; # added 2014-12-06 hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 iana_etc = iana-etc; # added 2017-03-08 + iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 @@ -874,6 +876,7 @@ mapAliases ({ truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 |