diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 358 |
1 files changed, 158 insertions, 200 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b3da9ea1ee..f2e3f1f2bfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,8 +161,7 @@ let ### Symbolic names. - - x11 = xlibsWrapper; + x11 = if stdenv.isDarwin then darwinX11AndOpenGL else xlibsWrapper; # `xlibs' is the set of X library components. This used to be the # old modular X llibraries project (called `xlibs') but now it's just @@ -230,7 +229,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc43_multi + overrideGCC stdenv gcc46_multi else stdenv); @@ -420,6 +419,8 @@ let pkgs_i686 = pkgsi686Linux; }; + apg = callPackage ../tools/security/apg { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = import ../development/mobile/titaniumenv { @@ -724,9 +725,9 @@ let fakeroot = callPackage ../tools/system/fakeroot { }; - fcron = callPackage ../tools/system/fcron { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; - fdisk = callPackage ../tools/system/fdisk { }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; @@ -760,6 +761,8 @@ let fox = callPackage ../development/libraries/fox/default.nix { }; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; + fping = callPackage ../tools/networking/fping {}; + fprot = callPackage ../tools/security/fprot { }; freeipmi = callPackage ../tools/system/freeipmi {}; @@ -812,6 +815,10 @@ let inherit (xorg) libXpm; }; + gnufdisk = callPackage ../tools/system/fdisk { + guile = guile_1_8; + }; + gnugrep = # Use libiconv only on non-GNU platforms (we can't test with # `stdenv ? glibc' at this point.) @@ -888,6 +895,8 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gummiboot = callPackage ../tools/misc/gummiboot { }; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; @@ -1060,6 +1069,8 @@ let lxc = callPackage ../os-specific/linux/lxc { }; + lzip = callPackage ../tools/compression/lzip { }; + lzma = xz; xz = callPackage ../tools/compression/xz { }; @@ -1096,6 +1107,8 @@ let minecraft = callPackage ../games/minecraft { }; + minetest = callPackage ../games/minetest { }; + miniupnpc = callPackage ../tools/networking/miniupnpc { }; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -1203,8 +1216,6 @@ let inherit (pythonPackages) pysqlite; }; - nss_myhostname = callPackage ../tools/networking/nss-myhostname {}; - nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; @@ -1240,10 +1251,7 @@ let opendkim = callPackage ../development/libraries/opendkim { }; - openjade = callPackage ../tools/text/sgml/openjade { - stdenv = overrideGCC stdenv gcc33; - opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; }; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; @@ -1284,7 +1292,6 @@ let patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { hurd = null; }; - parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { hurd = null; }; hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" @@ -1361,6 +1368,8 @@ let libpng = libpng12; }; + podiff = callPackage ../tools/text/podiff { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; @@ -2129,6 +2138,13 @@ let binutilsCross = null; })); + gcc46_multi = if system == "x86_64-linux" then lowPrio ( + wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); + profiledCompiler = false; + enableMultilib = true; + })) else throw "Multilib gcc not supported on this system"; + gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; # I'm not sure if profiling with enableParallelBuilding helps a lot. @@ -2387,25 +2403,26 @@ let # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; - haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); + haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6121 = haskell.packages_ghc6121; haskellPackages_ghc6122 = haskell.packages_ghc6122; - haskellPackages_ghc6123 = recurseIntoAttrs (haskell.packages_ghc6123); + haskellPackages_ghc6123 = haskell.packages_ghc6123; haskellPackages_ghc701 = haskell.packages_ghc701; haskellPackages_ghc702 = haskell.packages_ghc702; haskellPackages_ghc703 = haskell.packages_ghc703; - haskellPackages_ghc704 = recurseIntoAttrs (haskell.packages_ghc704); + haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc741 = haskell.packages_ghc741; + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); - haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); + haskellPackages_ghc761 = haskell.packages_ghc761; + haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; @@ -2426,9 +2443,6 @@ let gprolog = callPackage ../development/compilers/gprolog { }; - gwt = callPackage ../development/compilers/gwt { - libstdcpp5 = gcc33.gcc; - }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; ikarus = callPackage ../development/compilers/ikarus { }; @@ -2481,7 +2495,7 @@ let jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { - pcre = pcre_8_30; + pcre = pcre_8_31; liblapack = liblapack.override {shared = true;}; fftw = fftw.override {pthreads = true;}; fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; @@ -2654,7 +2668,7 @@ let stalin = callPackage ../development/compilers/stalin { }; - strategoPackages = strategoPackages018; + strategoPackages = recurseIntoAttrs strategoPackages018; strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix { stdenv = overrideInStdenv stdenv [gnumake380]; @@ -2762,6 +2776,8 @@ let clojure = callPackage ../development/interpreters/clojure { }; + clojureUnstable = callPackage ../development/interpreters/clojure { version = "1.5.0-RC1"; }; + clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { }; clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix { @@ -2848,6 +2864,7 @@ let python3 = python32; python32 = callPackage ../development/interpreters/python/3.2 { }; + python33 = callPackage ../development/interpreters/python/3.3 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { }; @@ -3320,6 +3337,8 @@ let swigWithJava = swig; + swfmill = callPackage ../tools/video/swfmill { }; + swftools = callPackage ../tools/video/swftools { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; @@ -3424,17 +3443,13 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; boost144 = callPackage ../development/libraries/boost/1.44.nix { }; - boost146 = callPackage ../development/libraries/boost/1.46.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; - boost151 = callPackage ../development/libraries/boost/1.51.nix { }; - boost152 = callPackage ../development/libraries/boost/1.52.nix { }; - boost = boost152; + boost153 = callPackage ../development/libraries/boost/1.53.nix { }; + boost = boost153; - boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; - boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; - boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; - boostHeaders = boostHeaders152; + boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; + boostHeaders = boostHeaders153; botan = callPackage ../development/libraries/botan { }; @@ -3657,7 +3672,8 @@ let freealut = callPackage ../development/libraries/freealut { }; - freeglut = callPackage ../development/libraries/freeglut { }; + freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/freeglut { }; freetype = callPackage ../development/libraries/freetype { }; @@ -3845,7 +3861,7 @@ let libart = gnome.libart_lgpl; }; - goffice_0_9 = callPackage ../development/libraries/goffice/0.9.nix { + goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix { inherit (gnome) libglade libgnomeui; gconf = gnome.GConf; libart = gnome.libart_lgpl; @@ -3930,25 +3946,30 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib/2.34.x.nix { }; + glib = callPackage ../development/libraries/glib { }; glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; glib_networking = callPackage ../development/libraries/glib-networking {}; - atk = callPackage ../development/libraries/atk/2.6.x.nix { }; + atk = callPackage ../development/libraries/atk { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; - cairo = callPackage ../development/libraries/cairo { }; + cairo = callPackage ../development/libraries/cairo { + pixman = pixman_cairo; # it's recommended to be in sync + }; + pixman_cairo = callPackage ../development/libraries/pixman { }; - pango = callPackage ../development/libraries/pango/1.30.x.nix { }; + pango = callPackage ../development/libraries/pango { }; 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 { }; - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + + gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { }; gtk = pkgs.gtk2; @@ -4039,8 +4060,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 { }; @@ -4197,6 +4217,8 @@ let libdwarf = callPackage ../development/libraries/libdwarf { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libebml = callPackage ../development/libraries/libebml { }; libedit = callPackage ../development/libraries/libedit { }; @@ -4334,9 +4356,9 @@ let libiptcdata = callPackage ../development/libraries/libiptcdata { }; - libjpeg = callPackage ../development/libraries/libjpeg { }; - + libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg = libjpeg_turbo; libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -4427,6 +4449,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 { }; @@ -4481,6 +4506,8 @@ let libungif = callPackage ../development/libraries/giflib/libungif.nix { }; + libunique = callPackage ../development/libraries/libunique/default.nix { }; + libusb = callPackage ../development/libraries/libusb { }; libusb1 = callPackage ../development/libraries/libusb1 { }; @@ -4493,7 +4520,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 { }; @@ -4572,13 +4599,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 }; log4cxx = callPackage ../development/libraries/log4cxx { }; @@ -4596,7 +4624,10 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa = callPackage ../development/libraries/mesa { }; + mesa_noglu = callPackage ../development/libraries/mesa { }; + mesa = if stdenv.isDarwin then darwinX11AndOpenGL + else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h + darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; mesa90x = callPackage ../development/libraries/mesa/9.0.x.nix { }; @@ -4621,7 +4652,9 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt = callPackage ../development/libraries/mlt { + ffmpeg = ffmpeg_1_1; + }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -4776,6 +4809,10 @@ let unicodeSupport = config.pcre.unicode or true; }; + pcre_8_31 = callPackage ../development/libraries/pcre/8.31.nix { + unicodeSupport = config.pcre.unicode or true; + }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon { }; @@ -4802,6 +4839,10 @@ let gtkSupport = true; qt4Support = false; }; + poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { + gtkSupport = true; + qt4Support = false; + }; popplerQt4 = poppler.override { gtkSupport = false; @@ -4843,8 +4884,6 @@ let qt4 = pkgs.kde4.qt4; - qt47 = callPackage ../development/libraries/qt-4.x/4.7 { }; - qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; @@ -5065,6 +5104,10 @@ let ucommon = callPackage ../development/libraries/ucommon { }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; + vamp = callPackage ../development/libraries/audio/vamp { }; vcdimager = callPackage ../development/libraries/vcdimager { }; @@ -5326,6 +5369,11 @@ let python = python27; }); + plone42Packages = recurseIntoAttrs (import ../development/web/plone { + inherit pkgs buildPythonPackage; + python = python27; + }); + foursuite = callPackage ../development/python-modules/4suite { }; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; @@ -5481,6 +5529,8 @@ let nginx = callPackage ../servers/http/nginx { }; + petidomo = callPackage ../servers/mail/petidomo { }; + popa3d = callPackage ../servers/mail/popa3d { }; postfix = callPackage ../servers/mail/postfix { }; @@ -5675,6 +5725,7 @@ let alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; + alsaOss = callPackage ../os-specific/linux/alsa-oss { }; microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { }; @@ -5885,18 +5936,6 @@ let ]; }; - linux_2_6_32_xen = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32-xen.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout_2_6_29 - kernelPatches.no_xsave - kernelPatches.dell_rfkill - ]; - }; - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5928,15 +5967,6 @@ let ]; }; - linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_1 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5953,15 +5983,6 @@ let ''; }; - linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_3 - ]; - }; - linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5974,34 +5995,6 @@ let ]; }; - linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_5 - kernelPatches.perf3_5 - kernelPatches.cifs_timeout_3_5_7 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_6 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6099,10 +6092,6 @@ let */ ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - ov511 = callPackage ../os-specific/linux/ov511 { - stdenv = overrideGCC stdenv gcc34; - }; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; @@ -6132,16 +6121,11 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); - linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen; linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); - linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); - linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); - linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); - linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7); # The current default kernel / kernel modules. @@ -6212,15 +6196,13 @@ let inherit stdenv module_init_tools modules buildEnv; }; - modutils = callPackage ../os-specific/linux/modutils { - stdenv = overrideGCC stdenv gcc34; - }; - multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; nettools = callPackage ../os-specific/linux/net-tools { }; - neverball = callPackage ../games/neverball { }; + neverball = callPackage ../games/neverball { + libpng = libpng15; + }; numactl = callPackage ../os-specific/linux/numactl { }; @@ -6715,7 +6697,7 @@ let }; blender = callPackage ../applications/misc/blender { - python = python32; + python = python33; # 2.65a doesn't accept lower }; bristol = callPackage ../applications/audio/bristol { }; @@ -6774,7 +6756,6 @@ let compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2; - intltool = intltool_standalone; }; coriander = callPackage ../applications/video/coriander { @@ -6810,7 +6791,14 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = lib.setName "darcs-${haskellPackages.darcs.version}" haskellPackages.darcs; + darcs = haskellPackages.darcs.override { + # A variant of the Darcs derivation that containts only the executable and + # thus has no dependencies on other Haskell packages. + cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { + isLibrary = false; + configureFlags = "-f-library"; }); }.final; + }; + }; darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; @@ -7034,6 +7022,7 @@ let evince = hiPrio (callPackage ../applications/misc/evince { inherit (gnome) gnomedocutils gnomeicontheme libgnome libgnomeui libglade scrollkeeper; + poppler = poppler_0_18; }); evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; @@ -7074,6 +7063,10 @@ let inherit (gnome) libgnome libgnomeui vte; }; + guitarix = callPackage ../applications/audio/guitarix { + fftw = fftwSinglePrec; + }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { }; @@ -7176,8 +7169,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; }; }; @@ -7206,7 +7199,7 @@ let }; gnumeric = callPackage ../applications/office/gnumeric { - goffice = goffice_0_9; + goffice = goffice_0_10; inherit (gnome) libglade scrollkeeper; }; @@ -7428,7 +7421,7 @@ let librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; - libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { + libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; @@ -7439,6 +7432,7 @@ let freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; + poppler = poppler_0_18; }; lingot = callPackage ../applications/audio/lingot { @@ -7488,9 +7482,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; - meshlab = callPackage ../applications/graphics/meshlab { - qt = qt47; - }; + meshlab = callPackage ../applications/graphics/meshlab { }; mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; @@ -7531,6 +7523,7 @@ let monotone = callPackage ../applications/version-management/monotone { lua = lua5; + boost = boost149; }; monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { @@ -7564,6 +7557,10 @@ let pulseSupport = config.pulseaudio or false; }; + mplayer2 = callPackage ../applications/video/mplayer2 { + ffmpeg = ffmpeg_1_1; + }; + MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; @@ -7639,14 +7636,6 @@ let openjump = callPackage ../applications/misc/openjump { }; - openoffice = callPackage ../applications/office/openoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2; - neon = neon029; - libwpd = libwpd_08; - zip = zip.override { enableNLS = false; }; - }; - openscad = callPackage ../applications/graphics/openscad {}; opera = callPackage ../applications/networking/browsers/opera { @@ -7726,9 +7715,7 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qemu = callPackage ../applications/virtualization/qemu/0.15.nix { }; - - qemu_1_0 = callPackage ../applications/virtualization/qemu/1.0.nix { }; + qemu = callPackage ../applications/virtualization/qemu { }; qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; @@ -7759,10 +7746,6 @@ let rdesktop = callPackage ../applications/networking/remote/rdesktop { }; - RealPlayer = callPackage_i686 ../applications/video/RealPlayer { - libstdcpp5 = gcc33.gcc; - }; - recode = callPackage ../tools/text/recode { }; retroshare = callPackage ../applications/networking/p2p/retroshare { @@ -7804,7 +7787,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = config.pulseaudio or false; # disabled by default (the 100% cpu bug) + usePulseAudio = config.pulseaudio or true; }; st = callPackage ../applications/misc/st { }; @@ -7904,11 +7887,7 @@ let teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { - # KDE support is not working yet. - inherit (kde3) kdelibs kdebase; - withKde = config.taskJuggler.kde or false; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -8081,20 +8060,18 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: + let + cfg = stdenv.lib.attrByPath [ browserName ] {} config; + enableAdobeFlash = cfg.enableAdobeFlash or true; + enableGnash = cfg.enableGnash or false; + in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = - let - cfg = stdenv.lib.attrByPath [ browserName ] {} config; - enableAdobeFlash = cfg.enableAdobeFlash or true; - enableGnash = cfg.enableGnash or false; - in assert !(enableGnash && enableAdobeFlash); ([ ] ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer - # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && cfg.enableRealPlayer or false) RealPlayer ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer @@ -8102,7 +8079,7 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ); libs = - if config.browserName.enableQuakeLive or false + if cfg.enableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; }; @@ -8143,9 +8120,7 @@ let xfe = callPackage ../applications/misc/xfe { }; - xfig = callPackage ../applications/graphics/xfig { - stdenv = overrideGCC stdenv gcc34; - }; + xfig = callPackage ../applications/graphics/xfig { }; xineUI = callPackage ../applications/video/xine-ui { }; @@ -8306,10 +8281,7 @@ let gnugo = callPackage ../games/gnugo { }; - gparted = callPackage ../tools/misc/gparted { - parted = parted_2_3; - inherit (gnome) gnomedocutils; - }; + gparted = callPackage ../tools/misc/gparted { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { inherit (gnome) libglademm; @@ -8395,10 +8367,6 @@ let simutrans = callPackage ../games/simutrans { }; - six = callPackage ../games/six { - inherit (kde3) arts kdelibs; - }; - soi = callPackage ../games/soi {}; # You still can override by passing more arguments. @@ -8443,10 +8411,7 @@ let trigger = callPackage ../games/trigger { }; - ufoai = callPackage ../games/ufoai { - inherit (gnome) gtksourceview gtkglext; - libpng = libpng12; - }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; @@ -8464,6 +8429,8 @@ let vectoroids = callPackage ../games/vectoroids { }; + vessel = callPackage_i686 ../games/vessel { }; + warmux = callPackage ../games/warmux { }; warsow = callPackage ../games/warsow { @@ -8509,10 +8476,10 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - # e17 = recurseIntoAttrs ( - # let callPackage = newScope pkgs.e17; in - # import ../desktops/e17 { inherit callPackage pkgs; } - # ); + e17 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e17; in + import ../desktops/e17 { inherit callPackage pkgs; } + ); gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; @@ -8524,18 +8491,6 @@ let gnome = recurseIntoAttrs gnome2; - kde3 = recurseIntoAttrs { - - kdelibs = callPackage ../desktops/kde-3/kdelibs { - stdenv = overrideGCC stdenv gcc43; - }; - - arts = callPackage ../development/libraries/arts { - inherit (pkgs.kde3) kdelibs; - }; - - }; - kde4 = recurseIntoAttrs pkgs.kde47; kde47 = kdePackagesFor (pkgs.kde47 // { @@ -8674,12 +8629,9 @@ let oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; - xfce = xfce48; - - xfce48 = recurseIntoAttrs - (let callPackage = newScope pkgs.xfce48; in - import ../desktops/xfce-4.8 { inherit callPackage pkgs; }); - + xfce = xfce4_10; + xfce4_08 = recurseIntoAttrs (import ../desktops/xfce/4_08.nix { inherit pkgs newScope; }); + xfce4_10 = recurseIntoAttrs (import ../desktops/xfce/4_10.nix { inherit pkgs newScope; }); ### SCIENCE @@ -9113,7 +9065,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa ]; + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -9177,6 +9129,12 @@ let # Wine cannot be built in 64-bit; use a 32-bit build instead. wine = callPackage_i686 ../misc/emulators/wine { }; + # winetricks is a shell script with no binary components. Safe to just use the current platforms + # build instead of the i686 specific build. + winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + inherit (gnome2) zenity; + }; + x2x = callPackage ../tools/X11/x2x { }; xosd = callPackage ../misc/xosd { }; |