diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f96c5a26920..d57b776210330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4155,6 +4155,8 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Security; }; + timeline = callPackage ../applications/office/timeline/default.nix { }; + tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -7126,7 +7128,12 @@ in nzbget = callPackage ../tools/networking/nzbget { }; - nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + nzbhydra2 = callPackage ../servers/nzbhydra2 { + # You need Java (at least 8, at most 15) + # https://github.com/theotherp/nzbhydra2/issues/697 + # https://github.com/theotherp/nzbhydra2/#how-to-run + jre = openjdk11; + }; oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; @@ -7444,6 +7451,8 @@ in pitivi = callPackage ../applications/video/pitivi { }; + prism = callPackage ../applications/video/prism { }; + pulumi-bin = callPackage ../tools/admin/pulumi { }; p0f = callPackage ../tools/security/p0f { }; @@ -12756,7 +12765,7 @@ in credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_7) llvm clang-unwrapped; + inherit (llvmPackages_7) llvm libclang; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -12768,7 +12777,7 @@ in css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; cvise = python3Packages.callPackage ../development/tools/misc/cvise { - inherit (llvmPackages_11) llvm clang-unwrapped; + inherit (llvmPackages_11) llvm libclang; }; libcxx = llvmPackages.libcxx; @@ -13288,6 +13297,8 @@ in ninja = callPackage ../development/tools/build-managers/ninja { }; + nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; + gn = callPackage ../development/tools/build-managers/gn { }; nixbang = callPackage ../development/tools/misc/nixbang { @@ -22411,6 +22422,8 @@ in caerbannog = callPackage ../applications/misc/caerbannog { }; + cardboard = callPackage ../applications/window-managers/cardboard { }; + cage = callPackage ../applications/window-managers/cage { }; calf = callPackage ../applications/audio/calf { @@ -24748,7 +24761,6 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; - botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { |