diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-06 18:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 18:01:10 +0000 |
| commit | 68a45fb1f2d9986a1551a5f88b0235758e0a95de (patch) | |
| tree | 9a9710d3d6b7a605f40a5d341347ed4b04ec83c5 /pkgs/top-level | |
| parent | c8add09e8fa6f3d0ee230adbb7bc7abf9cf1f59a (diff) | |
| parent | b25d5d1748320ae4e8305f5bebc494f4ce76f988 (diff) | |
| download | nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.tar nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.tar.gz nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.tar.bz2 nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.tar.lz nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.tar.xz nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.tar.zst nixlib-68a45fb1f2d9986a1551a5f88b0235758e0a95de.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f471a3dd3ea8..fd5f536c7355 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4424,6 +4424,8 @@ with pkgs; brotli = callPackage ../tools/compression/brotli { }; + biodiff = callPackage ../development/tools/biodiff { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; @@ -25797,6 +25799,7 @@ with pkgs; }; wireshark-qt = wireshark; + tshark = wireshark-cli; wireshark-cli = wireshark.override { withQt = false; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; |