diff options
| author | 0x4A6F <0x4A6F@users.noreply.github.com> | 2022-02-25 17:03:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-25 17:03:09 +0100 |
| commit | 7ad39a412588dad2c64ee2abd5de51fad7c9cccc (patch) | |
| tree | fc3b58e6d2627e7563e0336d27368ac78ea6a1bd /pkgs/top-level | |
| parent | 2b9029fc3fe344a06928353c56639f184e426666 (diff) | |
| parent | ad161944605a00dbf036dee4eea10eab8a286121 (diff) | |
Merge pull request #161193 from Mic92/bird1
bird: drop bird1 package & modules; hardening
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 954eee637b5ba..4604edf10b211 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -110,6 +110,8 @@ mapAliases ({ bridge_utils = bridge-utils; # Added 2015-02-20 bro = zeek; # Added 2019-09-29 btrfsProgs = btrfs-progs; # Added 2016-01-03 + bird2 = bird; + bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; @@ -118,6 +120,7 @@ mapAliases ({ bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-vault = vaultwarden-vault; + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12 bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef2e2a1650490..0b7996050a161 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21020,8 +21020,7 @@ with pkgs; dnsutils = bind.dnsutils; dig = bind.dnsutils; - inherit (callPackages ../servers/bird { }) - bird bird6 bird2; + bird = callPackage ../servers/bird { }; bosun = callPackage ../servers/monitoring/bosun { }; |