diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 502 |
1 files changed, 386 insertions, 116 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 050ba7a4fad1..3889c77b90cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -46,7 +46,7 @@ let config_ = config; platform_ = platform; in # rename the function arguments let - lib = import ../lib; + lib = import ../../lib; # The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.nixpkgs/config.nix. @@ -267,6 +267,12 @@ let inherit (pkgs) runCommand perl; }; + buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { + inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; + inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; + inherit less buildEnv; + }; + dotnetenv = import ../build-support/dotnetenv { inherit stdenv; dotnetfx = dotnetfx40; @@ -375,7 +381,7 @@ let inherit pkgs; }; - composableDerivation = (import ../lib/composable-derivation.nix) { + composableDerivation = (import ../../lib/composable-derivation.nix) { inherit pkgs lib; }; @@ -389,6 +395,8 @@ let acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { }; + actdiag = pythonPackages.actdiag; + aefs = callPackage ../tools/filesystems/aefs { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -403,6 +411,8 @@ let archivemount = callPackage ../tools/filesystems/archivemount { }; + arandr = callPackage ../tools/X11/arandr { }; + arduino_core = callPackage ../development/arduino/arduino-core { jdk = jdk; jre = jdk; @@ -487,6 +497,10 @@ let autojump = callPackage ../tools/misc/autojump { }; + autorandr = callPackage ../tools/misc/autorandr { + inherit (xorg) xrandr xdpyinfo; + }; + avahi = callPackage ../development/libraries/avahi { qt4Support = config.avahi.qt4Support or false; }; @@ -513,6 +527,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + blockdiag = pythonPackages.blockdiag; + bmon = callPackage ../tools/misc/bmon { }; boomerang = callPackage ../development/tools/boomerang { @@ -533,12 +549,16 @@ let catdoc = callPackage ../tools/text/catdoc { }; + ditaa = callPackage ../tools/graphics/ditaa { }; + dlx = callPackage ../misc/emulators/dlx { }; eggdrop = callPackage ../tools/networking/eggdrop { }; enca = callPackage ../tools/text/enca { }; + fop = callPackage ../tools/typesetting/fop { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; @@ -550,12 +570,22 @@ let mcelog = callPackage ../os-specific/linux/mcelog { }; - asciidoc = callPackage ../tools/typesetting/asciidoc { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { + inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; + enableStandardFeatures = false; + }; + + asciidocFull = appendToName "full" (asciidoc.override { + inherit (pythonPackages) pygments; + enableStandardFeatures = true; + }); autossh = callPackage ../tools/networking/autossh { }; bacula = callPackage ../tools/backup/bacula { }; + bgs = callPackage ../tools/X11/bgs { }; + bibtextools = callPackage ../tools/typesetting/bibtex-tools { inherit (strategoPackages016) strategoxt sdf; }; @@ -625,10 +655,14 @@ let ciopfs = callPackage ../tools/filesystems/ciopfs { }; + colord = callPackage ../tools/misc/colord { }; + colordiff = callPackage ../tools/text/colordiff { }; connect = callPackage ../tools/networking/connect { }; + conspy = callPackage ../os-specific/linux/conspy {}; + convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { }; @@ -657,11 +691,7 @@ let convmv = callPackage ../tools/misc/convmv { }; - coreutils = (if stdenv.isDarwin then - # 8.20 doesn't build on Darwin - callPackage ../tools/misc/coreutils/8.19.nix - else - callPackage ../tools/misc/coreutils) + coreutils = callPackage ../tools/misc/coreutils { # TODO: Add ACL support for cross-Linux. aclSupport = crossSystem == null && stdenv.isLinux; @@ -684,6 +714,11 @@ let scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; }; + curl3 = callPackage ../tools/networking/curl/7.15.nix rec { + zlibSupport = true; + sslSupport = zlibSupport; + }; + cunit = callPackage ../tools/misc/cunit { }; curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; @@ -798,10 +833,17 @@ let encfs = callPackage ../tools/filesystems/encfs { }; - enscript = callPackage ../tools/text/enscript { }; + enscript = callPackage ../tools/text/enscript { + # fix syntax errors + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; ethtool = callPackage ../tools/misc/ethtool { }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { }; + euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; evtest = callPackage ../applications/misc/evtest { }; @@ -856,6 +898,8 @@ let withX11 = true; }; + forktty = callPackage ../os-specific/linux/forktty {}; + fortune = callPackage ../tools/misc/fortune { }; fox = callPackage ../development/libraries/fox/default.nix { @@ -936,9 +980,7 @@ let gnupatch = callPackage ../tools/text/gnupatch { }; - gnupg1orig = callPackage ../tools/security/gnupg1 { - ideaSupport = false; - }; + gnupg1orig = callPackage ../tools/security/gnupg1 { }; gnupg1compat = callPackage ../tools/security/gnupg1compat { }; @@ -1009,7 +1051,7 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; - gummiboot = callPackage ../tools/misc/gummiboot { }; + gummiboot = callPackage ../tools/misc/gummiboot { stdenv = overrideGCC stdenv gcc47; }; gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; @@ -1027,6 +1069,8 @@ let gzip = callPackage ../tools/compression/gzip { }; + gzrt = callPackage ../tools/compression/gzrt { }; + partclone = callPackage ../tools/backup/partclone { }; partimage = callPackage ../tools/backup/partimage { }; @@ -1035,6 +1079,8 @@ let haproxy = callPackage ../tools/networking/haproxy { }; + haveged = callPackage ../tools/security/haveged { }; + hardlink = callPackage ../tools/system/hardlink { }; halibut = callPackage ../tools/typesetting/halibut { }; @@ -1220,7 +1266,7 @@ let memtest86 = callPackage ../tools/misc/memtest86 { }; - memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { }; + memtest86plus = callPackage ../tools/misc/memtest86+ { }; meo = callPackage ../tools/security/meo { }; @@ -1236,6 +1282,8 @@ let mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + megacli = callPackage ../tools/misc/megacli { }; + megatools = callPackage ../tools/networking/megatools { }; minecraft = callPackage ../games/minecraft { }; @@ -1315,6 +1363,8 @@ let nbd = callPackage ../tools/networking/nbd { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; + netcdf = callPackage ../development/libraries/netcdf { }; nc6 = callPackage ../tools/networking/nc6 { }; @@ -1331,6 +1381,8 @@ let netcat = callPackage ../tools/networking/netcat { }; + netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; + netkittftp = callPackage ../tools/networking/netkit/tftp { }; netpbm = callPackage ../tools/graphics/netpbm { }; @@ -1355,6 +1407,8 @@ let newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + ngrok = callPackage ../tools/misc/ngrok { }; + mpack = callPackage ../tools/networking/mpack { }; pa_applet = callPackage ../tools/audio/pa-applet { }; @@ -1384,6 +1438,8 @@ let nssmdns = callPackage ../tools/networking/nss-mdns { }; + nwdiag = pythonPackages.nwdiag; + nylon = callPackage ../tools/networking/nylon { }; nzbget = callPackage ../tools/networking/nzbget { }; @@ -1520,6 +1576,8 @@ let pk2cmd = callPackage ../tools/misc/pk2cmd { }; + plantuml = callPackage ../tools/misc/plantuml { }; + plan9port = callPackage ../tools/system/plan9port { }; ploticus = callPackage ../tools/graphics/ploticus { @@ -1538,8 +1596,12 @@ let libpng = libpng12; }; + pngquant = callPackage ../tools/graphics/pngquant { }; + podiff = callPackage ../tools/text/podiff { }; + poedit = callPackage ../tools/text/poedit { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; @@ -1554,6 +1616,8 @@ let pptp = callPackage ../tools/networking/pptp {}; + prey-bash-client = callPackage ../tools/security/prey { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; @@ -1684,12 +1748,14 @@ let sdcv = callPackage ../applications/misc/sdcv { }; - seccure = callPackage ../tools/security/seccure/0.4.nix { }; + seccure = callPackage ../tools/security/seccure { }; setserial = builderDefsPackage (import ../tools/system/setserial) { inherit groff; }; + seqdiag = pythonPackages.seqdiag; + sg3_utils = callPackage ../tools/system/sg3_utils { }; sharutils = callPackage ../tools/archivers/sharutils { }; @@ -1750,6 +1816,8 @@ let sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshuttle = callPackage ../tools/security/sshuttle { }; + sudo = callPackage ../tools/security/sudo { }; suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; @@ -1827,6 +1895,8 @@ let ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; + ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; txt2man = callPackage ../tools/misc/txt2man { }; @@ -1846,6 +1916,8 @@ let unoconv = callPackage ../tools/text/unoconv { }; upx = callPackage ../tools/compression/upx { }; + + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -1897,6 +1969,8 @@ let htmlTidy = callPackage ../tools/text/html-tidy { }; + html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; + tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc { @@ -2093,6 +2167,7 @@ let zip = callPackage ../tools/archivers/zip { }; zpaq = callPackage ../tools/archivers/zpaq { }; + zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; zsync = callPackage ../tools/compression/zsync { }; @@ -2136,6 +2211,8 @@ let aspectj = callPackage ../development/compilers/aspectj { }; + ats2 = callPackage ../development/compilers/ats2 { }; + avra = callPackage ../development/compilers/avra { }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -2686,7 +2763,11 @@ let go_1_0 = callPackage ../development/compilers/go { }; - go_1_1 = callPackage ../development/compilers/go/1.1.nix { }; + go_1_1 = + if stdenv.isDarwin then + callPackage ../development/compilers/go/1.1-darwin.nix { } + else + callPackage ../development/compilers/go/1.1.nix { }; go = go_1_1; @@ -2798,6 +2879,8 @@ let ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; + ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; + orc = callPackage ../development/compilers/orc { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; @@ -2956,6 +3039,8 @@ let boost = boost149; # sdcc 3.2.0 fails to build with boost 1.53 }; + smlnj = callPackage_i686 ../development/compilers/smlnj { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; @@ -3094,6 +3179,8 @@ let j = callPackage ../development/interpreters/j {}; + jmeter = callPackage ../applications/networking/jmeter {}; + kaffe = callPackage ../development/interpreters/kaffe { }; kona = callPackage ../development/interpreters/kona {}; @@ -3101,9 +3188,10 @@ let love = callPackage ../development/interpreters/love {}; lua4 = callPackage ../development/interpreters/lua-4 { }; - lua5 = callPackage ../development/interpreters/lua-5 { }; lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; + lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { }; + lua5 = lua5_1; luarocks = callPackage ../development/tools/misc/luarocks { lua = lua5; @@ -3190,6 +3278,8 @@ let pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { }; + pypi2nix = python27Packages.pypi2nix; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; @@ -3662,6 +3752,8 @@ let simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; + slimerjs = callPackage ../development/tools/slimerjs {}; + sloccount = callPackage ../development/tools/misc/sloccount { }; smatch = callPackage ../development/tools/analysis/smatch { @@ -3724,6 +3816,8 @@ let valkyrie = callPackage ../development/tools/analysis/valkyrie { }; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xxdiff = callPackage ../development/tools/misc/xxdiff { }; yacc = bison; @@ -3918,8 +4012,7 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = let dbus_all = callPackage ../development/libraries/dbus { }; - in dbus_all.libs // dbus_all; # previously dbus.libs also contained the daemon + dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; @@ -4048,6 +4141,8 @@ let gav = callPackage ../games/gav { }; + gsb = callPackage ../games/gsb { }; + gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome) gtkdoc; }; @@ -4065,6 +4160,10 @@ let geoclue = callPackage ../development/libraries/geoclue {}; + geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix { + libsoup = libsoup_2_40; + }; + geoip = builderDefsPackage ../development/libraries/geoip { inherit zlib; }; @@ -4254,12 +4353,16 @@ let gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; + gusb = callPackage ../development/libraries/gusb { + inherit (gnome) gtkdoc; + }; + qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; gnet = callPackage ../development/libraries/gnet { }; - gnu_efi = callPackage ../development/libraries/gnu-efi { - stdenv = overrideInStdenv stdenv [gnumake381]; + gnu-efi = callPackage ../development/libraries/gnu-efi { + stdenv = overrideGCC stdenv gcc47; }; gnutls = callPackage ../development/libraries/gnutls { @@ -4270,6 +4373,10 @@ let guileBindings = config.gnutls.guile or true; }; + gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { + guileBindings = config.gnutls.guile or true; + }; + gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); @@ -4372,6 +4479,8 @@ let gts = callPackage ../development/libraries/gts { }; + gurobi = callPackage ../development/libraries/gurobi {}; + gvfs = callPackage ../development/libraries/gvfs { }; gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; @@ -4381,7 +4490,10 @@ let heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; - harfbuzz = callPackage ../development/libraries/harfbuzz { }; + harfbuzz = callPackage ../development/libraries/harfbuzz { + icu = null; + graphite2 = null; + }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -4463,6 +4575,8 @@ let json_c = callPackage ../development/libraries/json-c { }; + jsoncpp = callPackage ../development/libraries/jsoncpp { }; + libjson = callPackage ../development/libraries/libjson { }; judy = callPackage ../development/libraries/judy { }; @@ -4762,6 +4876,8 @@ let libtool = libtool_1_5; }; + libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; + libkate = callPackage ../development/libraries/libkate { }; libksba = callPackage ../development/libraries/libksba { }; @@ -4815,6 +4931,8 @@ let libmusicbrainz = libmusicbrainz3; + libnet = callPackage ../development/libraries/libnet { }; + libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { }; @@ -4887,7 +5005,10 @@ let stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; }; + libsodium = callPackage ../development/libraries/libsodium { }; + libsoup = callPackage ../development/libraries/libsoup { }; + libsoup_2_40 = callPackage ../development/libraries/libsoup/2.40.nix { }; libssh = callPackage ../development/libraries/libssh { }; @@ -4909,7 +5030,14 @@ let libtommath = callPackage ../development/libraries/libtommath { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { + # fix "unrecognized option -arch" error + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; + + libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; @@ -4925,6 +5053,8 @@ let libungif = callPackage ../development/libraries/giflib/libungif.nix { }; + libunibreak = callPackage ../development/libraries/libunibreak/default.nix { }; + libunique = callPackage ../development/libraries/libunique/default.nix { }; liburcu = callPackage ../development/libraries/liburcu { }; @@ -4957,12 +5087,7 @@ let libvisual = callPackage ../development/libraries/libvisual { }; - libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { - inherit libtool libjpeg openssl zlib; - inherit (xlibs) xproto libX11 damageproto libXdamage - libXext xextproto fixesproto libXfixes xineramaproto - libXinerama libXrandr randrproto libXtst; - }; + libvncserver = callPackage ../development/libraries/libvncserver {}; libviper = callPackage ../development/libraries/libviper { }; @@ -5007,14 +5132,15 @@ let libxslt = callPackage ../development/libraries/libxslt { }; - libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { }; - libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { inherit fetchurl stdenv; }); libyaml = callPackage ../development/libraries/libyaml { }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { }; + libzip = callPackage ../development/libraries/libzip { }; libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; @@ -5091,6 +5217,10 @@ let minmay = callPackage ../development/libraries/minmay { }; + miro = callPackage ../applications/video/miro { + inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen; + }; + mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mlt = callPackage ../development/libraries/mlt { @@ -5276,8 +5406,7 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; }; - in popplers // popplers.poppler_glib; + poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { @@ -5298,6 +5427,8 @@ let portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; + portmidi = callPackage ../development/libraries/portmidi {}; + prison = callPackage ../development/libraries/prison { }; proj = callPackage ../development/libraries/proj { }; @@ -5434,9 +5565,23 @@ let SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; + SDL2 = callPackage ../development/libraries/SDL2 { + openglSupport = mesaSupported; + alsaSupport = true; + x11Support = true; + pulseaudioSupport = false; # better go through ALSA + }; + + SDL2_image = callPackage ../development/libraries/SDL2_image { }; + + SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; + + SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; + serd = callPackage ../development/libraries/serd {}; silgraphite = callPackage ../development/libraries/silgraphite {}; + graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; simgear = callPackage ../development/libraries/simgear { }; @@ -5490,26 +5635,15 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; - sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { + sqlite = lowPrio (callPackage ../development/libraries/sqlite { readline = null; ncurses = null; }); - sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix { - readline = null; - ncurses = null; - }); - - sqlite = sqlite_3_7_16; - sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; }); - sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix { - inherit readline ncurses; - }); - stfl = callPackage ../development/libraries/stfl { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple @@ -5623,8 +5757,7 @@ let inherit (gnome) gtkdoc libsoup; inherit pkgconfig libtool intltool autoconf automake gperf bison flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl - which libproxy geoclue enchant python ruby perl - mesa xlibs; + which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; }; @@ -5634,8 +5767,7 @@ let inherit (gnome) gtkdoc libsoup; inherit pkgconfig libtool intltool autoconf automake gperf bison flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl - which libproxy geoclue enchant python ruby perl - mesa xlibs; + which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; }; @@ -5796,6 +5928,17 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + ### DEVELOPMENT / LISP MODULES + + asdf = callPackage ../development/lisp-modules/asdf {}; + clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; + wrapLisp = lisp: clwrapperFunction {lisp=lisp;}; + lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{ + inherit clwrapper; + }; + lispPackagesClisp = lispPackagesFor (wrapLisp clisp); + lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl); + lispPackages = recurseIntoAttrs lispPackagesSBCL; ### DEVELOPMENT / PERL MODULES @@ -5941,6 +6084,14 @@ let ZopeInterface = pythonPackages.zope_interface; + ### DEVELOPMENT / R MODULES + + buildRPackage = import ../development/r-modules/generic R; + + rPackages = recurseIntoAttrs (import ./r-packages.nix { + inherit pkgs; + __overrides = (config.rPackageOverrides or (p: {})) pkgs; + }); ### SERVERS @@ -5962,6 +6113,8 @@ let bind = callPackage ../servers/dns/bind { }; + bird = callPackage ../servers/bird { }; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; }; @@ -6027,6 +6180,8 @@ let lighttpd = callPackage ../servers/http/lighttpd { }; + mailman = callPackage ../servers/mail/mailman { }; + mediatomb = callPackage ../servers/mediatomb { ffmpeg = ffmpeg_0_6_90; }; @@ -6087,22 +6242,12 @@ let riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; - mysql4 = import ../servers/sql/mysql { - inherit fetchurl stdenv ncurses zlib perl; - ps = procps; /* !!! Linux only */ - }; - - mysql5 = import ../servers/sql/mysql5 { - inherit fetchurl stdenv ncurses zlib perl openssl; - ps = procps; /* !!! Linux only */ - }; - - mysql51 = import ../servers/sql/mysql51 { + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ }; - mysql55 = callPackage ../servers/sql/mysql55 { }; + mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; mysql = mysql51; @@ -6150,6 +6295,8 @@ let inherit xmpppy python makeWrapper fetchcvs; }; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; + rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server { }; radius = callPackage ../servers/radius { }; @@ -6206,7 +6353,11 @@ let axis2 = callPackage ../servers/http/tomcat/axis2 { }; - virtuoso = callPackage ../servers/sql/virtuoso { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; + + virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; + + virtuoso = virtuoso6; vsftpd = callPackage ../servers/ftp/vsftpd { }; @@ -6363,6 +6514,8 @@ let fxload = callPackage ../os-specific/linux/fxload { }; + gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; + gpm = callPackage ../servers/gpm { }; hdparm = callPackage ../os-specific/linux/hdparm { }; @@ -6457,9 +6610,27 @@ let ]; }; + # Note: grsec is not enabled automatically, you need to specify which kernel + # config options you need (e.g. by overriding extraConfig). See list of options here: + # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ]; - })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_52 ]; + })) (args: { + # Install gcc plugins. These are needed for compiling dependant packages. + postInstall = '' + ${args.postInstall or ""} + cp tools/gcc/*.so $out/lib/modules/$version/build/tools/gcc/ + ''; + # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins) + # include libgmp headers, so we need these extra tweaks + buildInputs = args.buildInputs ++ [ gmp ]; + preConfigure = '' + ${args.preConfigure or ""} + sed -i 's|-I|-I${gmp}/include -I|' scripts/gcc-plugin.sh + sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${gmp}/include|' tools/gcc/Makefile + sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${gmp}/include|' tools/gcc/Makefile + ''; + })); linux_3_2_apparmor = lowPrio (linux_3_2.override { kernelPatches = [ kernelPatches.apparmor_3_2 ]; @@ -6534,6 +6705,19 @@ let ]; }; + linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { + inherit fetchurl stdenv perl mktemp bc kmod 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 + ]; + }; + + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -6587,6 +6771,8 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + broadcom_sta6 = callPackage ../os-specific/linux/broadcom-sta-v6/default.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; @@ -6603,11 +6789,6 @@ let linuxHeaders = glibc.kernelHeaders; }; - splashutils = let hasFbConDecor = if self.kernel ? features - then self.kernel.features ? fbConDecor - else self.kernel.config.isEnabled "FB_CON_DECOR"; - in if hasFbConDecor then pkgs.splashutils else null; - /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. */ @@ -6649,6 +6830,7 @@ let linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; + linuxPackages_3_2_grsecurity = linuxPackagesFor pkgs.linux_3_2_grsecurity linuxPackages_3_2_grsecurity; linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; 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; @@ -6656,6 +6838,7 @@ let linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); + linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); # Update this when adding a new version! linuxPackages_latest = pkgs.linuxPackages_3_11; @@ -6722,8 +6905,6 @@ let module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; - mountall = callPackage ../os-specific/linux/mountall { }; - aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { inherit modules; @@ -6812,8 +6993,6 @@ let shadow = callPackage ../os-specific/linux/shadow { }; - splashutils = callPackage ../os-specific/linux/splashutils/default.nix { }; - statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; @@ -6830,6 +7009,15 @@ let systemd = callPackage ../os-specific/linux/systemd { }; + # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get + # LVM2 working in systemd. + systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: { + name = p.name + "-with-lvm2"; + postInstall = p.postInstall + '' + cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators + ''; + }); + sysvinit = callPackage ../os-specific/linux/sysvinit { }; sysvtools = callPackage ../os-specific/linux/sysvinit { @@ -6877,11 +7065,13 @@ let udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; udisks = udisks1; + udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {}; - }; + }; upstart = callPackage ../os-specific/linux/upstart { }; @@ -7186,6 +7376,8 @@ let arora = callPackage ../applications/networking/browsers/arora { }; + aseprite = callPackage ../applications/editors/aseprite { }; + audacious = callPackage ../applications/audio/audacious { }; audacity = callPackage ../applications/audio/audacity { }; @@ -7393,6 +7585,8 @@ let dvswitch = callPackage ../applications/video/dvswitch { }; + dwb = callPackage ../applications/networking/browsers/dwb { }; + dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; }; @@ -7430,17 +7624,16 @@ let # use override to enable additional features libXaw = if stdenv.isDarwin then xlibs.libXaw else null; Xaw3d = null; - gtk = if stdenv.isDarwin then null else gtk; gconf = null; librsvg = null; alsaLib = null; imagemagick = null; texinfo = texinfo5; - # use gccApple on darwin to deal with: unexec: 'my_edata is not in section - # __data' + # use clangStdenv on darwin to deal with: unexec: 'my_edata is not in + # section __data' stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple + then clangStdenv else stdenv; }; @@ -7580,6 +7773,8 @@ let fbpanel = callPackage ../applications/window-managers/fbpanel { }; + fbreader = callPackage ../applications/misc/fbreader { }; + fetchmail = import ../applications/misc/fetchmail { inherit stdenv fetchurl openssl; }; @@ -7588,12 +7783,18 @@ let fossil = callPackage ../applications/version-management/fossil { }; + fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; + fvwm = callPackage ../applications/window-managers/fvwm { }; geany = callPackage ../applications/editors/geany { }; goldendict = callPackage ../applications/misc/goldendict { }; + google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + + gpicview = callPackage ../applications/graphics/gpicview { }; + grass = import ../applications/misc/grass { inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm libXaw libXrender; @@ -7612,6 +7813,8 @@ let inherit (gnome) libgnome libgnomeui vte; }; + gtimelog = pythonPackages.gtimelog; + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -7892,6 +8095,8 @@ let ii = callPackage ../applications/networking/irc/ii { }; + ike = callPackage ../applications/ike { }; + ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext @@ -8100,6 +8305,10 @@ let mirage = callPackage ../applications/graphics/mirage {}; + mixxx = callPackage ../applications/audio/mixxx { + inherit (vamp) vampSDK; + }; + mmex = callPackage ../applications/office/mmex { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; @@ -8126,7 +8335,6 @@ let }; mopidy = callPackage ../applications/audio/mopidy { }; - mopidy_git = callPackage ../applications/audio/mopidy/git.nix { }; mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; @@ -8147,6 +8355,8 @@ let mpg321 = callPackage ../applications/audio/mpg321 { }; + mpc_cli = callPackage ../applications/audio/mpc { }; + ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; normalize = callPackage ../applications/audio/normalize { }; @@ -8191,23 +8401,18 @@ let smplayer = callPackage ../applications/video/smplayer { }; - sup = callPackage ../applications/networking/mailreaders/sup { - ruby = ruby19; + sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { + ruby = ruby19.override { + cursesSupport = true; + }; + + inherit gettext highline iconv locale lockfile mime_types rmail_sup text + trollop unicode xapian_ruby which; - 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; + chronic = chronic_0_9_1; + gpgme = ruby_gpgme; ncursesw_sup = ruby_ncursesw_sup; - rake = rubyLibs.rake_10_1_0; - rmail = rubyLibs.rmail; - text = rubyLibs.text; - trollop = rubyLibs.trollop; - xapian_ruby = rubyLibs.xapian_ruby; + rake = rake_10_1_0; }; msmtp = callPackage ../applications/networking/msmtp { }; @@ -8331,6 +8536,8 @@ let pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; + toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { }; + pinfo = callPackage ../applications/misc/pinfo { }; pinta = callPackage ../applications/graphics/pinta { @@ -8405,6 +8612,8 @@ let enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); }; + rubyripper = callPackage ../applications/audio/rubyripper {}; + rxvt = callPackage ../applications/misc/rxvt { }; # = urxvt @@ -8447,6 +8656,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + st = callPackage ../applications/misc/st { conf = config.st.conf or null; }; @@ -8510,10 +8721,7 @@ let stalonetray = callPackage ../applications/window-managers/stalonetray {}; - stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) { - inherit texinfo; - clisp = clisp_2_44_1; - }; + stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime { }; @@ -8610,10 +8818,10 @@ let wrapPython = pythonPackages.wrapPython; }; - # This builds the gtk client - transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { }; + toxic = callPackage ../applications/networking/instant-messengers/toxic { }; transmission = callPackage ../applications/networking/p2p/transmission { }; + transmission_gtk = transmission.override { enableGTK3 = true; }; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; @@ -8699,6 +8907,7 @@ let virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; + vte = gnome.vte.override { pythonSupport = true; }; }; virtinst = callPackage ../applications/virtualization/virtinst {}; @@ -8727,7 +8936,10 @@ let graphicsSupport = false; }; - weechat = callPackage ../applications/networking/irc/weechat { }; + weechat = callPackage ../applications/networking/irc/weechat { + # weechat crashes on /exit when using gnutls 3.1.x. gnutls 3.2.x works. + gnutls = gnutls32; + }; weston = callPackage ../applications/window-managers/weston { cairo = cairo.override { @@ -8780,7 +8992,7 @@ let enableGnash = cfg.enableGnash or false; in import ../applications/networking/browsers/firefox/wrapper.nix { - inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; + inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = assert !(enableGnash && enableAdobeFlash); ([ ] @@ -8791,6 +9003,7 @@ let ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin + ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ); libs = if cfg.enableQuakeLive or false @@ -8817,6 +9030,8 @@ let xbmc = callPackage ../applications/video/xbmc { }; + xca = callPackage ../applications/misc/xca { }; + xcalib = callPackage ../tools/X11/xcalib { }; xcape = callPackage ../tools/X11/xcape { }; @@ -8976,7 +9191,17 @@ let drumkv1 = callPackage ../applications/audio/drumkv1 { }; - dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { }; + dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { + SDL_image = pkgsi686Linux.SDL_image.override { + libpng = pkgsi686Linux.libpng12; + }; + }; + + dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { + copyDataDirectory = true; + }); + + dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -8997,6 +9222,11 @@ let freeciv = callPackage ../games/freeciv { }; + freeciv_gtk = callPackage ../games/freeciv { + gtkClient = true; + sdlClient = false; + }; + freedink = callPackage ../games/freedink { }; fsg = callPackage ../games/fsg { @@ -9078,8 +9308,14 @@ let quake3game = callPackage ../games/quake3/game { }; + quantumminigolf = callPackage ../games/quantumminigolf {}; + racer = callPackage ../games/racer { }; + residualvm = callPackage ../games/residualvm { + openglSupport = mesaSupported; + }; + rigsofrods = callPackage ../games/rigsofrods { mygui = myguiSvn; }; @@ -9098,6 +9334,8 @@ let scorched3d = callPackage ../games/scorched3d { }; + sdlmame = callPackage ../games/sdlmame { }; + sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) { inherit pkgconfig fetchsvn perl gtk; inherit (xlibs) libX11; @@ -9118,6 +9356,10 @@ let steam = callPackage_i686 ../games/steam {}; + steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix { + zenity = gnome2.zenity; + }; + stuntrally = callPackage ../games/stuntrally { }; superTux = callPackage ../games/super-tux { }; @@ -9243,14 +9485,6 @@ let kde4 = recurseIntoAttrs pkgs.kde410; - kde48 = kdePackagesFor (pkgs.kde48 // { - boost = boost149; - eigen = eigen2; - libotr = libotr_3_2; - libgphoto2 = libgphoto2_4; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.8; - kde410 = kdePackagesFor (pkgs.kde410 // { boost = boost149; eigen = eigen2; @@ -9300,6 +9534,8 @@ let else callPackage ../applications/graphics/digikam { }; + eventlist = callPackage ../applications/office/eventlist {}; + k3b = callPackage ../applications/misc/k3b { }; kadu = callPackage ../applications/networking/instant-messengers/kadu { }; @@ -9328,6 +9564,8 @@ let konversation = callPackage ../applications/networking/irc/konversation { }; + kvirc = callPackage ../applications/networking/irc/kvirc { }; + krename = callPackage ../applications/misc/krename { }; krusader = callPackage ../applications/misc/krusader { }; @@ -9388,6 +9626,9 @@ let redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm xf86vidmodeproto; + inherit (gnome) GConf; + inherit (pythonPackages) pyxdg; + geoclue = geoclue2; }; oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; @@ -9469,6 +9710,8 @@ let pal2nal = callPackage ../applications/science/biology/pal2nal { }; + plink = callPackage ../applications/science/biology/plink/default.nix { }; + ### SCIENCE/MATH @@ -9494,6 +9737,7 @@ let openblas = callPackage ../development/libraries/science/math/openblas { }; + mathematica = callPackage ../applications/science/math/mathematica { }; ### SCIENCE/MOLECULAR-DYNAMICS @@ -9620,6 +9864,10 @@ let pari = callPackage ../applications/science/math/pari {}; + pspp = callPackage ../applications/science/math/pssp { + inherit (gnome) libglade gtksourceview; + }; + R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; @@ -9641,6 +9889,11 @@ let yacas = callPackage ../applications/science/math/yacas { }; + speedcrunch = callPackage ../applications/science/math/speedcrunch { + qt = qt4; + cmake = cmakeCurses; + }; + ### SCIENCE / MISC @@ -9679,7 +9932,13 @@ let dbacl = callPackage ../tools/misc/dbacl { }; - dblatex = callPackage ../tools/typesetting/tex/dblatex { }; + dblatex = callPackage ../tools/typesetting/tex/dblatex { + enableAllFeatures = false; + }; + + dblatexFull = appendToName "full" (dblatex.override { + enableAllFeatures = true; + }); dosbox = callPackage ../misc/emulators/dosbox { }; @@ -9762,6 +10021,8 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nix-repl = callPackage ../tools/package-management/nix-repl { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -9862,11 +10123,14 @@ let texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby - gd t1lib freetype icu perl expat curl xz pkgconfig zziplib - libjpeg bison python fontconfig flex poppler silgraphite makeWrapper; + gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo + libjpeg bison python fontconfig flex poppler graphite2 makeWrapper; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; + harfbuzz = harfbuzz.override { + inherit icu graphite2; + }; }; texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { @@ -9889,7 +10153,7 @@ let */ texLiveAggregationFun = params: builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix) - ({inherit poppler makeWrapper;} // params); + ({inherit poppler perl makeWrapper;} // params); texDisser = callPackage ../tools/typesetting/tex/disser {}; @@ -9947,7 +10211,9 @@ let VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # Wine cannot be built in 64-bit; use a 32-bit build instead. - wine = callPackage_i686 ../misc/emulators/wine { }; + wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { }; + wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix { }); + wine = wineStable; # winetricks is a shell script with no binary components. Safe to just use the current platforms # build instead of the i686 specific build. @@ -9997,6 +10263,10 @@ let znc = callPackage ../applications/networking/znc { }; + zncModules = recurseIntoAttrs ( + callPackage ../applications/networking/znc/modules.nix { } + ); + zsnes = callPackage_i686 ../misc/emulators/zsnes { libpng = libpng12; }; |