diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-21 18:23:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 18:23:29 +0000 |
| commit | 85b7955180c6025f564ea05f02bd48dafc8b4c4c (patch) | |
| tree | b95e9169ac8d42e3f87a8ad3e49463bea6dcdd8e /pkgs/top-level/all-packages.nix | |
| parent | d442b912aee86aee0ba8e91aa784956e6f0ece82 (diff) | |
| parent | b333263534e23f6e5a394193c5cb2c5f793f6525 (diff) | |
| download | nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.tar nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.tar.gz nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.tar.bz2 nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.tar.lz nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.tar.xz nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.tar.zst nixpkgs-85b7955180c6025f564ea05f02bd48dafc8b4c4c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e4bb224e23..6b89e68817f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1347,6 +1347,8 @@ in wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + waypoint = callPackage ../applications/networking/cluster/waypoint { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -6844,7 +6846,7 @@ in qshowdiff = callPackage ../tools/text/qshowdiff { }; - qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; + qrcp = callPackage ../tools/networking/qrcp { }; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; |