diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1838908b1dd..9b932d1e770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1389,7 +1389,7 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_10_0; @@ -1402,7 +1402,7 @@ in libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { inherit (linuxPackages) nvidia_x11; - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; }; behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; @@ -3443,6 +3443,8 @@ in wrangler = callPackage ../development/tools/wrangler { }; + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; @@ -6287,7 +6289,7 @@ in pfetch = callPackage ../tools/misc/pfetch { }; - pfstools = callPackage ../tools/graphics/pfstools { }; + pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; @@ -6620,6 +6622,8 @@ in rc = callPackage ../shells/rc { }; + rcon = callPackage ../tools/networking/rcon { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; rdma-core = callPackage ../os-specific/linux/rdma-core { }; @@ -6806,7 +6810,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - rustscan = callPackage ../tools/security/rustscan { }; + rustscan = callPackage ../tools/security/rustscan { + inherit (darwin.apple_sdk.frameworks) Security; + }; rw = callPackage ../tools/misc/rw { }; @@ -11176,7 +11182,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_6; + gradle_6 = res.gradleGen.gradle_6_7; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -14664,6 +14670,8 @@ in non = callPackage ../applications/audio/non { }; + noise-suppression-for-voice = callPackage ../development/libraries/noise-suppression-for-voice { }; + ntl = callPackage ../development/libraries/ntl { }; nspr = callPackage ../development/libraries/nspr { @@ -20149,6 +20157,8 @@ in copyq = libsForQt514.callPackage ../applications/misc/copyq { }; + corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; + coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; }; @@ -21286,6 +21296,8 @@ in musikcube = callPackage ../applications/audio/musikcube {}; + pinboard = with python3Packages; toPythonApplication pinboard; + pinboard-notes-backup = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" haskellPackages.pinboard-notes-backup) @@ -23490,7 +23502,11 @@ in libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); - sourcetrail = callPackage ../development/tools/sourcetrail { }; + sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail { + jdk = jdk8; + llvmPackages = llvmPackages_10; + pythonPackages = python3Packages; + }; spotifywm = callPackage ../applications/audio/spotifywm { }; @@ -23939,6 +23955,8 @@ in vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; + vimv = callPackage ../tools/misc/vimv/default.nix { }; + qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { @@ -24405,18 +24423,14 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + kodiPlain = callPackage ../applications/video/kodi { }; kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; kodiGBM = callPackage ../applications/video/kodi { useGbm = true; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); @@ -25526,7 +25540,7 @@ in sfrotz = callPackage ../games/sfrotz { }; - sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; + sgtpuzzles = callPackage ../games/sgt-puzzles { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; @@ -26718,7 +26732,7 @@ in stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; }; ecm = callPackage ../applications/science/math/ecm { }; |