diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 321 |
1 files changed, 82 insertions, 239 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95a46c3e280b1..5fbc4794c979f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -189,7 +189,7 @@ let deepOverride = newArgs: name: x: if builtins.isAttrs x then ( if x ? deepOverride then (x.deepOverride newArgs) else - if x ? override then (x.override newArgs) else + if x ? override then (x.override newArgs) else x) else x; # usage: (you can use override multiple times) @@ -199,7 +199,7 @@ let makeOverridable = f: origArgs: f origArgs // { override = newArgs: makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); - deepOverride = newArgs: + deepOverride = newArgs: makeOverridable f ((lib.mapAttrs (deepOverride newArgs) origArgs) // newArgs); origArgs = origArgs; }; @@ -478,6 +478,10 @@ let inherit fetchurl stdenv perl; }; + bootchart = import ../tools/system/bootchart { + inherit fetchurl stdenv gnutar gzip coreutils utillinux gnugrep gnused psmisc nettools; + }; + eggdrop = import ../tools/networking/eggdrop { inherit fetchurl stdenv tcl; }; @@ -497,7 +501,7 @@ let }; asciidoc = import ../tools/typesetting/asciidoc { - inherit fetchurl stdenv bash python; + inherit fetchurl stdenv python; }; bibtextools = import ../tools/typesetting/bibtex-tools { @@ -1221,6 +1225,7 @@ let openssh = import ../tools/networking/openssh { inherit fetchurl stdenv zlib openssl pam perl; pamSupport = getPkgConfig "openssh" "pam" true; + hpnSupport = getConfig [ "openssh" "hpn" ] false; etcDir = getConfig [ "openssh" "etcDir" ] "/etc/ssh"; }; @@ -2659,6 +2664,15 @@ let inherit fetchurl stdenv; }; + camlp5_strict = import ../development/tools/ocaml/camlp5 { + inherit stdenv fetchurl ocaml; + }; + + camlp5_transitional = import ../development/tools/ocaml/camlp5 { + inherit stdenv fetchurl ocaml; + transitional = true; + }; + ccache = import ../development/tools/misc/ccache { inherit fetchurl stdenv; }; @@ -3236,8 +3250,8 @@ let inherit (xlibs) libX11 libXext xproto xextproto; }; - enchant = makeOverridable - (selectVersion ../development/libraries/enchant "1.3.0") + enchant = makeOverridable + (selectVersion ../development/libraries/enchant "1.3.0") { inherit fetchurl stdenv aspell pkgconfig; inherit (gnome) glib; @@ -3548,7 +3562,7 @@ let gtk = import ../development/libraries/gtk+/1.2.x.nix { inherit fetchurl stdenv x11 glib; }; - + }; gtkLibs216 = rec { @@ -3577,11 +3591,11 @@ let inherit fetchurl stdenv pkgconfig perl jasper x11 glib atk pango libtiff libjpeg libpng cairo xlibs; }; - + gtkmm = import ../development/libraries/gtkmm/2.14.x.nix { inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm; }; - + }; gtkLibs218 = rec { @@ -3610,11 +3624,11 @@ let inherit fetchurl stdenv pkgconfig perl jasper glib atk pango libtiff libjpeg libpng cairo xlibs cups; }; - + gtkmm = import ../development/libraries/gtkmm/2.18.x.nix { inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm; }; - + }; gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp { @@ -3702,11 +3716,15 @@ let jasper = import ../development/libraries/jasper { inherit fetchurl stdenv unzip xlibs libjpeg; }; - + jetty_gwt = import ../development/libraries/java/jetty-gwt { inherit stdenv fetchurl; }; + jetty_util = import ../development/libraries/java/jetty-util { + inherit stdenv fetchurl; + }; + lablgtk = import ../development/libraries/lablgtk { inherit fetchurl stdenv ocaml pkgconfig; inherit (gtkLibs) gtk; @@ -4476,7 +4494,7 @@ let }; sqlite = import ../development/libraries/sqlite { - inherit fetchurl stdenv readline; + inherit fetchurl stdenv readline tcl; }; stlport = import ../development/libraries/stlport { @@ -5134,13 +5152,6 @@ let inherit bleedingEdgeRepos fetchurl stdenv flex bison kernelHeaders; }; - # this creates a patch which can be applied to the kernel to integrate this module.. - kernel_module_acerhk = import ../os-specific/linux/kernel/acerhk { - inherit fetchurl stdenv gnupatch; - kernel = kernel_2_6_21; - debug = true; - }; - _915resolution = import ../os-specific/linux/915resolution { inherit fetchurl stdenv; }; @@ -5381,149 +5392,22 @@ let inherit fetchurl stdenv perl; }; - kernelHeadersArm = ( - import ../os-specific/linux/kernel-headers-cross { - inherit fetchurl stdenv; - cross = "arm-linux"; - }); + kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross { + inherit fetchurl stdenv; + cross = "arm-linux"; + }; - kernelHeadersMips = ( - import ../os-specific/linux/kernel-headers-cross { - inherit fetchurl stdenv; - cross = "mips-linux"; - }); + kernelHeadersMips = import ../os-specific/linux/kernel-headers-cross { + inherit fetchurl stdenv; + cross = "mips-linux"; + }; kernelHeadersSparc = import ../os-specific/linux/kernel-headers-cross { - inherit fetchurl stdenv; - cross = "sparc-linux"; - }; - - kernel_2_6_20 = ( - import ../os-specific/linux/kernel/linux-2.6.20.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - { name = "paravirt-nvidia"; - patch = ../os-specific/linux/kernel/2.6.20-paravirt-nvidia.patch; - } - { name = "skas-2.6.20-v9-pre9"; - patch = fetchurl { - url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v9-pre9/skas-2.6.20-v9-pre9.patch.bz2; - md5 = "02e619e5b3aaf0f9768f03ac42753e74"; - }; - extraConfig = - "CONFIG_PROC_MM=y\n" + - "# CONFIG_PROC_MM_DUMPABLE is not set\n"; - } - { name = "fbsplash-0.9.2-r5-2.6.20-rc6"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.20-rc6.patch; - sha256 = "11v4f85f4jnh9sbhqcyn47krb7l1czgzjw3w8wgbq14jm0sp9294"; - }; - extraConfig = "CONFIG_FB_SPLASH=y"; - } - ]; - }); - - kernel_2_6_21 = ( - import ../os-specific/linux/kernel/linux-2.6.21.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - /* Commented out because only acer users have need for it.. - It takes quite a while to create the patch when unpacking the kernel sources only for that task - { name = "acerhk"; - patch = kernel_module_acerhk + "/acerhk-patch.tar.bz2" ; - extraConfig = - "CONFIG_ACERHK=m\n"; - } - */ - { name = "paravirt-nvidia"; - patch = ../os-specific/linux/kernel/2.6.20-paravirt-nvidia.patch; - } - { name = "skas-2.6.20-v9-pre9"; - patch = fetchurl { - url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v9-pre9/skas-2.6.20-v9-pre9.patch.bz2; - md5 = "02e619e5b3aaf0f9768f03ac42753e74"; - }; - extraConfig = - "CONFIG_PROC_MM=y\n" + - "# CONFIG_PROC_MM_DUMPABLE is not set\n"; - } - { name = "fbsplash-0.9.2-r5-2.6.21"; - patch = fetchurl { # !!! missing! - url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.21/4200_fbsplash-0.9.2-r5.patch; - sha256 = "00s8074fzsly2zpir885zqkvq267qyzg6vhsn7n1z2v1z78avxd8"; - }; - extraConfig = "CONFIG_FB_SPLASH=y"; - } - ]; - }); - - kernel_2_6_22 = ( - import ../os-specific/linux/kernel/linux-2.6.22.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - { name = "fbsplash-0.9.2-r5-2.6.21"; - patch = fetchurl { - url = http://nixos.org/tarballs/4200_fbsplash-0.9.2-r5.patch; - sha256 = "0822wwlf2dqsap5qslnnp0yl1nbvvvb76l73w2dd8zsyn0bqg3px"; - }; - extraConfig = "CONFIG_FB_SPLASH=y"; - } - ]; - extraConfig = - lib.optional (getConfig ["kernel" "no_hz"] false) "CONFIG_NO_HZ=y" ++ - lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++ - lib.optional (getConfig ["kernel" "usb_suspend"] false) "CONFIG_USB_SUSPEND=y" ++ - lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++ - [(getConfig ["kernel" "addConfig"] "")]; - }); - - kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - /* - { # resume with resume=swap:/dev/xx - name = "tux on ice"; # (swsusp2) - patch = fetchurl { - url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc5-for-2.6.23.14.patch.bz2"; - sha256 = "187190rxbn9x1c6bwv59mwy1zhff8nn5ad58cfiz23wa5wrk4mif"; - }; - extraConfig = " - CONFIG_SUSPEND2=y - CONFIG_SUSPEND2_FILE=y - CONFIG_SUSPEND2_SWAP=y - CONFIG_CRYPTO_LZF=y - "; - } - */ - { name = "fbsplash-0.9.2-r5-2.6.21"; - patch = fetchurl { - url = http://nixos.org/tarballs/4200_fbsplash-0.9.2-r5.patch; - sha256 = "0822wwlf2dqsap5qslnnp0yl1nbvvvb76l73w2dd8zsyn0bqg3px"; - }; - extraConfig = "CONFIG_FB_SPLASH=y"; - features = { fbSplash = true; }; - } - /* !!! Not needed anymore for the NixOS LiveCD - we have AUFS. */ - { name = "unionfs-2.2.2"; - patch = fetchurl { - url = http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.2.2_for_2.6.23.13.diff.gz; - sha256 = "104hahp6fjpxwprcl2njw5mimyh442ma3cp5r1ww0mzq3vwrcdyz"; - }; - extraConfig = '' - CONFIG_UNION_FS=m - CONFIG_UNION_FS_XATTR=y - ''; - } - ]; - extraConfig = - lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++ - lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++ - [(getConfig ["kernel" "addConfig"] "")]; + inherit fetchurl stdenv; + cross = "sparc-linux"; }; - kernel_2_6_25 = ( - import ../os-specific/linux/kernel/linux-2.6.25.nix { + kernel_2_6_25 = import ../os-specific/linux/kernel/linux-2.6.25.nix { inherit fetchurl stdenv perl mktemp module_init_tools; kernelPatches = [ { name = "fbcondecor-0.9.4-2.6.25-rc6"; @@ -5543,7 +5427,7 @@ let lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++ lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++ [(getConfig ["kernel" "addConfig"] "")]; - }); + }; kernel_2_6_26 = import ../os-specific/linux/kernel/linux-2.6.26.nix { inherit fetchurl stdenv perl mktemp module_init_tools; @@ -5615,8 +5499,7 @@ let [(getConfig ["kernel" "addConfig"] "")]; }; - kernel_2_6_29 = ( - makeOverridable (import ../os-specific/linux/kernel/linux-2.6.29.nix) { + kernel_2_6_29 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.29.nix) { inherit fetchurl stdenv perl mktemp module_init_tools; kernelPatches = [ { name = "fbcondecor-0.9.5-2.6.28"; @@ -5632,69 +5515,13 @@ let features = { secPermPatch = true; }; } ]; - }); + }; kernel_2_6_31 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.31.nix) { inherit fetchurl stdenv perl mktemp module_init_tools; kernelPatches = []; }; - kernel_2_6_31_rc4 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.31-rc4.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - { name = "rc4 patch"; - patch = fetchurl { - url = "http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.31-rc4.bz2"; - sha256 = "1qyjh8gf0clj4a8aiblrn2p7244h7dp2psnidylxr2y53z2vg62s"; - }; - } - ]; - }; - - # For older x86 processors without PAE/PAT - kernel_2_6_31_rc4_old_i686 = ( - kernel_2_6_31_rc4.override { - oldI686 = true; - }); - - kernel_2_6_31_rc3 = ( - makeOverridable (import ../os-specific/linux/kernel/linux-2.6.31-rc3.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - { name = "rc3 patch"; - patch = fetchurl { - url = "http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.31-rc3.bz2"; - sha256 = "0659p61w8pgl00wh06vmmnkmpjy1ybhi6xnffq695nvsckcgjx79"; - }; - } - ]; - }); - - # For older x86 processors without PAE/PAT - kernel_2_6_31_rc3_old_i686 = ( - kernel_2_6_31_rc3.override { - oldI686 = true; - }); - - kernel_2_6_31_rc2 = ( - makeOverridable (import ../os-specific/linux/kernel/linux-2.6.31-rc2.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - { name = "rc2 patch"; - patch = fetchurl { - url = "http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.31-rc2.bz2"; - sha256 = "1xwsa9z4saz2yrsj44lcabcvqarmvrc6mgpi4xf9vlfq3pn0bfvr"; - }; - } - ]; - }); - - # For older x86 processors without PAE/PAT - kernel_2_6_31_rc2_old_i686 = ( - kernel_2_6_31_rc2.override { - oldI686 = true; - }); - kernel_2_6_31_zen5 = makeOverridable (import ../os-specific/linux/zen-kernel/zen-stable.nix) { inherit fetchurl stdenv perl mktemp module_init_tools lib builderDefs; @@ -5821,7 +5648,7 @@ let inherit (xlibs) xproto libX11 libXext libXcursor; inherit (gnome) libIDL; }; - + virtualboxGuestAdditions = import ../applications/virtualization/virtualbox/guest-additions { inherit stdenv fetchurl lib patchelf cdrkit kernel; inherit (xlibs) libX11 libXt libXext libXmu libXcomposite libXfixes; @@ -5829,21 +5656,14 @@ let }; # Build the kernel modules for the some of the kernels. - kernelPackages_2_6_23 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_23); kernelPackages_2_6_25 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_25); kernelPackages_2_6_26 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_26); kernelPackages_2_6_27 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_27); kernelPackages_2_6_28 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_28); kernelPackages_2_6_29 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_29); - kernelPackages_2_6_31_rc4 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc4); - kernelPackages_2_6_31_rc4_old_i686 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc4_old_i686); - kernelPackages_2_6_31_rc3 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc3); - kernelPackages_2_6_31_rc3_old_i686 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc3_old_i686); - kernelPackages_2_6_31_rc2 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2); - kernelPackages_2_6_31_rc2_old_i686 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2_old_i686); - kernelPackages_2_6_31_zen5 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen5); - kernelPackages_2_6_31_zen = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen); - kernelPackages_2_6_31 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31); + kernelPackages_2_6_31_zen5 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen5); + kernelPackages_2_6_31_zen = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen); + kernelPackages_2_6_31 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31); # The current default kernel / kernel modules. kernelPackages = kernelPackages_2_6_28; @@ -6140,6 +5960,10 @@ let inherit fetchurl stdenv; }; + upstart06 = import ../os-specific/linux/upstart/0.6.nix { + inherit fetchurl stdenv pkgconfig dbus expat; + }; + upstartJobControl = import ../os-specific/linux/upstart/jobcontrol.nix { inherit stdenv; }; @@ -6238,6 +6062,10 @@ let inherit fetchurl stdenv unzip; }; + docbook_xml_dtd_45 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { + inherit fetchurl stdenv unzip; + }; + docbook_xml_ebnf_dtd = import ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { inherit fetchurl stdenv unzip; }; @@ -6545,6 +6373,16 @@ let }; }; + chrome = import ../applications/networking/browsers/chromium { + inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip patchelf05; + inherit (xlibs) libX11 libXext libXrender libXt ; + inherit (gtkLibs) gtk glib pango atk; + inherit (gnome) GConf; + }; + + chromeWrapper = wrapFirefox chrome "chrome" ""; + + cinelerra = import ../applications/video/cinelerra { inherit fetchurl stdenv automake autoconf libtool @@ -6702,6 +6540,12 @@ let inherit (xlibs) libXtst; }; + eclipseNewer = import ../applications/editors/eclipse-classic { + inherit stdenv fetchurl patchelf makeDesktopItem freetype fontconfig jre; + inherit (gtkLibs) glib gtk; + inherit (xlibs) libX11 libXext libXrender libXtst; + }; + /* commenting out eclipse - Have a look at eclipseRunner - Marc Weber Reason: You can get Eclipse in many prepacked variations on eclipse.org @@ -6725,11 +6569,6 @@ let inherit (xlibs) libXtst; }); - eclipseNewer = import ../applications/editors/eclipse-classic { - inherit stdenv fetchurl patchelf makeDesktopItem freetype fontconfig jre; - inherit (gtkLibs) glib gtk; - inherit (xlibs) libX11 libXext libXrender libXtst; - }; eclipse = plugins: import ../applications/editors/eclipse { @@ -6986,12 +6825,16 @@ let flashplayer9 = ( import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { - inherit fetchurl stdenv zlib alsaLib; + inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat; + inherit (xlibs) libX11 libXext libXrender libXt ; + inherit (gtkLibs) gtk glib pango atk; }); flashplayer10 = ( import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 { - inherit fetchurl stdenv zlib alsaLib curl; + inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat; + inherit (xlibs) libX11 libXext libXrender libXt ; + inherit (gtkLibs) gtk glib pango atk; }); flite = import ../applications/misc/flite { @@ -7188,7 +7031,7 @@ let ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) { inherit fetchurl stdenv perl gettext makeWrapper lib; - inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber + inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder; inherit git; # The RCS should be optional monotone = null; @@ -7724,7 +7567,7 @@ let inherit (xlibs) xextproto libXtst inputproto; }; - tahoe = import ../tools/networking/p2p/tahoe { + tahoelafs = import ../tools/networking/p2p/tahoe-lafs { inherit fetchurl lib unzip nettools buildPythonPackage; inherit (pythonPackages) twisted foolscap simplejson nevow zfec pycryptopp pysqlite; @@ -8395,10 +8238,10 @@ let ### SCIENCE/LOGIC coq = import ../applications/science/logic/coq { - inherit fetchurl stdenv ocaml ncurses; + inherit stdenv fetchurl ocaml lablgtk ncurses; + camlp5 = camlp5_transitional; }; - ### SCIENCE / ELECTRONICS ngspice = import ../applications/science/electronics/ngspice { |