diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 467 |
1 files changed, 351 insertions, 116 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86c5c63a0ccb..da5334935202 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -183,7 +183,6 @@ let ### Helper functions. - inherit lib config stdenvAdapters; inherit (lib) lowPrio hiPrio appendToName makeOverridable; @@ -203,6 +202,11 @@ let stringsWithDeps = lib.stringsWithDeps; + ### Nixpkgs maintainer tools + + nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; + + ### STANDARD ENVIRONMENT @@ -593,6 +597,8 @@ let chrony = callPackage ../tools/networking/chrony { }; + cjdns = callPackage ../tools/networking/cjdns { }; + cksfv = callPackage ../tools/networking/cksfv { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -725,10 +731,7 @@ let dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dropbear = callPackage ../tools/networking/dropbear { - enableStatic = true; - zlib = zlibStatic; - }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; @@ -773,6 +776,8 @@ let expect = callPackage ../tools/misc/expect { }; + fabric = pythonPackages.fabric; + fail2ban = callPackage ../tools/security/fail2ban { }; fakeroot = callPackage ../tools/system/fakeroot { }; @@ -1509,7 +1514,7 @@ let pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pythonDBus = callPackage ../development/python-modules/dbus { }; + pythonDBus = dbus_python; pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) { inherit python; @@ -1563,6 +1568,8 @@ let ripmime = callPackage ../tools/networking/ripmime {}; + rmlint = callPackage ../tools/misc/rmlint {}; + rng_tools = callPackage ../tools/security/rng-tools { }; rsnapshot = callPackage ../tools/backup/rsnapshot { @@ -1613,6 +1620,8 @@ let scrot = callPackage ../tools/graphics/scrot { }; + sdcv = callPackage ../applications/misc/sdcv { }; + seccure = callPackage ../tools/security/seccure/0.4.nix { }; setserial = builderDefsPackage (import ../tools/system/setserial) { @@ -1812,7 +1821,7 @@ let tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; - xorgserver = xorg.xorgserver_1_13_0; + inherit (xorg) xorgserver; fltk = fltk13; }; @@ -1984,9 +1993,13 @@ let xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; + youtubeDL = callPackage ../tools/misc/youtube-dl { }; - zbar = callPackage ../tools/graphics/zbar {}; + zbar = callPackage ../tools/graphics/zbar { + pygtk = lib.overrideDerivation pygtk (x: { + gtk = gtk2; + }); + }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -2001,7 +2014,6 @@ let ### SHELLS - bash = lowPrio (callPackage ../shells/bash { texinfo = null; }); @@ -2025,7 +2037,6 @@ let ### DEVELOPMENT / COMPILERS - abc = abcPatchable []; @@ -2124,6 +2135,37 @@ let gcc45 = gcc45_real; + wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper { + nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; + nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; + nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; + gcc = baseGCC; + libc = glibc; + shell = bash; + binutils = binutils_deterministic; + inherit stdenv coreutils zlib; + }; + + wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc; + + gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 { + inherit noSysDirs; + + # bootstrapping a profiled compiler does not work in the sheevaplug: + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 + profiledCompiler = !stdenv.isArm; + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + })); + gcc46 = gcc46_real; gcc47 = gcc47_real; @@ -2626,6 +2668,7 @@ let julia = callPackage ../development/compilers/julia { liblapack = liblapack.override {shared = true;}; + mpfr = mpfr_3_1_2; fftw = fftw.override {pthreads = true;}; fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; }; @@ -2650,7 +2693,9 @@ let mlton = callPackage ../development/compilers/mlton { }; - mono = callPackage ../development/compilers/mono { }; + mono = callPackage ../development/compilers/mono { + inherit (xlibs) libX11; + }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; @@ -2704,12 +2749,24 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; + + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + deriving = callPackage ../development/tools/ocaml/deriving { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; + dypgen = callPackage ../development/ocaml-modules/dypgen { }; + + patoline = callPackage ../tools/typesetting/patoline { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; + lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (gnome) libgnomecanvas libglade gtksourceview; }; @@ -2722,6 +2779,8 @@ let mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { camomile = camomile_0_8_2; }; @@ -2790,6 +2849,15 @@ let ocaml = ocaml_3_08_0; }; + deterministicStdenv = lowPrio ( + overrideInStdenv ( + stdenvAdapters.overrideGCC + (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh ) + gcc46_deterministic + ) + [ binutils_deterministic ] + ); + roadsend = callPackage ../development/compilers/roadsend { }; # TODO: the corresponding nix file is missing @@ -2831,13 +2899,13 @@ let urweb = callPackage ../development/compilers/urweb { }; - vala = vala17; + vala = vala19; vala15 = callPackage ../development/compilers/vala/15.2.nix { }; vala16 = callPackage ../development/compilers/vala/16.1.nix { }; - vala17 = callPackage ../development/compilers/vala/default.nix { }; + vala19 = callPackage ../development/compilers/vala/default.nix { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; @@ -2887,6 +2955,7 @@ let yasm = callPackage ../development/compilers/yasm { }; + ### DEVELOPMENT / INTERPRETERS acl2 = builderDefsPackage ../development/interpreters/acl2 { @@ -2997,6 +3066,7 @@ let pure = callPackage ../development/interpreters/pure {}; python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); + python33 = callPackage ../development/interpreters/python/3.3 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { }; @@ -3032,6 +3102,11 @@ let regina = callPackage ../development/interpreters/regina {}; + renpy = callPackage ../development/interpreters/renpy { + ffmpeg = ffmpeg_1; + wrapPython = pythonPackages.wrapPython; + }; + ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { }; ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { }; ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { }); @@ -3075,6 +3150,27 @@ let ### DEVELOPMENT / MISC + amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; + + amdappsdk26 = callPackage ../development/misc/amdapp-sdk { + version = "2.6"; + }; + + amdappsdk27 = callPackage ../development/misc/amdapp-sdk { + version = "2.7"; + }; + + amdappsdk28 = callPackage ../development/misc/amdapp-sdk { + version = "2.8"; + }; + + amdappsdk = amdappsdk28; + + amdappsdkFull = callPackage ../development/misc/amdapp-sdk { + version = "2.8"; + samples = true; + }; + avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {}; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -3108,7 +3204,6 @@ let ### DEVELOPMENT / TOOLS - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; @@ -3155,6 +3250,8 @@ let inherit noSysDirs; }; + binutils_deterministic = binutils.override { deterministic = true; }; + binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs; gold = true; @@ -3205,7 +3302,7 @@ let cgdb = callPackage ../development/tools/misc/cgdb { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; complexity = callPackage ../development/tools/misc/complexity { }; @@ -3393,6 +3490,7 @@ let noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; openocd = callPackage ../development/tools/misc/openocd { }; @@ -3447,8 +3545,6 @@ let jre = jdk; }; - sbt = callPackage ../development/tools/build-managers/sbt { }; - scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; @@ -3518,7 +3614,6 @@ let ### DEVELOPMENT / LIBRARIES - a52dec = callPackage ../development/libraries/a52dec { }; aacskeys = callPackage ../development/libraries/aacskeys { }; @@ -3702,23 +3797,16 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = pkgs.dbus_all.libs // { inherit (pkgs.dbus_all) libs; }; - - dbus_daemon = pkgs.dbus_all.daemon; - - dbus_tools = pkgs.dbus_all.tools; - - dbus_libs = pkgs.dbus_all.libs; - - dbus_all = callPackage ../development/libraries/dbus { - useX11 = true; - }; - - dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; - - dbus_glib = callPackage ../development/libraries/dbus-glib { }; - - dbus_java = callPackage ../development/libraries/java/dbus-java { }; + dbus = let dbus_all = callPackage ../development/libraries/dbus { }; + in dbus_all.libs // dbus_all; # previously dbus.libs also contained the daemon + dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; + dbus_glib = callPackage ../development/libraries/dbus-glib { }; + dbus_java = callPackage ../development/libraries/java/dbus-java { }; + dbus_python = callPackage ../development/python-modules/dbus { }; + # Should we deprecate these? Currently there are many references. + dbus_tools = dbus.tools; + dbus_libs = dbus.libs; + dbus_daemon = dbus.daemon; dclib = callPackage ../development/libraries/dclib { }; @@ -3834,8 +3922,6 @@ let gav = callPackage ../games/gav { }; - GConf3 = callPackage ../development/libraries/GConf/3.x.nix { }; - gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome) gtkdoc; }; @@ -3970,6 +4056,10 @@ let glpk = callPackage ../development/libraries/glpk { }; + glsurf = callPackage ../applications/science/math/glsurf { + inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; + }; + gmime = callPackage ../development/libraries/gmime { stdenv = stdenvMulti; }; @@ -4008,6 +4098,7 @@ let #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; + mpfr_3_1_2 = callPackage ../development/libraries/mpfr/3.1.2.nix { }; gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; @@ -4080,43 +4171,53 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib/2.34.x.nix { - stdenv = stdenvMulti; + glib = callPackage ../development/libraries/glib { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenvMulti; }; glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; - atk = callPackage ../development/libraries/atk/2.6.x.nix { + atk = callPackage ../development/libraries/atk { stdenv = stdenvMulti; }; atkmm = callPackage ../development/libraries/atkmm { }; + pixman = callPackage ../development/libraries/pixman { }; + cairo = callPackage ../development/libraries/cairo { stdenv = stdenvMulti; + glSupport = lib.elem system lib.platforms.mesaPlatforms; }; - cairomm = callPackage ../development/libraries/cairomm { }; - cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; - pango = callPackage ../development/libraries/pango/1.30.x.nix { + cairomm = callPackage ../development/libraries/cairomm { }; + + pango = callPackage ../development/libraries/pango { stdenv = stdenvMulti; }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { + pangox_compat = callPackage ../development/libraries/pangox-compat { }; + + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { stdenv = stdenvMulti; }; - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { + gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { stdenv = stdenvMulti; + cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { + inherit (gnome3) at_spi2_atk; + }); gtk = pkgs.gtk2; @@ -4191,6 +4292,8 @@ let id3lib = callPackage ../development/libraries/id3lib { }; + iksemel = callPackage ../development/libraries/iksemel { }; + ilbc = callPackage ../development/libraries/ilbc { }; ilmbase = callPackage ../development/libraries/ilmbase { }; @@ -4209,8 +4312,7 @@ let inteltbb = callPackage ../development/libraries/intel-tbb { }; - intltool = gnome.intltool; - intltool_standalone = callPackage ../development/tools/misc/intltool {}; + intltool = callPackage ../development/tools/misc/intltool { }; irrlicht3843 = callPackage ../development/libraries/irrlicht { }; @@ -4318,7 +4420,7 @@ let libcm = callPackage ../development/libraries/libcm { }; - libcroco = callPackage ../development/libraries/libcroco {}; + inherit (gnome3) libcroco; libctemplate = callPackage ../development/libraries/libctemplate { }; @@ -4388,11 +4490,11 @@ let libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { }; + libgnome_keyring3 = gnome3.libgnome_keyring; - libgtop = callPackage ../development/libraries/libgtop {}; + libsecret = callPackage ../development/libraries/libsecret { }; - libgweather = callPackage ../development/libraries/libgweather {}; + libgtop = callPackage ../development/libraries/libgtop {}; liblo = callPackage ../development/libraries/liblo { }; @@ -4490,9 +4592,7 @@ let libspectre = callPackage ../development/libraries/libspectre { }; - libgsf = callPackage ../development/libraries/libgsf { - inherit (gnome) gnome_vfs libbonobo; - }; + libgsf = callPackage ../development/libraries/libgsf { }; libiconv = callPackage ../development/libraries/libiconv { }; @@ -4520,11 +4620,15 @@ let libiptcdata = callPackage ../development/libraries/libiptcdata { }; - libjpeg = callPackage ../development/libraries/libjpeg { + libjpeg_original = callPackage ../development/libraries/libjpeg { + stdenv = stdenvMulti; + }; + + libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { stdenv = stdenvMulti; }; - libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -4619,6 +4723,9 @@ let libpng = callPackage ../development/libraries/libpng { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; + libpng15 = callPackage ../development/libraries/libpng/15.nix { }; + + libpaper = callPackage ../development/libraries/libpaper { }; libproxy = callPackage ../development/libraries/libproxy { }; @@ -4626,7 +4733,9 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { }; + librsvg = callPackage ../development/libraries/librsvg { + gtk2 = null; gtk3 = null; # neither gtk version by default + }; librsync = callPackage ../development/libraries/librsync { }; @@ -4679,9 +4788,17 @@ let libunique = callPackage ../development/libraries/libunique/default.nix { }; - libusb = callPackage ../development/libraries/libusb { }; + libusb = callPackage ../development/libraries/libusb { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; - libusb1 = callPackage ../development/libraries/libusb1 { }; + libusb1 = callPackage ../development/libraries/libusb1 { + stdenv = if stdenv.isDarwin # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50909 + then overrideGCC stdenv gccApple + else stdenv; + }; libunwind = callPackage ../development/libraries/libunwind { }; @@ -4691,7 +4808,7 @@ let libva = callPackage ../development/libraries/libva { }; - libvdpau = callPackage ../development/libraries/libvdpau { inherit (xlibs) libX11; }; + libvdpau = callPackage ../development/libraries/libvdpau { }; libvirt = callPackage ../development/libraries/libvirt { }; @@ -4731,6 +4848,8 @@ let libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; + libxkbcommon = callPackage ../development/libraries/libxkbcommon { }; + libxklavier = callPackage ../development/libraries/libxklavier { }; libxmi = callPackage ../development/libraries/libxmi { }; @@ -4768,13 +4887,14 @@ let liquidwar = builderDefsPackage ../games/liquidwar { inherit (xlibs) xproto libX11 libXrender; - inherit gmp mesa libjpeg libpng + inherit gmp mesa libjpeg expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite libogg libvorbis ; - guile = guile_1_8; + guile = guile_1_8; + libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 }; log4cpp = callPackage ../development/libraries/log4cpp { }; @@ -4794,11 +4914,18 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + mesa_original = callPackage ../development/libraries/mesa { }; + mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL + else mesa_original; + mesa_drivers = mesa_original.drivers; + mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa = if stdenv.isDarwin then darwinX11AndOpenGL + else buildEnv { + name = "mesa-${mesa_noglu.version}"; + paths = [ mesa_glu mesa_noglu ]; + }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; - mesa = if stdenv.isDarwin then darwinX11AndOpenGL else - callPackage ../development/libraries/mesa { }; - metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; @@ -4995,14 +5122,14 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = callPackage ../development/libraries/poppler { - gtkSupport = true; - qt4Support = false; - }; + poppler = let popplers = callPackage ../development/libraries/poppler { }; + in popplers // popplers.poppler_glib; + popplerQt4 = poppler.poppler_qt4; - popplerQt4 = poppler.override { - gtkSupport = false; - qt4Support = true; + poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { + glibSupport = true; + gtk3Support = false; + qt4Support = false; }; popt = callPackage ../development/libraries/popt { }; @@ -5043,6 +5170,7 @@ let qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + cups = if stdenv.isLinux then cups else null; }; qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { @@ -5539,12 +5667,12 @@ let plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.6.nix { inherit pkgs; - pythonPackages = python27Packages; + pythonPackages = python26Packages; }); plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.5.nix { inherit pkgs; - pythonPackages = python27Packages; + pythonPackages = python26Packages; }); plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.0.nix { @@ -5631,9 +5759,7 @@ let sabnzbd = callPackage ../servers/sabnzbd { }; - bind = callPackage ../servers/dns/bind { - inherit openssl libtool perl; - }; + bind = callPackage ../servers/dns/bind { }; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; @@ -5741,6 +5867,8 @@ let mongodb = callPackage ../servers/nosql/mongodb { }; + riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; + mysql4 = import ../servers/sql/mysql { inherit fetchurl stdenv ncurses zlib perl; ps = procps; /* !!! Linux only */ @@ -5863,11 +5991,12 @@ let xinetd = callPackage ../servers/xinetd { }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchsvn stdenv stdenvMulti pkgconfig freetype fontconfig - libxslt expat libdrm libpng zlib perl mesa + inherit fetchurl fetchgit stdenv stdenvMulti pkgconfig intltool freetype fontconfig + libxslt expat libdrm libpng zlib perl mesa_drivers xkeyboard_config dbus libuuid openssl gperf m4 - autoconf libtool xmlto asciidoc udev flex bison python mtdev; + autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman; automake = automake110x; + mesa = mesa_noglu; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; @@ -5880,9 +6009,7 @@ let inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib; }); - zabbix20 = recurseIntoAttrs (import ../servers/monitoring/zabbix/2.0.nix { - inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib gettext; - }); + zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; ### OS-SPECIFIC @@ -6284,6 +6411,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; sysprof = callPackage ../development/tools/profiling/sysprof { @@ -6397,7 +6526,9 @@ let nettools = callPackage ../os-specific/linux/net-tools { }; - neverball = callPackage ../games/neverball { }; + neverball = callPackage ../games/neverball { + libpng = libpng15; + }; numactl = callPackage ../os-specific/linux/numactl { }; @@ -6667,6 +6798,7 @@ let zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; + ### DATA andagii = callPackage ../data/fonts/andagii {}; @@ -6730,7 +6862,7 @@ let gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {}; + inherit (gnome3) gsettings_desktop_schemas; hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { }; @@ -6947,6 +7079,10 @@ let cgit = callPackage ../applications/version-management/git-and-tools/cgit { }; + cgminer = callPackage ../applications/misc/cgminer { + amdappsdk = amdappsdk28; + }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { xulrunner = firefox36Pkgs.xulrunner; }; @@ -6957,11 +7093,11 @@ let pulseSupport = config.pulseaudio or false; }); - chromiumBeta = chromium.override { channel = "beta"; }; - chromiumBetaWrapper = wrapChromium chromiumBeta; + chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); + chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta); - chromiumDev = chromium.override { channel = "dev"; }; - chromiumDevWrapper = wrapChromium chromiumDev; + chromiumDev = lowPrio (chromium.override { channel = "dev"; }); + chromiumDevWrapper = lowPrio (wrapChromium chromiumDev); chromiumWrapper = wrapChromium chromium; @@ -6972,7 +7108,6 @@ let compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864 - intltool = intltool_standalone; }; coriander = callPackage ../applications/video/coriander { @@ -7120,7 +7255,7 @@ let cua = callPackage ../applications/editors/emacs-modes/cua { }; - ecb = callPackage ../applications/editors/emacs-modes/ecb { }; + # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; jabber = callPackage ../applications/editors/emacs-modes/jabber { }; @@ -7132,6 +7267,8 @@ let emms = callPackage ../applications/editors/emacs-modes/emms { }; + ess = callPackage ../applications/editors/emacs-modes/ess { }; + flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; gh = callPackage ../applications/editors/emacs-modes/gh { }; @@ -7154,6 +7291,8 @@ let ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; + tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; + hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; @@ -7220,13 +7359,8 @@ let keepassx = callPackage ../applications/misc/keepassx { }; - # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide - # `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a - # higher priority. - evince = hiPrio (callPackage ../applications/misc/evince { - inherit (gnome) gnomedocutils gnomeicontheme libgnome - libgnomeui libglade scrollkeeper; - }); + inherit (gnome3) evince; + keepass = callPackage ../applications/misc/keepass { }; evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; @@ -7290,7 +7424,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox20Pkgs; + firefoxPkgs = pkgs.firefox21Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -7387,8 +7521,8 @@ let gmrun = callPackage ../applications/misc/gmrun {}; gnucash = callPackage ../applications/office/gnucash { - inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint; - gconf = gnome.GConf; + inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl; + gconf = gnome2.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; }; @@ -7583,7 +7717,12 @@ let iptraf = callPackage ../applications/networking/iptraf { }; - irssi = callPackage ../applications/networking/irc/irssi { }; + irssi = callPackage ../applications/networking/irc/irssi { + # compile with gccApple on darwin to support the -no-cpp-precompile flag + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; @@ -7614,7 +7753,7 @@ let jwm = callPackage ../applications/window-managers/jwm { }; k3d = callPackage ../applications/graphics/k3d { - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; keepnote = callPackage ../applications/office/keepnote { @@ -7666,6 +7805,7 @@ let freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; + poppler = poppler_0_18; }; lingot = callPackage ../applications/audio/lingot { @@ -7826,6 +7966,34 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { + ruby = ruby19; + hoe = rubyLibs.hoe; + }; + + ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + + smplayer = callPackage ../applications/video/smplayer { }; + + sup = callPackage ../applications/networking/mailreaders/sup { + ruby = ruby19; + + chronic = rubyLibs.chronic; + gettext = rubyLibs.gettext; + gpgme = ruby_gpgme; + highline = rubyLibs.highline; + iconv = rubyLibs.iconv; + locale = rubyLibs.locale; + lockfile = rubyLibs.lockfile; + mime_types = rubyLibs.mime_types; + ncursesw_sup = ruby_ncursesw_sup; + rake = rubyLibs.rake_10_0_4; + rmail = rubyLibs.rmail; + text = rubyLibs.text; + trollop = rubyLibs.trollop; + xapian_ruby = rubyLibs.xapian_ruby; + }; + msmtp = callPackage ../applications/networking/msmtp { }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -7916,6 +8084,8 @@ let pdftk = callPackage ../tools/typesetting/pdftk { }; + pianobar = callPackage ../applications/audio/pianobar { }; + pianobooster = callPackage ../applications/audio/pianobooster { }; picard = callPackage ../applications/audio/picard { }; @@ -8214,7 +8384,13 @@ let trayer = callPackage ../applications/window-managers/trayer { }; - tree = callPackage ../tools/system/tree { }; + tree = callPackage ../tools/system/tree { + # use gccApple to compile on darwin as the configure script adds a + # -no-cpp-precomp flag, which is not compatible with the default gcc + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; tribler = callPackage ../applications/networking/p2p/tribler { }; @@ -8261,19 +8437,24 @@ let vimHugeX = vim_configurable; - vim_configurable = import ../applications/editors/vim/configurable.nix { - inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib config; - inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; - inherit (pkgs) glib gtk; + vim_configurable = callPackage ../applications/editors/vim/configurable.nix { + inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext + composableDerivation lib config glib gtk python perl tcl ruby; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu + libICE; + features = "huge"; # one of tiny, small, normal, big or huge - # optional features by passing - # python - # TODO mzschemeinterp perlinterp - inherit (pkgs) python perl tcl ruby /*x11*/; lua = pkgs.lua5; + gui = config.vim.gui or "auto"; + # optional features by flags flags = [ "python" "X11" ]; # only flag "X11" by now + + # so that we can use gccApple if we're building on darwin + inherit stdenvAdapters gccApple; }; + vimLatest = vim_configurable.override { source = "latest"; }; + vimNox = vim_configurable.override { source = "vim-nox"; }; virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { @@ -8308,6 +8489,14 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; + weston = callPackage ../applications/window-managers/weston { + cairo = cairo.override { + glSupport = true; + }; + }; + + winswitch = callPackage ../tools/X11/winswitch { }; + wings = callPackage ../applications/graphics/wings { erlang = erlangR14B04; esdl = esdl.override { erlang = erlangR14B04; }; @@ -8482,6 +8671,7 @@ let zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + ### GAMES alienarena = callPackage ../games/alienarena { }; @@ -8777,7 +8967,6 @@ let ### DESKTOP ENVIRONMENTS - enlightenment = callPackage ../desktops/enlightenment { }; e17 = recurseIntoAttrs ( @@ -8793,6 +8982,11 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; + gnome3 = callPackage ../desktops/gnome-3 { + callPackage = pkgs.newScope pkgs.gnome3; + self = pkgs.gnome3; + }; + gnome = recurseIntoAttrs gnome2; kde4 = recurseIntoAttrs pkgs.kde48; @@ -8940,9 +9134,12 @@ let oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; + gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; + xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); + ### SCIENCE celestia = callPackage ../applications/science/astronomy/celestia { @@ -8962,6 +9159,7 @@ let stellarium = callPackage ../applications/science/astronomy/stellarium { }; + ### SCIENCE/GEOMETRY drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { @@ -9044,6 +9242,7 @@ let cmake = cmakeCurses; }); + ### SCIENCE/LOGIC coq = callPackage ../applications/science/logic/coq { @@ -9120,6 +9319,7 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + ### SCIENCE / ELECTRONICS eagle = callPackage_i686 ../applications/science/electronics/eagle { }; @@ -9170,8 +9370,11 @@ let msieve = callPackage ../applications/science/math/msieve { }; + weka = callPackage ../applications/science/math/weka { }; + yacas = callPackage ../applications/science/math/yacas { }; + ### SCIENCE / MISC boinc = callPackage ../applications/science/misc/boinc { }; @@ -9184,6 +9387,7 @@ let vite = callPackage ../applications/science/misc/vite { }; + ### MISC atari800 = callPackage ../misc/emulators/atari800 { }; @@ -9287,6 +9491,8 @@ let }; */ + nixops = callPackage ../tools/package-management/nixops { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -9394,7 +9600,8 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 ]; + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 + texLiveModerntimeline ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -9442,12 +9649,18 @@ let inherit texLive unzip; }; + texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) { + inherit texLive unzip; + }; + thinkfan = callPackage ../tools/system/thinkfan { }; vice = callPackage ../misc/emulators/vice { }; viewnior = callPackage ../applications/graphics/viewnior { }; + vimPlugins = callPackage ../misc/vim-plugins { }; + vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { inherit (gnome) libsoup; webkit = webkit_gtk2; @@ -9486,6 +9699,28 @@ let inherit (stdenv) mkDerivation; }; + # patoline requires a rather large ocaml compilation environment. + # this is why it is build as an environment and not just a normal package. + # remark : the emacs mode is also installed, but you have to adjust your load-path. + PatolineEnv = pack: myEnvFun { + name = "patoline"; + buildInputs = [ stdenv ncurses mesa freeglut libzip gcc + pack.ocaml pack.findlib pack.camomile + pack.dypgen pack.ocaml_sqlite3 pack.camlzip + pack.lablgtk pack.camlimages pack.ocaml_cairo + pack.lablgl pack.ocamlnet pack.cryptokit + pack.ocaml_pcre pack.patoline + ]; + # this is to circumvent the bug with libgcc_s.so.1 which is + # not found when using thread + extraCmds = '' + LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib + export LD_LIBRARY_PATH + ''; + }; + + patoline = PatolineEnv ocamlPackages_4_00_1; + znc = callPackage ../applications/networking/znc { }; zsnes = callPackage_i686 ../misc/emulators/zsnes { |