diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 29fe03cea9f6..9dac708a153a 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -1699,6 +1699,8 @@ in lynis = callPackage ../tools/security/lynis { }; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; + mathics = pythonPackages.mathics; masscan = callPackage ../tools/security/masscan { @@ -1717,6 +1719,8 @@ in metabase = callPackage ../servers/metabase { }; + mididings = callPackage ../tools/audio/mididings { }; + miniserve = callPackage ../tools/misc/miniserve { }; mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; @@ -2693,6 +2697,8 @@ in zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zzuf = callPackage ../tools/security/zzuf { }; ### DEVELOPMENT / EMSCRIPTEN @@ -7002,6 +7008,8 @@ in zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; + zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; + zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { }; @@ -8541,6 +8549,7 @@ in python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; + python38Full = python38.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -8548,13 +8557,14 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; + python38Packages = python38.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; @@ -9871,7 +9881,7 @@ in ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; - python = python2; + python = python3; }; yodl = callPackage ../development/tools/misc/yodl { }; @@ -10178,6 +10188,8 @@ in cppdb = callPackage ../development/libraries/cppdb { }; + cpp-utilities = callPackage ../development/libraries/cpp-utilities { }; + cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; @@ -12294,7 +12306,9 @@ in # libGL.so/libEGL.so/... to link agains them. Android NDK provides # an OpenGL implementation, we can just use that. libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else mesa.stubs; + else callPackage ../development/libraries/mesa/stubs.nix { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; # Default libGLU libGLU = mesa_glu; @@ -12712,8 +12726,6 @@ in protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; - protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; - protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; @@ -15375,6 +15387,14 @@ in ]; }; + linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15566,7 +15586,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_1; + linuxPackages_latest = linuxPackages_5_2; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15577,6 +15597,7 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); + linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -17437,6 +17458,8 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; + drawio = callPackage ../applications/graphics/drawio {}; + drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; @@ -18481,6 +18504,8 @@ in i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; + i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; @@ -18499,7 +18524,9 @@ in i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; - betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; + betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { + inherit (xorg) xrdb; + }; i3minator = callPackage ../tools/misc/i3minator { }; |