diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 192 |
1 files changed, 140 insertions, 52 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8df4011bc7a..82c75fecfec2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -273,7 +273,8 @@ with pkgs; inherit kernel rootModules allowMissing; }; - kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; }; + kdeDerivation = makeOverridable (import ../build-support/kde/derivation.nix) + { inherit stdenv lib; }; kdeWrapper = callPackage ../build-support/kde/wrapper.nix { inherit (gnome3) dconf; @@ -523,6 +524,8 @@ with pkgs; dgsh = callPackage ../shells/dgsh { }; + dkimpy = pythonPackages.dkimpy; + elvish = callPackage ../shells/elvish { }; encryptr = callPackage ../tools/security/encryptr { @@ -547,6 +550,8 @@ with pkgs; pass = callPackage ../tools/security/pass { }; + browserpass = callPackage ../tools/security/browserpass { }; + oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; kwakd = callPackage ../servers/kwakd { }; @@ -856,6 +861,8 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; + ioport = callPackage ../os-specific/linux/ioport {}; + diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; @@ -1003,6 +1010,8 @@ with pkgs; mathics = pythonPackages.mathics; + masscan = callPackage ../tools/security/masscan { }; + meson = callPackage ../development/tools/build-managers/meson { }; metricbeat = callPackage ../misc/logging/metricbeat { }; @@ -1759,8 +1768,9 @@ with pkgs; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { - inherit (pythonPackages) gyp; - protobuf = protobuf.override { stdenv = clangStdenv; }; + python = python2; + inherit (python2Packages) gyp; + protobuf = protobuf3_2.override { stdenv = clangStdenv; }; }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; @@ -2864,6 +2874,8 @@ with pkgs; macchanger = callPackage ../os-specific/linux/macchanger { }; + madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; + mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; maildrop = callPackage ../tools/networking/maildrop { }; @@ -3147,6 +3159,8 @@ with pkgs; networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu { }; + newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; @@ -3355,9 +3369,7 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = callPackage ../applications/networking/owncloud-client { - inherit (libsForQt5) qtkeychain; - }; + owncloud-client = libsForQt56.callPackage ../applications/networking/owncloud-client { }; p2pvc = callPackage ../applications/video/p2pvc {}; @@ -3703,6 +3715,8 @@ with pkgs; radvd = callPackage ../tools/networking/radvd { }; + rainbowstream = pythonPackages.rainbowstream; + rambox = callPackage ../applications/networking/instant-messengers/rambox { }; ranger = callPackage ../applications/misc/ranger { }; @@ -3723,6 +3737,8 @@ with pkgs; redsocks = callPackage ../tools/networking/redsocks { }; + rst2html5 = callPackage ../tools/text/rst2html5 { }; + rt = callPackage ../servers/rt { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -3818,7 +3834,7 @@ with pkgs; rlwrap = callPackage ../tools/misc/rlwrap { }; - rockbox_utility = callPackage ../tools/misc/rockbox-utility { }; + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = callPackage ../applications/audio/rosegarden { }; @@ -4002,6 +4018,8 @@ with pkgs; snort = callPackage ../applications/networking/ids/snort { }; + sshguard = callPackage ../tools/security/sshguard {}; + softhsm = callPackage ../tools/security/softhsm { }; solr = callPackage ../servers/search/solr { }; @@ -5952,11 +5970,6 @@ with pkgs; luaPackages = lua52Packages; - lua5_1_sockets = lua51Packages.luasocket; - - lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; - lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; - luajit = callPackage ../development/interpreters/luajit {}; luarocks = luaPackages.luarocks; @@ -6148,6 +6161,8 @@ with pkgs; regina = callPackage ../development/interpreters/regina { }; + inherit (ocamlPackages) reason; + renpy = callPackage ../development/interpreters/renpy { ffmpeg = ffmpeg_2; }; @@ -6565,6 +6580,8 @@ with pkgs; doctl = callPackage ../development/tools/doctl { }; + doit = callPackage ../development/tools/build-managers/doit { }; + dot2tex = pythonPackages.dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { @@ -6859,6 +6876,10 @@ with pkgs; premake4 = callPackage ../development/tools/misc/premake { }; + premake5 = callPackage ../development/tools/misc/premake/5.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + premake = premake4; qtcreator = libsForQt5.callPackage ../development/qtcreator { }; @@ -7392,6 +7413,8 @@ with pkgs; dxflib = callPackage ../development/libraries/dxflib {}; + eccodes = callPackage ../development/libraries/eccodes { }; + eclib = callPackage ../development/libraries/eclib {}; eigen = callPackage ../development/libraries/eigen {}; @@ -7454,17 +7477,14 @@ with pkgs; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - }; - ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix { + ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_2; + ffmpeg_3 = ffmpeg_3_3; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -9540,30 +9560,32 @@ with pkgs; developerBuild = true; }); - qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); + qt56 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.6) { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + }); libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); - qt58 = recurseIntoAttrs (import ../development/libraries/qt-5/5.8 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit (gnome3) gtk3 dconf; - }); + qt58 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.8) { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gnome3) gtk3 dconf; + }); libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5); @@ -9663,6 +9685,8 @@ with pkgs; withQt5 = true; }; + qtinstaller = callPackage ../development/libraries/qtinstaller { }; + qtkeychain = callPackage ../development/libraries/qtkeychain { withQt5 = true; }; @@ -9735,6 +9759,8 @@ with pkgs; inherit (haskellPackages) ghcWithPackages; }; + libgme = callPackage ../development/libraries/audio/libgme { }; + librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; @@ -10220,26 +10246,26 @@ with pkgs; wxGTK = wxGTK28; - wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { + wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxmac = callPackage ../development/libraries/wxmac { + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; }; @@ -10671,6 +10697,8 @@ with pkgs; charybdis = callPackage ../servers/irc/charybdis {}; + clickhouse = callPackage ../servers/clickhouse { }; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; python = python27; @@ -10849,6 +10877,11 @@ with pkgs; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; + # We should move to dynmaic modules and create a nginxFull package with all modules + nginxShibboleth = callPackage ../servers/http/nginx/stable.nix { + modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; + }; + ngircd = callPackage ../servers/irc/ngircd { }; nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; @@ -11635,7 +11668,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes - kernelPatches.packet_fix_race_condition_CVE_2016_8655 kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11684,10 +11716,7 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking - # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11701,10 +11730,23 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes + kernelPatches.cpu-cgroup-v2."4.10" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + linux_4_11 = callPackage ../os-specific/linux/kernel/linux-4.11.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version - # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking - # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11882,7 +11924,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_10; + linuxPackages_latest = linuxPackages_4_11; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11892,6 +11934,7 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); + linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -12254,6 +12297,7 @@ with pkgs; ubootRaspberryPi2 ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit + ubootUtilite ubootWandboard ; @@ -12291,6 +12335,8 @@ with pkgs; upstart = callPackage ../os-specific/linux/upstart { }; + upstart-check-config = callPackage ../os-specific/linux/upstart/check-config.nix {}; + usbutils = callPackage ../os-specific/linux/usbutils { }; usermount = callPackage ../os-specific/linux/usermount { }; @@ -12371,7 +12417,7 @@ with pkgs; wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; + wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; @@ -13873,6 +13919,8 @@ with pkgs; xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; + xrdp = callPackage ../applications/networking/remote/xrdp { }; + freerdp = callPackage ../applications/networking/remote/freerdp { inherit libpulseaudio; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; @@ -14065,6 +14113,10 @@ with pkgs; googleearth = callPackage_i686 ../applications/misc/googleearth { }; + google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { + inherit (gnome2) GConf; + }; + google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { libpng = libpng12; }; @@ -14809,7 +14861,18 @@ with pkgs; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - }) mumble mumble_git murmur murmur_git; + }) mumble mumble_git murmur; + + inherit (callPackages ../applications/networking/mumble { + avahi = avahi.override { + withLibdnssdCompat = true; + }; + qt5 = qt56; # Mumble doesn't work with Qt > 5.5 + jackSupport = config.mumble.jackSupport or false; + speechdSupport = config.mumble.speechdSupport or false; + pulseSupport = config.pulseaudio or false; + iceSupport = false; + }) murmur_git; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_i686 = if system == "x86_64-linux" @@ -15773,12 +15836,20 @@ with pkgs; telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + termdown = (newScope pythonPackages) ../applications/misc/termdown { }; + terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; terminator = callPackage ../applications/misc/terminator { vte = gnome2.vte.override { pythonSupport = true; }; }; + deepin-terminal = callPackage ../applications/misc/deepin-terminal { + vte = gnome3.vte; + wnck = libwnck3; + gee = libgee_0_8; + }; + termite = callPackage ../applications/misc/termite { vte = gnome3.vte-ng; }; @@ -15849,6 +15920,8 @@ with pkgs; tortoisehg = callPackage ../applications/version-management/tortoisehg { }; + toot = callPackage ../applications/misc/toot { }; + toxic = callPackage ../applications/networking/instant-messengers/toxic { }; transcode = callPackage ../applications/audio/transcode { }; @@ -16619,6 +16692,8 @@ with pkgs; boost = boost160; }; + displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; + drumkv1 = callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; @@ -17171,6 +17246,10 @@ with pkgs; gnome3 = gnome3_22; + gnomeExtensions = { + dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; + }; + hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; @@ -17560,6 +17639,8 @@ with pkgs; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; + cubicle = callPackage ../applications/science/logic/cubicle { }; + cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); }; @@ -17866,6 +17947,9 @@ with pkgs; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { }; + yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { + withRootSupport = true; + }); ### MISC @@ -18106,6 +18190,8 @@ with pkgs; nix-prefetch-svn nix-prefetch-scripts; + nix-update-source = callPackage ../tools/package-management/nix-update-source {}; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; nix-repl = callPackage ../tools/package-management/nix-repl { }; @@ -18577,6 +18663,7 @@ with pkgs; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; + chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; NSPlist = callPackage ../development/libraries/NSPlist {}; @@ -18585,4 +18672,5 @@ with pkgs; xib2nib = callPackage ../development/tools/xib2nib {}; + linode-cli = callPackage ../tools/virtualization/linode-cli { }; } |