diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 214 |
1 files changed, 118 insertions, 96 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97ef1d4f71ea6..2963030770779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -348,10 +348,9 @@ let makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; - makeModulesClosure = {kernel, rootModules, allowMissing ? false}: + makeModulesClosure = { kernel, rootModules, allowMissing ? false }: import ../build-support/kernel/modules-closure.nix { - inherit stdenv module_init_tools kernel nukeReferences - rootModules allowMissing; + inherit stdenv kmod kernel nukeReferences rootModules allowMissing; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -387,6 +386,9 @@ let acct = callPackage ../tools/system/acct { }; + acoustidFingerprinter = callPackage + ../tools/audio/acoustid-fingerprinter { }; + aefs = callPackage ../tools/filesystems/aefs { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -448,8 +450,12 @@ let apg = callPackage ../tools/security/apg { }; + grc = callPackage ../tools/misc/grc { }; + otool = callPackage ../os-specific/darwin/otool { }; + pass = callPackage ../tools/security/pass { }; + setfile = callPackage ../os-specific/darwin/setfile { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; @@ -519,6 +525,8 @@ let btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + bwm_ng = callPackage ../tools/networking/bwm-ng { }; + byobu = callPackage ../tools/misc/byobu { }; catdoc = callPackage ../tools/text/catdoc { }; @@ -755,6 +763,8 @@ let gnupg = gnupg1; }; + duply = callPackage ../tools/backup/duply { }; + dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { }; dvgrab = callPackage ../tools/video/dvgrab { }; @@ -826,6 +836,8 @@ let fio = callPackage ../tools/system/fio { }; + flpsed = callPackage ../applications/editors/flpsed { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -1339,6 +1351,8 @@ let newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + mpack = callPackage ../tools/networking/mpack { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; @@ -1406,11 +1420,14 @@ let opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { }; - openssh = callPackage ../tools/networking/openssh { - hpnSupport = false; - etcDir = "/etc/ssh"; - pam = if stdenv.isLinux then pam else null; - }; + openssh = + callPackage ../tools/networking/openssh { + hpnSupport = false; + withKerberos = false; + etcDir = "/etc/ssh"; + pam = if stdenv.isLinux then pam else null; + }; + openssh_with_kerberos = lowPrio (pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; })); opensp = callPackage ../tools/text/sgml/opensp { }; @@ -1523,6 +1540,8 @@ let polkit_gnome = callPackage ../tools/security/polkit-gnome { }; + ponysay = callPackage ../tools/misc/ponysay { }; + povray = callPackage ../tools/graphics/povray { }; ppl = callPackage ../development/libraries/ppl { }; @@ -1777,12 +1796,16 @@ let guile = guile_1_8; }; + tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; }; + tinc = callPackage ../tools/networking/tinc { }; tmux = callPackage ../tools/misc/tmux { }; tor = callPackage ../tools/security/tor { }; + torbutton = callPackage ../tools/security/torbutton { }; + torsocks = callPackage ../tools/security/tor/torsocks.nix { }; trickle = callPackage ../tools/networking/trickle {}; @@ -1825,7 +1848,7 @@ let vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - vifm = callPackage ../applications/misc/vifm {}; + vifm = callPackage ../applications/misc/vifm { }; viking = callPackage ../applications/misc/viking { inherit (gnome) scrollkeeper; @@ -2096,6 +2119,8 @@ let aspectj = callPackage ../development/compilers/aspectj { }; + avra = callPackage ../development/compilers/avra { }; + bigloo = callPackage ../development/compilers/bigloo { }; chicken = callPackage ../development/compilers/chicken { }; @@ -2756,6 +2781,8 @@ let ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; + orc = callPackage ../development/compilers/orc { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; @@ -3029,7 +3056,12 @@ let erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlang = erlangR15B03; + erlangR16B01 = callPackage ../development/interpreters/erlang/R16B01.nix { }; + erlang = erlangR16B01; + + rebar = callPackage ../development/tools/build-managers/rebar { }; + + elixir = callPackage ../development/interpreters/elixir { }; groovy = callPackage ../development/interpreters/groovy { }; @@ -3149,9 +3181,7 @@ let qi = callPackage ../development/compilers/qi { }; - racket = callPackage ../development/interpreters/racket { - libpng = libpng15; - }; + racket = callPackage ../development/interpreters/racket { }; regina = callPackage ../development/interpreters/regina {}; @@ -3297,6 +3327,8 @@ let avarice = callPackage ../development/tools/misc/avarice { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; + bam = callPackage ../development/tools/build-managers/bam {}; binutils = callPackage ../development/tools/misc/binutils { @@ -3319,7 +3351,9 @@ let cross = assert crossSystem != null; crossSystem; })); - bison = callPackage ../development/tools/parsing/bison { }; + bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; + bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { }); + bison = bison2; buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate; @@ -3535,6 +3569,12 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; + lttngTools = callPackage ../development/tools/misc/lttng-tools { }; + + lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + + lttv = callPackage ../development/tools/misc/lttv { }; + mk = callPackage ../development/tools/build-managers/mk { }; neoload = callPackage ../development/tools/neoload { @@ -3760,7 +3800,9 @@ let bwidget = callPackage ../development/libraries/bwidget { }; - c-ares = callPackage ../development/libraries/c-ares { }; + c-ares = callPackage ../development/libraries/c-ares { + fetchurl = fetchurlBoot; + }; caelum = callPackage ../development/libraries/caelum { }; @@ -3786,6 +3828,8 @@ let chmlib = callPackage ../development/libraries/chmlib { }; + chromaprint = callPackage ../development/libraries/chromaprint { }; + cil = callPackage ../development/libraries/cil { }; cilaterm = callPackage ../development/libraries/cil-aterm { @@ -4060,6 +4104,12 @@ let gccCross = null; }; + glibc_memusage = callPackage ../development/libraries/glibc/2.17 { + kernelHeaders = linuxHeaders; + installLocales = false; + withGd = true; + }; + glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17) (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; in { @@ -4254,7 +4304,9 @@ let cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; - pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; + pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { + cairo = cairo_1_12_2; + }; pangox_compat = callPackage ../development/libraries/pangox-compat { }; @@ -4838,6 +4890,8 @@ let libtunepimp = callPackage ../development/libraries/libtunepimp { }; + libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; + libgeotiff = callPackage ../development/libraries/libgeotiff { }; libunistring = callPackage ../development/libraries/libunistring { }; @@ -4850,6 +4904,8 @@ let libunique = callPackage ../development/libraries/libunique/default.nix { }; + liburcu = callPackage ../development/libraries/liburcu { }; + libusb = callPackage ../development/libraries/libusb { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple @@ -4876,6 +4932,8 @@ let libvisio = callPackage ../development/libraries/libvisio { }; + libvisual = callPackage ../development/libraries/libvisual { }; + libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { inherit libtool libjpeg openssl zlib; inherit (xlibs) xproto libX11 damageproto libXdamage @@ -5231,6 +5289,8 @@ let ptlib = callPackage ../development/libraries/ptlib {}; + re2 = callPackage ../development/libraries/re2 { }; + qca2 = callPackage ../development/libraries/qca2 {}; qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; @@ -5777,21 +5837,6 @@ let python = pypy; }); - plone41Packages = import ../development/web/plone/4.1.nix { - inherit pkgs; - pythonPackages = python26Packages; - }; - - plone42Packages = import ../development/web/plone/4.2.nix { - inherit pkgs; - pythonPackages = python26Packages; - }; - - plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix { - inherit pkgs; - pythonPackages = python27Packages; - }); - foursuite = callPackage ../development/python-modules/4suite { }; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; @@ -5902,6 +5947,8 @@ let dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; + diod = callPackage ../servers/diod { }; + dovecot = dovecot21; dovecot21 = callPackage ../servers/mail/dovecot { }; @@ -6153,7 +6200,7 @@ let afuse = callPackage ../os-specific/linux/afuse { }; - amdUcode = callPackage ../os-specific/linux/firmware/amd-ucode { }; + amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { }; autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; @@ -6194,8 +6241,6 @@ let batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; - bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; - bluez4 = callPackage ../os-specific/linux/bluez { pygobject = pygobject3; }; @@ -6308,30 +6353,8 @@ let iptables = callPackage ../os-specific/linux/iptables { }; - ipw2100fw = callPackage ../os-specific/linux/firmware/ipw2100 { }; - - ipw2200fw = callPackage ../os-specific/linux/firmware/ipw2200 { }; - iw = callPackage ../os-specific/linux/iw { }; - iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { }; - - iwlwifi2030ucode = callPackage ../os-specific/linux/firmware/iwlwifi-2030-ucode { }; - - iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; - - iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { }; - - iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { }; - - iwlwifi5150ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5150-ucode { }; - - iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { }; - - iwlwifi6000g2aucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { }; - - iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { }; - jujuutils = callPackage ../os-specific/linux/jujuutils { }; kbd = callPackage ../os-specific/linux/kbd { }; @@ -6375,7 +6398,7 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_0 @@ -6383,7 +6406,7 @@ let }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 @@ -6391,7 +6414,7 @@ let }; linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ]; })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); linux_3_2_apparmor = lowPrio (linux_3_2.override { @@ -6409,7 +6432,7 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_4 @@ -6428,23 +6451,11 @@ let }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; - }; - - linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; }; linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6456,7 +6467,7 @@ let }; linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6514,7 +6525,7 @@ let iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; - iwlwifi4965ucode = iwlwifi4965ucodeV2; + lttngModules = callPackage ../os-specific/linux/lttng-modules { }; atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; @@ -6586,7 +6597,6 @@ let linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); - linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); # Update this when adding a new version! @@ -6658,8 +6668,8 @@ let mountall = callPackage ../os-specific/linux/mountall { }; aggregateModules = modules: - import ../os-specific/linux/module-init-tools/aggregator.nix { - inherit stdenv module_init_tools modules buildEnv; + callPackage ../os-specific/linux/kmod/aggregator.nix { + inherit modules; }; multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; @@ -6729,10 +6739,6 @@ let radeontools = callPackage ../os-specific/linux/radeontools { }; - radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { }; - radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { }; - radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { }; - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -6741,18 +6747,8 @@ let rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; - ralink_fw = callPackage ../os-specific/linux/firmware/ralink { }; - - rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; - - rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; - rtkit = callPackage ../os-specific/linux/rtkit { }; - rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; - - rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { }; - sdparm = callPackage ../os-specific/linux/sdparm { }; sepolgen = callPackage ../os-specific/linux/sepolgen { }; @@ -7000,7 +6996,7 @@ let inherit (gnome3) gsettings_desktop_schemas; - hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { }; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; @@ -7046,6 +7042,8 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; + themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { inherit fetchurl; }; @@ -7265,6 +7263,11 @@ let comical = callPackage ../applications/graphics/comical { }; conkeror = callPackage ../applications/networking/browsers/conkeror { }; + conkerorWrapper = wrapFirefox { + browser = conkeror; + browserName = "conkeror"; + desktopName = "Conkeror"; + }; cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) { inherit cmake patchelf; @@ -8009,7 +8012,7 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify - vala dbus_glib; + vala dbus_glib glib_networking; inherit gtk3 glib; inherit (gnome) gtksourceview; inherit (webkit.passthru.args) libsoup; @@ -8185,6 +8188,8 @@ let nvi = callPackage ../applications/editors/nvi { }; + nvpy = callPackage ../applications/editors/nvpy { }; + ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; @@ -8620,7 +8625,7 @@ let # so that we can use gccApple if we're building on darwin inherit stdenvAdapters gccApple; }; - vimLatest = lowPrio (vim_configurable.override { source = "latest"; }); + vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; @@ -8662,6 +8667,8 @@ let }; }; + windowmaker = callPackage ../applications/window-managers/windowmaker { }; + winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { @@ -8797,6 +8804,8 @@ let xpra = callPackage ../tools/X11/xpra { }; + xrestop = callPackage ../tools/X11/xrestop { }; + xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome) libglade; }; @@ -9039,6 +9048,8 @@ let stardust = callPackage ../games/stardust {}; + steam = callPackage_i686 ../games/steam {}; + stuntrally = callPackage ../games/stuntrally { }; superTux = callPackage ../games/super-tux { }; @@ -9181,6 +9192,15 @@ let libcanberra = libcanberra_kde; }) ../desktops/kde-4.10; + kde411 = kdePackagesFor (pkgs.kde411 // { + boost = boost149; + eigen = eigen2; + libotr = libotr_3_2; + libusb = libusb1; + ffmpeg = ffmpeg_1; + libcanberra = libcanberra_kde; + }) ../desktops/kde-4.11; + kdePackagesFor = self: dir: let callPackageOrig = callPackage; in let @@ -9304,6 +9324,8 @@ let oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; + gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; + gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; xfce = xfce4_10; |