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>2021-07-29 00:01:33 +0000
committerGitHub <noreply@github.com>2021-07-29 00:01:33 +0000
commit4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (patch)
tree009d65e0b0351612af7de7970317a9890fdc1657 /pkgs/top-level/aliases.nix
parent6fcda9f1ec27db14412a2103281b4b14f806066a (diff)
parentdb809100db91e97c118a70c3879307afdbf1dbb7 (diff)
downloadnixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar
nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.gz
nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.bz2
nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.lz
nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.xz
nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.zst
nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r--pkgs/top-level/aliases.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fb31c609a63..85a63f37802 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -527,6 +527,7 @@ mapAliases ({
   nix-review = nixpkgs-review; # added 2019-12-22
   nixFlakes = nixUnstable; # added 2021-05-21
   nmap_graphical = nmap-graphical;  # added 2017-01-19
+  nmap-unfree = nmap; # added 2021-04-06
   nologin = shadow; # added 2018-04-25
   nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
   nxproxy = nx-libs; # added 2019-02-15