summary refs log tree commit diff
path: root/pkgs/top-level/aliases.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-12-29 21:29:34 +0000
committerAlyssa Ross <hi@alyssa.is>2019-12-29 21:29:34 +0000
commit1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (patch)
tree25f168400b9192ca94a7bdb0bb19ce11f03db509 /pkgs/top-level/aliases.nix
parent82bd3b0cbfb0af1555ed5b6b6f4edf2b6b17a144 (diff)
parentbe90b35b9efbd7baaa80f367ffc41609531a8fe2 (diff)
downloadnixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.gz
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.bz2
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.lz
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.xz
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.zst
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.zip
Merge remote-tracking branch 'nixpkgs/master' into spectrum
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r--pkgs/top-level/aliases.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e13ab7be79..4911f96fad6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -61,6 +61,7 @@ mapAliases ({
   buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
   bundler_HEAD = bundler; # added 2015-11-15
   cantarell_fonts = cantarell-fonts; # added 2018-03-03
+  catfish = xfce.catfish; # added 2019-12-22
   checkbashism = checkbashisms; # added 2016-08-16
   cide = throw "deprecated in 2019-09-11: abandoned by upstream";
   cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
@@ -393,6 +394,7 @@ mapAliases ({
   smbclient = samba; # added 2018-04-25
   slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
   slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
+  net_snmp = net-snmp; # added 2019-12-21
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speech_tools = speech-tools; # added 2018-04-25
   speedtest_cli = speedtest-cli;  # added 2015-02-17