diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-11 18:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 18:01:20 +0000 |
| commit | 7573d7fe79dff36b24606e695a935ce7f1337b4a (patch) | |
| tree | a1fa10a7ab747d7502dd35f94edfd3647f04bb49 /pkgs/top-level | |
| parent | e01403d0eb67e90daf452bbf4571957336046355 (diff) | |
| parent | f9335711ad5f6a980d4cebca25630210e41b1800 (diff) | |
| download | nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.gz nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.bz2 nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.lz nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.xz nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.zst nixlib-7573d7fe79dff36b24606e695a935ce7f1337b4a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f85b4c130f13..e00c54077bc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6778,9 +6778,7 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { buildGoModule = buildGo116Module; }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - buildGoModule = buildGo116Module; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { buildGoModule = buildGo116Module; @@ -14095,7 +14093,7 @@ with pkgs; regina = callPackage ../development/interpreters/regina { }; - inherit (ocaml-ng.ocamlPackages_4_12) reason; + inherit (ocamlPackages) reason; pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; @@ -26133,6 +26131,8 @@ with pkgs; got = callPackage ../applications/version-management/got { }; + gtkterm = callPackage ../tools/misc/gtkterm { }; + gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d5ecb43497d..9f13c501b7db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4070,6 +4070,8 @@ in { invoke = callPackage ../development/python-modules/invoke { }; + iodata = callPackage ../development/python-modules/iodata { }; + iocapture = callPackage ../development/python-modules/iocapture { }; iotawattpy = callPackage ../development/python-modules/iotawattpy { }; |