diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-27 12:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 12:01:20 +0000 |
| commit | 2692c2e4277b0b1b3b01299462f238efccba91e2 (patch) | |
| tree | 9c186fa1b83585cd1f7f82351b8c8d061bfd6395 /pkgs/top-level/all-packages.nix | |
| parent | 4fc4793298c10b1d648a0f269bc44394d5171c9e (diff) | |
| parent | 2431a34ffe50eeb382ea4d7f8d3984e9029d6e04 (diff) | |
| download | nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.gz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.bz2 nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.lz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.xz nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.tar.zst nixpkgs-2692c2e4277b0b1b3b01299462f238efccba91e2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acd2f9e6727..e3e48ac50c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2931,6 +2931,8 @@ in inklecate = callPackage ../development/compilers/inklecate {}; + interactsh = callPackage ../tools/misc/interactsh { }; + interlock = callPackage ../servers/interlock {}; iotools = callPackage ../tools/misc/iotools { }; @@ -3906,6 +3908,8 @@ in qtbase = qt5.qtbase; }; + coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; + c14 = callPackage ../applications/networking/c14 { }; corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; @@ -9359,7 +9363,7 @@ in tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; @@ -13459,7 +13463,9 @@ in sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; }; - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { + python3 = python38; + }; # special forks used for dsview libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; |