diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-07 12:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 12:01:33 +0000 |
| commit | 8e0133027705207b242fa673ab6a811a5868cbd3 (patch) | |
| tree | b6498c72f828232b27775c95cacad1fc4812c092 /pkgs/top-level | |
| parent | 196bab22be61a4e4987d1f0459757141e6459f8a (diff) | |
| parent | 65b2a742675f684bfdcc1368884f8116ff6b2c99 (diff) | |
| download | nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.tar nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.tar.gz nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.tar.bz2 nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.tar.lz nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.tar.xz nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.tar.zst nixlib-8e0133027705207b242fa673ab6a811a5868cbd3.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -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 587ef34b8fca..16980077dc7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8278,6 +8278,8 @@ with pkgs; pa_applet = callPackage ../tools/audio/pa-applet { }; + pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { }; + pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { }; @@ -27934,7 +27936,7 @@ with pkgs; navipowm = callPackage ../applications/misc/navipowm { }; netbeans = callPackage ../applications/editors/netbeans { - jdk = jdk11; + jdk = jdk17; }; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; |