diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-03 00:36:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 00:36:28 +0000 |
| commit | 58274c4f8d1deda9891c370273735987584c1615 (patch) | |
| tree | 12da3a2773afb1e878cdda421139d82317c66394 /pkgs/top-level | |
| parent | d3f56086246776bbf812b09c0e58b080244bd4f4 (diff) | |
| parent | 535c1daca6705026c6858a5aca1229064ed537d0 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1be2f4623cc..497aa7cb0245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2496,6 +2496,8 @@ in patool = with python3Packages; toPythonApplication patool; + pbgopy = callPackage ../tools/text/pbgopy { }; + pbpst = callPackage ../applications/misc/pbpst { }; pbzx = callPackage ../tools/compression/pbzx { }; @@ -4752,7 +4754,9 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; - idevicerestore = callPackage ../tools/misc/idevicerestore { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { + inherit (darwin) IOKit; + }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; |