diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-15 09:29:01 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-07-15 09:29:01 +0200 |
| commit | 821dba740e7240d9df3a56072700cdc6b0f2471f (patch) | |
| tree | c1b8cbed4a0824a60b8aa638a74d4fc0f2405cc7 /pkgs/top-level/aliases.nix | |
| parent | ac94f1ab7edf19d9de695042f1a804871d81725a (diff) | |
| parent | 5788f7173e9dadaa8b2053fd6bb9406a7a5912e4 (diff) | |
| download | nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.tar nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.tar.gz nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.tar.bz2 nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.tar.lz nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.tar.xz nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.tar.zst nixpkgs-821dba740e7240d9df3a56072700cdc6b0f2471f.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 690c785a346..4611b3ac82c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -77,7 +77,6 @@ mapAliases ({ clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 - conkerorWrapper = conkeror; # added 2015-01 compton = picom; # added 2019-12-02 compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 @@ -128,17 +127,6 @@ mapAliases ({ firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 - firefox-esr-52 = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff - firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff - firefox-esr-60 = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff - firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff - icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff - icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff - conkeror-unwrapped = conkeror; # 2020-02, remove after 20.03 branchoff - conkeror = throw '' - Conkeror doesn't work with any secure firefox release. - Please move to some of the alternatives at http://conkeror.org/Alternatives - ''; # 2020-02, remove after 20.03 branchoff firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 |