diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 417 |
1 files changed, 329 insertions, 88 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7225a4e65e07..11f2783eabf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -167,6 +167,8 @@ in fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); + fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + packer = callPackage ../development/tools/packer { }; fetchpatch = callPackage ../build-support/fetchpatch { }; @@ -640,7 +642,19 @@ in libtorrentRasterbar = libtorrentRasterbar_1_09; }; - cabal2nix = self.haskellPackages.cabal2nix; + cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { + isLibrary = false; + enableSharedExecutables = false; + executableToolDepends = [ self.makeWrapper ]; + postInstall = '' + exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} + install -D $out/bin/${drv.pname} $exe + rm -rf $out/{bin,lib,share} + makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${self.nix-prefetch-scripts}/bin" + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} + ''; + }); caddy = callPackage ../servers/caddy { }; @@ -963,7 +977,9 @@ in davix = callPackage ../tools/networking/davix { }; - cantata = qt5.callPackage ../applications/audio/cantata { }; + cantata = qt5.callPackage ../applications/audio/cantata { + ffmpeg = ffmpeg_2; + }; can-utils = callPackage ../os-specific/linux/can-utils { }; @@ -986,7 +1002,9 @@ in ceph-dev = self.ceph; #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); - cfdg = callPackage ../tools/graphics/cfdg { }; + cfdg = callPackage ../tools/graphics/cfdg { + ffmpeg = ffmpeg_2; + }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -1216,6 +1234,8 @@ in cutter = callPackage ../tools/networking/cutter { }; + cwebbin = callPackage ../development/tools/misc/cwebbin { }; + cvs_fast_export = callPackage ../applications/version-management/cvs-fast-export { }; dadadodo = callPackage ../tools/text/dadadodo { }; @@ -1372,7 +1392,11 @@ in dvgrab = callPackage ../tools/video/dvgrab { }; - dvtm = callPackage ../tools/misc/dvtm { }; + dvtm = callPackage ../tools/misc/dvtm { + # if you prefer a custom config, write the config.h in dvtm.config.h + # and enable + # customConfig = builtins.readFile ./dvtm.config.h; + }; e2tools = callPackage ../tools/filesystems/e2tools { }; @@ -1388,16 +1412,27 @@ in editres = callPackage ../tools/graphics/editres { }; + edit = callPackage ../applications/editors/edit { }; + edk2 = callPackage ../development/compilers/edk2 { }; eid-mw = callPackage ../tools/security/eid-mw { }; eid-viewer = callPackage ../tools/security/eid-viewer { }; + ### DEVELOPMENT / EMSCRIPTEN + + buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { }; + emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); + + emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; + + efibootmgr = callPackage ../tools/system/efibootmgr { }; efivar = callPackage ../tools/system/efivar { }; @@ -1463,7 +1498,9 @@ in fatsort = callPackage ../tools/filesystems/fatsort { }; - fcitx = callPackage ../tools/inputmethods/fcitx { }; + fcitx = callPackage ../tools/inputmethods/fcitx { + plugins = []; + }; fcitx-engines = recurseIntoAttrs { @@ -1487,10 +1524,6 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; - fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix { - plugins = [ ]; - }; - fcppt = callPackage ../development/libraries/fcppt/default.nix { }; fcron = callPackage ../tools/system/fcron { }; @@ -1909,6 +1942,7 @@ in haveged = callPackage ../tools/security/haveged { }; habitat = callPackage ../applications/networking/cluster/habitat { }; + habitat-sh = callPackage ../applications/networking/cluster/habitat/chroot-env.nix { }; hardlink = callPackage ../tools/system/hardlink { }; @@ -2112,6 +2146,8 @@ in jpegoptim = callPackage ../applications/graphics/jpegoptim { }; + jpegrescan = callPackage ../applications/graphics/jpegrescan { }; + jq = callPackage ../development/tools/jq { }; jo = callPackage ../development/tools/jo { }; @@ -2158,7 +2194,9 @@ in lesspipe = callPackage ../tools/misc/lesspipe { }; - liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; + liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { + ffmpeg = ffmpeg_2; + }; lnav = callPackage ../tools/misc/lnav { }; @@ -2209,6 +2247,14 @@ in netdata = callPackage ../tools/system/netdata { }; netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { + # ui could be gtk, sixel or framebuffer. Note that console display (sixel) + # requires a terminal that supports `sixel` capabilities such as mlterm + # or xterm -ti 340 + ui = "sixel"; + + uilib = if ui == "gtk" then "gtk" else "framebuffer"; + + SDL = if ui == "gtk" then null else if ui == "sixel" then SDL_sixel else SDL; buildsystem = callPackage ../applications/misc/netsurf/buildsystem { }; @@ -2322,6 +2368,8 @@ in libqmi = callPackage ../development/libraries/libqmi { }; + libqrencode = callPackage ../development/libraries/libqrencode { }; + libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; @@ -2379,6 +2427,8 @@ in lxc = callPackage ../os-specific/linux/lxc { }; lxd = callPackage ../tools/admin/lxd { }; + lzfse = callPackage ../tools/compression/lzfse { }; + lzip = callPackage ../tools/compression/lzip { }; lzma = xz; @@ -2402,7 +2452,7 @@ in mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; mailutils = callPackage ../tools/networking/mailutils { - guile = guile_1_8; + sasl = gsasl; }; email = callPackage ../tools/networking/email { }; @@ -2733,6 +2783,8 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; + ocproxy = callPackage ../tools/networking/ocproxy { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; obexfs = callPackage ../tools/bluetooth/obexfs { }; @@ -2846,7 +2898,9 @@ in p7zip = callPackage ../tools/archivers/p7zip { }; - packagekit = callPackage ../tools/package-management/packagekit { }; + packagekit = callPackage ../tools/package-management/packagekit { + nix = nixUnstable; + }; pal = callPackage ../tools/misc/pal { }; @@ -2878,6 +2932,8 @@ in pell = callPackage ../applications/misc/pell { }; + pick = callPackage ../tools/misc/pick { }; + pitivi = callPackage ../applications/video/pitivi { gst = gst_all_1 // { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation @@ -3026,6 +3082,8 @@ in libpng = libpng12; }; + pngpp = callPackage ../development/libraries/png++ { }; + pngquant = callPackage ../tools/graphics/pngquant { }; podiff = callPackage ../tools/text/podiff { }; @@ -3185,6 +3243,14 @@ in recordmydesktop = callPackage ../applications/video/recordmydesktop { }; + gtk-recordmydesktop = callPackage ../applications/video/recordmydesktop/gtk.nix { + jack2 = jack2Full; + }; + + qt-recordmydesktop = callPackage ../applications/video/recordmydesktop/qt.nix { + jack2 = jack2Full; + }; + recutils = callPackage ../tools/misc/recutils { }; recoll = callPackage ../applications/search/recoll { }; @@ -3199,6 +3265,8 @@ in remarkjs = callPackage ../development/web/remarkjs { }; + alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { }; + remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina {}; @@ -3328,6 +3396,8 @@ in seccure = callPackage ../tools/security/seccure { }; + secp256k1 = callPackage ../tools/security/secp256k1 { }; + securefs = callPackage ../tools/filesystems/securefs { }; setroot = callPackage ../tools/X11/setroot { }; @@ -3408,6 +3478,8 @@ in solvespace = callPackage ../applications/graphics/solvespace { }; + sonarr = callPackage ../servers/sonarr { }; + sonata = callPackage ../applications/audio/sonata { inherit (python3Packages) buildPythonApplication python isPy3k dbus pygobject3 mpd2; }; @@ -3576,6 +3648,8 @@ in tinc = callPackage ../tools/networking/tinc { }; + tie = callPackage ../development/tools/misc/tie { }; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; @@ -3600,6 +3674,8 @@ in toilet = callPackage ../tools/misc/toilet { }; + tokei = callPackage ../development/tools/misc/tokei { }; + tor = callPackage ../tools/security/tor { }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; @@ -3747,6 +3823,13 @@ in vpnc = callPackage ../tools/networking/vpnc { }; + vp = callPackage ../applications/misc/vp { + # Enable next line for console graphics. Note that + # it requires `sixel` enabled terminals such as mlterm + # or xterm -ti 340 + SDL = SDL_sixel; + }; + openconnect = openconnect_openssl; openconnect_openssl = callPackage ../tools/networking/openconnect.nix { @@ -3844,6 +3927,8 @@ in udunits = callPackage ../development/libraries/udunits { }; + uemacs = callPackage ../applications/editors/uemacs { }; + uhttpmock = callPackage ../development/libraries/uhttpmock { }; uim = callPackage ../tools/inputmethods/uim { @@ -3858,6 +3943,8 @@ in units = callPackage ../tools/misc/units { }; + unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; + unrar = callPackage ../tools/archivers/unrar { }; xar = callPackage ../tools/compression/xar { }; @@ -4639,8 +4726,6 @@ in hugs = callPackage ../development/interpreters/hugs { }; - path64 = callPackage ../development/compilers/path64 { }; - openjdk7 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk-darwin { } @@ -4668,6 +4753,8 @@ in jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; jre = if stdenv.isDarwin then self.jre7 else self.jre8; + openshot-qt = callPackage ../applications/video/openshot-qt { }; + oraclejdk = self.jdkdistro true false; oraclejdk7 = self.oraclejdk7distro true false; @@ -4800,11 +4887,18 @@ in mlton = callPackage ../development/compilers/mlton { }; - mono = callPackage ../development/compilers/mono { + mono = mono40; + + mono40 = callPackage ../development/compilers/mono/4.0.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; }; + mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -5346,9 +5440,9 @@ in cargo = rust.cargo; rustc = rust.rustc; - rustPlatform = recurseIntoAttrs (makeRustPlatform rust rustPlatform); + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); - makeRustPlatform = rust: self: + makeRustPlatform = rust: lib.fix (self: let callPackage = newScope self; in { @@ -5359,7 +5453,7 @@ in buildRustPackage = callPackage ../build-support/rust { inherit rust; }; - }; + }); rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; @@ -5574,6 +5668,8 @@ in elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; + lfe = callPackage ../development/interpreters/lfe { }; + groovy = callPackage ../development/interpreters/groovy { }; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; @@ -5679,7 +5775,7 @@ in glpk = null; suitesparse = null; jdk = null; - openblas = openblasCompat; + openblas = openblas; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; @@ -5773,7 +5869,7 @@ in pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/docs {}); - pypi2nix = callPackage ../development/tools/pypi2nix { python = python27; }; + pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; }; svg2tikz = python27Packages.svg2tikz; @@ -5793,6 +5889,7 @@ in renpy = callPackage ../development/interpreters/renpy { wrapPython = pythonPackages.wrapPython; + ffmpeg = ffmpeg_2; }; pixie = callPackage ../development/interpreters/pixie { }; @@ -5918,6 +6015,8 @@ in srecord = callPackage ../development/tools/misc/srecord { }; + srelay = callPackage ../tools/networking/srelay { }; + xidel = callPackage ../tools/text/xidel { }; @@ -6238,7 +6337,9 @@ in m4 = gnum4; - geis = callPackage ../development/libraries/geis { }; + geis = callPackage ../development/libraries/geis { + inherit (xorg) libX11 libXext libXi libXtst; + }; global = callPackage ../development/tools/misc/global { }; @@ -6253,7 +6354,7 @@ in gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = self.gnumake41; + gnumake = self.gnumake42; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -6329,6 +6430,7 @@ in lemon = callPackage ../development/tools/parsing/lemon { }; + lenmus = callPackage ../applications/misc/lenmus { }; libtool = self.libtool_2; @@ -6349,6 +6451,8 @@ in maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + minify = callPackage ../development/web/minify { }; + mk = callPackage ../development/tools/build-managers/mk { }; msitools = callPackage ../development/tools/misc/msitools { }; @@ -6501,6 +6605,8 @@ in shellcheck = self.haskellPackages.ShellCheck; + shncpd = callPackage ../tools/networking/shncpd { }; + sigrok-cli = callPackage ../development/tools/sigrok-cli { }; simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; @@ -6555,7 +6661,7 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.1.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } @@ -6573,6 +6679,8 @@ in uncrustify = callPackage ../development/tools/misc/uncrustify { }; + universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; + vagrant = callPackage ../development/tools/vagrant { ruby = ruby_2_2; }; @@ -6623,6 +6731,8 @@ in grabserial = callPackage ../development/tools/grabserial { }; + mypy-lang = callPackage ../development/tools/mypy-lang { }; + ### DEVELOPMENT / LIBRARIES @@ -6989,15 +7099,15 @@ in ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_0 = callPackage ../development/libraries/ffmpeg/3.0.nix { + ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; # Aliases ffmpeg_0 = self.ffmpeg_0_10; ffmpeg_1 = self.ffmpeg_1_2; ffmpeg_2 = self.ffmpeg_2_8; - ffmpeg_3 = self.ffmpeg_3_0; - ffmpeg = self.ffmpeg_2; + ffmpeg_3 = self.ffmpeg_3_1; + ffmpeg = self.ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin @@ -7017,11 +7127,15 @@ in MediaToolbox VideoDecodeAcceleration; }; - ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; + ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { + ffmpeg = ffmpeg_2; + }; ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { }; - ffms = callPackage ../development/libraries/ffms { }; + ffms = callPackage ../development/libraries/ffms { + ffmpeg = ffmpeg_2; + }; fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = self.fftw.override { precision = "single"; }; @@ -7332,11 +7446,6 @@ in gtkmathview = callPackage ../development/libraries/gtkmathview { }; - gtkLibs = { - inherit (pkgs) glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk - gtkmm; - }; - glib = callPackage ../development/libraries/glib { }; glib-tested = self.glib.override { # checked version separate to break cycles doCheck = true; @@ -7478,6 +7587,7 @@ in hyena = callPackage ../development/libraries/hyena { }; icu = callPackage ../development/libraries/icu { }; + icu_54_1 = callPackage ../development/libraries/icu/54.1.nix { }; id3lib = callPackage ../development/libraries/id3lib { }; @@ -8066,6 +8176,8 @@ in libisofs = callPackage ../development/libraries/libisofs { }; + libisoburn = callPackage ../development/libraries/libisoburn { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; @@ -8322,6 +8434,8 @@ in libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libui = callPackage ../development/libraries/libui { }; + libunity = callPackage ../development/libraries/libunity { }; libunistring = callPackage ../development/libraries/libunistring { }; @@ -8542,6 +8656,7 @@ in avahi = avahi.override { withLibdnssdCompat = true; }; + ffmpeg = ffmpeg_2; }; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; @@ -8551,6 +8666,7 @@ in }; mlt-qt4 = callPackage ../development/libraries/mlt { + ffmpeg = ffmpeg_2; qt = qt4; }; @@ -8606,7 +8722,9 @@ in notify-sharp = callPackage ../development/libraries/notify-sharp { }; - ncurses = callPackage ../development/libraries/ncurses { }; + ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; }; + ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; }; + ncurses = if stdenv.isDarwin then ncurses5 else ncurses6; neardal = callPackage ../development/libraries/neardal { }; @@ -8691,7 +8809,9 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { }; + opencv = callPackage ../development/libraries/opencv { + ffmpeg = ffmpeg_2; + }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; @@ -8706,7 +8826,9 @@ in ois = callPackage ../development/libraries/ois {}; - opal = callPackage ../development/libraries/opal {}; + opal = callPackage ../development/libraries/opal { + ffmpeg = ffmpeg_2; + }; openh264 = callPackage ../development/libraries/openh264 { }; @@ -8935,7 +9057,9 @@ in libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix {}; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { + ffmpeg = ffmpeg_2; + }; openbr = callPackage ../development/libraries/openbr { }; @@ -8960,6 +9084,7 @@ in vlc = lowPrio (callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; + ffmpeg = ffmpeg_2; }); }; @@ -9487,7 +9612,9 @@ in xdo = callPackage ../tools/misc/xdo { }; - xineLib = callPackage ../development/libraries/xine-lib { }; + xineLib = callPackage ../development/libraries/xine-lib { + ffmpeg = ffmpeg_2; + }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -10083,13 +10210,19 @@ in neard = callPackage ../servers/neard { }; - nginx = callPackage ../servers/http/nginx { + nginx = callPackage ../servers/http/nginx/stable.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; }; - # nginxUnstable currently points to stable because that's newest: - nginxUnstable = nginx; + + nginxMainline = callPackage ../servers/http/nginx/mainline.nix { + # We don't use `with` statement here on purpose! + # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 + modules = [ nginxModules.dav nginxModules.moreheaders ]; + }; + + nginxUnstable = nginxMainline; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; @@ -10361,6 +10494,8 @@ in sipwitch = callPackage ../servers/sip/sipwitch { }; + smcroute = callPackage ../servers/smcroute { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; squid = callPackage ../servers/squid { }; @@ -10652,6 +10787,10 @@ in firejail = callPackage ../os-specific/linux/firejail {}; + fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; + + forkstat = callPackage ../os-specific/linux/forkstat { }; + freefall = callPackage ../os-specific/linux/freefall { inherit (linuxPackages) kernel; }; @@ -10729,6 +10868,8 @@ in kbd = callPackage ../os-specific/linux/kbd { }; + kbdKeymaps = callPackage ../os-specific/linux/kbd/keymaps.nix { }; + kbdlight = callPackage ../os-specific/linux/kbdlight { }; kmscon = callPackage ../os-specific/linux/kmscon { }; @@ -10751,6 +10892,10 @@ in openisns = callPackage ../os-specific/linux/open-isns { }; + powerstat = callPackage ../os-specific/linux/powerstat { }; + + smemstat = callPackage ../os-specific/linux/smemstat { }; + tgt = callPackage ../tools/networking/tgt { }; # -- Linux kernel expressions ------------------------------------------------ @@ -10833,7 +10978,10 @@ in }; linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.hiddev_CVE_2016_5829 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10842,7 +10990,12 @@ in }; linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.qat_common_Makefile + kernelPatches.hiddev_CVE_2016_5829 + kernelPatches.ecryptfs_fix_mmap_bug + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10851,7 +11004,11 @@ in }; linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.qat_common_Makefile + kernelPatches.hiddev_CVE_2016_5829 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10860,7 +11017,11 @@ in }; linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.qat_common_Makefile + kernelPatches.hiddev_CVE_2016_5829 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10929,6 +11090,10 @@ in e1000e = callPackage ../os-specific/linux/e1000e {}; + ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; + + ena = callPackage ../os-specific/linux/ena {}; + v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; frandom = callPackage ../os-specific/linux/frandom { }; @@ -11005,6 +11170,8 @@ in virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + wireguard = callPackage ../os-specific/linux/wireguard { }; + x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; zfs = callPackage ../os-specific/linux/zfs { @@ -11049,7 +11216,12 @@ in linux_grsec_nixos = callPackage ../build-support/grsecurity { inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { - inherit (self.linux_4_5) kernelPatches; + kernelPatches = with self.kernelPatches; [ bridge_stp_helper qat_common_Makefile ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; @@ -11409,10 +11581,12 @@ in buildUBoot ubootTools ubootBananaPi + ubootBeagleboneBlack ubootJetsonTK1 ubootPcduino3Nano ubootRaspberryPi - ubootVersatileExpressCA9 + ubootRaspberryPi2 + ubootRaspberryPi3 ubootWandboard ; @@ -11763,6 +11937,8 @@ in opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + orbitron = callPackage ../data/fonts/orbitron { }; + paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; pecita = callPackage ../data/fonts/pecita {}; @@ -12019,6 +12195,7 @@ in avxsynth = callPackage ../applications/video/avxsynth { libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope + ffmpeg = ffmpeg_2; }; awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { @@ -12072,6 +12249,8 @@ in bibletime = callPackage ../applications/misc/bibletime { }; + bitkeeper = callPackage ../applications/version-management/bitkeeper { }; + bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { }; @@ -12094,16 +12273,19 @@ in bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bomi = qt55.callPackage ../applications/video/bomi { + bomi = qt5.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; + ffmpeg = ffmpeg_2; }; brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; bristol = callPackage ../applications/audio/bristol { }; - bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bs1770gain = callPackage ../applications/audio/bs1770gain { + ffmpeg = ffmpeg_2; + }; bspwm = callPackage ../applications/window-managers/bspwm { }; @@ -12204,6 +12386,7 @@ in cmus = callPackage ../applications/audio/cmus { libjack = libjack2; libcdio = libcdio082; + ffmpeg = ffmpeg_2; pulseaudioSupport = config.pulseaudio or false; }; @@ -12783,7 +12966,7 @@ in }; firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - channel = "beta"; + generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome.GConf; inherit (pkgs.gnome) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; @@ -12796,20 +12979,6 @@ in desktopName = "Firefox Beta"; }; - firefox-developer-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - channel = "developer"; - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; - }; - - firefox-developer-bin = self.wrapFirefox firefox-developer-bin-unwrapped { - browserName = "firefox"; - name = "firefox-developer-bin-" + - (builtins.parseDrvName firefox-developer-bin-unwrapped.name).version; - desktopName = "Firefox Developer Edition"; - }; - firestr = qt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -12835,7 +13004,7 @@ in freecad = callPackage ../applications/graphics/freecad { boost = boost155; opencascade = opencascade_oce; - inherit (pythonPackages) matplotlib pycollada; + inherit (pythonPackages) matplotlib pycollada pivy; }; freemind = callPackage ../applications/misc/freemind { }; @@ -12852,6 +13021,7 @@ in }; freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { + ffmpeg = ffmpeg_2; cmake = cmake-2_8; }; @@ -13058,6 +13228,7 @@ in guvcview = callPackage ../os-specific/linux/guvcview { pulseaudioSupport = config.pulseaudio or true; + ffmpeg = ffmpeg_2; }; gxmessage = callPackage ../applications/misc/gxmessage { }; @@ -13291,6 +13462,7 @@ in kino = callPackage ../applications/video/kino { inherit (gnome) libglade; + ffmpeg = ffmpeg_2; }; kiwix = callPackage ../applications/misc/kiwix { }; @@ -13407,11 +13579,15 @@ in }; ledger = self.ledger3; + lighthouse = callPackage ../applications/misc/lighthouse { }; + lighttable = callPackage ../applications/editors/lighttable {}; links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { }; + linphone = callPackage ../applications/networking/instant-messengers/linphone rec { + ffmpeg = ffmpeg_2; + }; linuxsampler = callPackage ../applications/audio/linuxsampler { bison = bison2; @@ -13441,6 +13617,7 @@ in handbrake = callPackage ../applications/video/handbrake { webkitgtk = webkitgtk24x; + ffmpeg = ffmpeg_2; }; lilyterm = callPackage ../applications/misc/lilyterm { @@ -13531,7 +13708,9 @@ in mmex = callPackage ../applications/office/mmex { }; - moc = callPackage ../applications/audio/moc { }; + moc = callPackage ../applications/audio/moc { + ffmpeg = ffmpeg_2; + }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -13552,6 +13731,8 @@ in inherit (gnome) libgnomecanvas glib; }; + mop = callPackage ../applications/misc/mop { }; + mopidy = callPackage ../applications/audio/mopidy { }; mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; @@ -13690,6 +13871,8 @@ in pijul = callPackage ../applications/version-management/pijul { }; + planner = callPackage ../applications/office/planner { }; + playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; @@ -13858,10 +14041,14 @@ in pbrt = callPackage ../applications/graphics/pbrt { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../misc/emulators/pcsxr { + ffmpeg = ffmpeg_2; + }; pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { }; + pekwm = callPackage ../applications/window-managers/pekwm { }; + pencil = callPackage ../applications/graphics/pencil { xulrunner = firefox-unwrapped; }; @@ -13997,7 +14184,7 @@ in qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent { boost = boost; - libtorrentRasterbar = libtorrentRasterbar; + libtorrentRasterbar = libtorrentRasterbar_1_09; }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; @@ -14315,7 +14502,9 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { }; + spek = callPackage ../applications/audio/spek { + ffmpeg = ffmpeg_2; + }; spotify = callPackage ../applications/audio/spotify { inherit (gnome) GConf; @@ -14704,7 +14893,9 @@ in vym = callPackage ../applications/misc/vym { }; - w3m = callPackage ../applications/networking/browsers/w3m { }; + w3m = callPackage ../applications/networking/browsers/w3m { + graphicsSupport = !stdenv.isDarwin; + }; # Should always be the version with the most features w3m-full = w3m; @@ -14743,6 +14934,8 @@ in windowmaker = callPackage ../applications/window-managers/windowmaker { }; + wily = callPackage ../applications/editors/wily { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; @@ -14755,6 +14948,8 @@ in wings = callPackage ../applications/graphics/wings { }; + wireguard = callPackage ../os-specific/linux/wireguard { }; + wmname = callPackage ../applications/misc/wmname { }; wmctrl = callPackage ../tools/X11/wmctrl { }; @@ -15083,6 +15278,13 @@ in zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zgv = callPackage ../applications/graphics/zgv { + # Enable the below line for terminal display. Note + # that it requires sixel graphics compatible terminals like mlterm + # or xterm -ti 340 + SDL = SDL_sixel; + }; + zim = callPackage ../applications/office/zim { pygtk = pyGtkGlade; }; @@ -15172,6 +15374,8 @@ in cockatrice = qt5.callPackage ../games/cockatrice { }; + commandergenius = callPackage ../games/commandergenius { }; + confd = callPackage ../tools/system/confd { }; construoBase = lowPrio (callPackage ../games/construo { @@ -15474,6 +15678,8 @@ in lua = lua5_1; }; + solarus = callPackage ../games/solarus { }; + # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -15498,7 +15704,9 @@ in steam-run = steam.run; - stepmania = callPackage ../games/stepmania { }; + stepmania = callPackage ../games/stepmania { + ffmpeg = ffmpeg_2; + }; stuntrally = callPackage ../games/stuntrally { bullet = bullet283; @@ -15678,22 +15886,19 @@ in gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; - } // pkgs.gtkLibs // { - # Backwards compatibility; - inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; + } // { + inherit (pkgs) + # GTK Libs + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk gtkmm + + # Included for backwards compatibility + libsoup libwnck gtk_doc gnome_doc_utils; }; gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); - gnome3 = self.gnome3_18 // { - shellExtensions = { - impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix {}; - system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor.nix {}; - volume-mixer = callPackage ../desktops/gnome-3/extensions/volume-mixer.nix {}; - workspace-grid = callPackage ../desktops/gnome-3/extensions/workspace-grid.nix {}; - }; - }; + gnome3 = self.gnome3_20; gnome = recurseIntoAttrs self.gnome2; @@ -15716,6 +15921,7 @@ in pythonBindings = true; }; ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473 + ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise } ../desktops/kde-4.14; @@ -15726,7 +15932,9 @@ in # the real work in this function is done below this list extraPackages = callPackage: rec { - amarok = callPackage ../applications/audio/amarok { }; + amarok = callPackage ../applications/audio/amarok { + ffmpeg = ffmpeg_2; + }; bangarang = callPackage ../applications/video/bangarang { }; @@ -16014,9 +16222,9 @@ in kde5 = let - frameworks = import ../desktops/kde-5/frameworks-5.22 { inherit pkgs; }; - plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; }; - applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; }; + frameworks = import ../desktops/kde-5/frameworks { inherit pkgs; }; + plasma = import ../desktops/kde-5/plasma { inherit pkgs; }; + applications = import ../desktops/kde-5/applications { inherit pkgs; }; merged = self: { plasma = plasma self; frameworks = frameworks self; @@ -16136,6 +16344,8 @@ in openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; + LiE = callPackage ../applications/science/math/LiE { }; + magma = callPackage ../development/libraries/science/math/magma { }; mathematica = callPackage ../applications/science/math/mathematica { }; @@ -16771,6 +16981,10 @@ in nixos-artwork = callPackage ../data/misc/nixos-artwork { }; + nixos-container = callPackage ../tools/virtualization/nixos-container { }; + + norwester-font = callPackage ../data/fonts/norwester {}; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -17000,7 +17214,9 @@ in vault = callPackage ../tools/security/vault { }; - vbam = callPackage ../misc/emulators/vbam {}; + vbam = callPackage ../misc/emulators/vbam { + ffmpeg = ffmpeg_2; + }; vice = callPackage ../misc/emulators/vice { libX11 = xorg.libX11; @@ -17037,6 +17253,10 @@ in webfs = callPackage ../servers/http/webfs { }; + wikicurses = callPackage ../applications/misc/wikicurses { + pythonPackages = python3Packages; + }; + wineMinimal = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; wineBuild = config.wine.build or "wine32"; @@ -17090,6 +17310,14 @@ in wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; + wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { + wxGTK = wxGTK30; + }; + + wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { + wxGTK = wxGTK30; + }; + x2x = callPackage ../tools/X11/x2x { }; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; @@ -17106,6 +17334,13 @@ in libpng = libpng12; }; + xsw = callPackage ../applications/misc/xsw { + # Enable the next line to use this in terminal. + # Note that it requires sixel capable terminals such as mlterm + # or xterm -ti 340 + SDL = SDL_sixel; + }; + xwiimote = callPackage ../misc/drivers/xwiimote { bluez = pkgs.bluez5.override { enableWiimote = true; @@ -17178,4 +17413,10 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; sequelpro = callPackage ../applications/misc/sequelpro {}; + + maphosts = callPackage ../tools/networking/maphosts {}; + + zuki-themes = callPackage ../misc/themes/zuki { }; + + zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; } |