diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-05 06:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-05 06:01:36 +0000 |
| commit | d267d265780f1a013585553238970b9483dcbb50 (patch) | |
| tree | e15cff477e306f85367c7007ee968f5af8c0833c /pkgs/top-level | |
| parent | fe8eef1ae448bf3631c9e5be919c8456da35a006 (diff) | |
| parent | bc85ef815830014d9deabb0803d46a78c832f944 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 878b25bef4208..6637b49e65e38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5117,6 +5117,8 @@ with pkgs; orjail = callPackage ../tools/security/orjail { }; + online-judge-template-generator = python3Packages.callPackage ../tools/misc/online-judge-template-generator { }; + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; onnxruntime = callPackage ../development/libraries/onnxruntime { @@ -12057,6 +12059,8 @@ with pkgs; tayga = callPackage ../tools/networking/tayga { }; + tcb = callPackage ../tools/security/tcb { }; + tcpcrypt = callPackage ../tools/security/tcpcrypt { }; tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; @@ -14692,6 +14696,8 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + jna = callPackage ../development/java-modules/jna { }; + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; juniper = callPackage ../development/compilers/juniper { }; @@ -17624,6 +17630,8 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; + nap = callPackage ../development/tools/nap { }; + nil = callPackage ../development/tools/nil { }; ninja = callPackage ../development/tools/build-managers/ninja { }; |