diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3928 |
1 files changed, 2566 insertions, 1362 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3889c77b90cd..10fc3527a719 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8,15 +8,6 @@ { # The system (e.g., `i686-linux') for which to build the packages. system ? builtins.currentSystem - # Usually, the system type uniquely determines the stdenv and thus - # how to build the packages. But on some platforms we have - # different stdenvs, leading to different ways to build the - # packages. For instance, on Windows we support both Cygwin and - # Mingw builds. In both cases, `system' is `i686-cygwin'. The - # attribute `stdenvType' is used to select the specific kind of - # stdenv to use, e.g., `i686-mingw'. -, stdenvType ? system - , # The standard environment to use. Only used for bootstrapping. If # null, the default standard environment is used. bootStdenv ? null @@ -84,7 +75,9 @@ let if system == "armv6l-linux" then platforms.raspberrypi else if system == "armv5tel-linux" then platforms.sheevaplug else if system == "mips64el-linux" then platforms.fuloong2f_n32 - else platforms.pc; + else if system == "x86_64-linux" then platforms.pc64 + else if system == "i686-linux" then platforms.pc32 + else platforms.pcBase; platform = if platform_ != null then platform_ else config.platform or platformAuto; @@ -95,7 +88,7 @@ let (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); stdenvAdapters = - import ../stdenv/adapters.nix { inherit (pkgs) dietlibc fetchurl runCommand; }; + import ../stdenv/adapters.nix pkgs; # Allow packages to be overriden globally via the `packageOverrides' @@ -129,18 +122,16 @@ let # The package compositions. Yes, this isn't properly indented. - pkgsFun = pkgs: __overrides: + pkgsFun = pkgs: overrides: with helperFunctions; - let defaultScope = pkgs // pkgs.xorg; in - helperFunctions // rec { - - # `__overrides' is a magic attribute that causes the attributes in - # its value to be added to the surrounding `rec'. We'll remove this - # eventually. - inherit __overrides pkgs; + let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides; + self_ = with self; helperFunctions // { # Make some arguments passed to all-packages.nix available - inherit system stdenvType platform; + inherit system platform; + + # Allow callPackage to fill in the pkgs argument + inherit pkgs; # We use `callPackage' to be able to omit function arguments that @@ -153,15 +144,16 @@ let # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: (import ./all-packages.nix) { + forceSystem = system: kernel: (import ./all-packages.nix) { inherit system; + platform = platform // { kernelArch = kernel; }; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem platform; + crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux"; + pkgsi686Linux = forceSystem "i686-linux" "i386"; callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); @@ -172,7 +164,7 @@ let ### Symbolic names. - x11 = if stdenv.isDarwin then darwinX11AndOpenGL else xlibsWrapper; + x11 = 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 @@ -213,7 +205,7 @@ let allStdenvs = import ../stdenv { - inherit system stdenvType platform config; + inherit system platform config; allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); }; @@ -239,6 +231,8 @@ let else defaultStdenv; + stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple; + forceNativeDrv = drv : if crossSystem == null then drv else (drv // { crossDrv = drv.nativeDrv; }); @@ -247,7 +241,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc46_multi + overrideGCC stdenv gcc48_multi else stdenv); @@ -278,10 +272,17 @@ let dotnetfx = dotnetfx40; }; + scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh; + vsenv = callPackage ../build-support/vsenv { vs = vs90wrapper; }; + fetchbower = import ../build-support/fetchbower { + inherit stdenv git; + inherit (nodePackages) fetch-bower; + }; + fetchbzr = import ../build-support/fetchbzr { inherit stdenv bazaar; }; @@ -298,10 +299,18 @@ let inherit stdenv git cacert; }; + fetchgitPrivate = import ../build-support/fetchgit/private.nix { + inherit fetchgit writeScript openssh stdenv; + }; + fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); + packer = callPackage ../development/tools/packer { }; + + fetchpatch = callPackage ../build-support/fetchpatch { }; + fetchsvn = import ../build-support/fetchsvn { inherit stdenv subversion openssh; sshSupport = true; @@ -324,7 +333,7 @@ let }; # A wrapper around fetchurl that generates miror://gnome URLs automatically - fetchurl_gnome = callPackage ../build-support/fetchurl/gnome.nix { }; + fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { }; # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, @@ -333,11 +342,21 @@ let # linked curl in the case of stdenv-linux). fetchurlBoot = stdenv.fetchurlBoot; + fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; }; + + fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip { + name = "${repo}-${rev}-src"; + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; + inherit sha256; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; }; + libredirect = callPackage ../build-support/libredirect { }; + makeDesktopItem = import ../build-support/make-desktopitem { inherit stdenv; }; @@ -349,7 +368,7 @@ let makeInitrd = {contents, compressor ? "gzip -9"}: import ../build-support/kernel/make-initrd.nix { - inherit stdenv perl cpio contents ubootChooser compressor; + inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor; }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; @@ -387,18 +406,38 @@ let platforms = import ./platforms.nix; + setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; + + fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; + + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; + + enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + + makeGCOVReport = makeSetupHook + { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } + ../build-support/setup-hooks/make-coverage-analysis-report.sh; + ### TOOLS acct = callPackage ../tools/system/acct { }; - acoustidFingerprinter = callPackage - ../tools/audio/acoustid-fingerprinter { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { + ffmpeg = ffmpeg_1; + }; actdiag = pythonPackages.actdiag; + adom = callPackage ../games/adom { }; + aefs = callPackage ../tools/filesystems/aefs { }; + aegisub = callPackage ../applications/video/aegisub { + wxGTK = wxGTK30; + lua = lua5_1; + }; + aespipe = callPackage ../tools/security/aespipe { }; aescrypt = callPackage ../tools/misc/aescrypt { }; @@ -409,10 +448,18 @@ let analog = callPackage ../tools/admin/analog {}; + apktool = callPackage ../development/tools/apktool { + buildTools = androidenv.buildTools; + }; + + apt-offline = callPackage ../tools/misc/apt-offline { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; + arcanist = callPackage ../development/tools/misc/arcanist {}; + arduino_core = callPackage ../development/arduino/arduino-core { jdk = jdk; jre = jdk; @@ -420,14 +467,16 @@ let argyllcms = callPackage ../tools/graphics/argyllcms {}; + arp-scan = callPackage ../tools/misc/arp-scan { }; + ascii = callPackage ../tools/text/ascii { }; asymptote = builderDefsPackage ../tools/graphics/asymptote { inherit freeglut ghostscriptX imagemagick fftw boehmgc mesa ncurses readline gsl libsigsegv python zlib perl - texinfo lzma; + texinfo xz; texLive = texLiveAggregationFun { - paths = [ texLive texLiveExtra ]; + paths = [ texLive texLiveExtra texLiveCMSuper ]; }; }; @@ -462,7 +511,9 @@ let otool = callPackage ../os-specific/darwin/otool { }; - pass = callPackage ../tools/security/pass { }; + pass = callPackage ../tools/security/pass { + gnupg = gnupg1compat; + }; setfile = callPackage ../os-specific/darwin/setfile { }; @@ -470,24 +521,15 @@ let xcodeenv = callPackage ../development/mobile/xcodeenv { }; - titaniumenv_2_1 = import ../development/mobile/titaniumenv { - inherit pkgs; - pkgs_i686 = pkgsi686Linux; - version = "2.1"; - }; - - titaniumenv_3_1 = import ../development/mobile/titaniumenv { + titaniumenv = callPackage ../development/mobile/titaniumenv { inherit pkgs; pkgs_i686 = pkgsi686Linux; }; - titaniumenv = titaniumenv_3_1; - inherit (androidenv) androidsdk_4_1; - aria = builderDefsPackage (import ../tools/networking/aria) { }; - aria2 = callPackage ../tools/networking/aria2 { }; + aria = aria2; at = callPackage ../tools/system/at { }; @@ -517,23 +559,31 @@ let babeld = callPackage ../tools/networking/babeld { }; + badvpn = callPackage ../tools/networking/badvpn {}; + banner = callPackage ../games/banner {}; barcode = callPackage ../tools/graphics/barcode {}; bc = callPackage ../tools/misc/bc { }; + bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; + bchunk = callPackage ../tools/cd-dvd/bchunk { }; bfr = callPackage ../tools/misc/bfr { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; + + bitbucket-cli = pythonPackages.bitbucket-cli; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; - boomerang = callPackage ../development/tools/boomerang { - stdenv = overrideGCC stdenv gcc47; - }; + bochs = callPackage ../applications/virtualization/bochs { }; + + boomerang = callPackage ../development/tools/boomerang { }; bootchart = callPackage ../tools/system/bootchart { }; @@ -547,8 +597,25 @@ let byobu = callPackage ../tools/misc/byobu { }; + capstone = callPackage ../development/libraries/capstone { }; + catdoc = callPackage ../tools/text/catdoc { }; + ccnet = callPackage ../tools/networking/ccnet { }; + + consul = callPackage ../servers/consul { }; + consul_ui = callPackage ../servers/consul/ui.nix { }; + + coprthr = callPackage ../development/libraries/coprthr { + flex = flex_2_5_35; + }; + + crawl = callPackage ../games/crawl { lua = lua5; }; + + cv = callPackage ../tools/misc/cv { }; + + direnv = callPackage ../tools/misc/direnv { }; + ditaa = callPackage ../tools/graphics/ditaa { }; dlx = callPackage ../misc/emulators/dlx { }; @@ -557,25 +624,38 @@ let enca = callPackage ../tools/text/enca { }; + fasd = callPackage ../tools/misc/fasd { + inherit (haskellPackages) pandoc; + }; + fop = callPackage ../tools/typesetting/fop { }; mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; + mpdcron = callPackage ../tools/audio/mpdcron { }; + syslogng = callPackage ../tools/system/syslog-ng { }; + + syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + rsyslog = callPackage ../tools/system/rsyslog { }; mcrypt = callPackage ../tools/misc/mcrypt { }; mcelog = callPackage ../os-specific/linux/mcelog { }; + apparix = callPackage ../tools/misc/apparix { }; + + appdata-tools = callPackage ../tools/misc/appdata-tools { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; enableStandardFeatures = false; }; - asciidocFull = appendToName "full" (asciidoc.override { + asciidoc-full = appendToName "full" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; }); @@ -584,8 +664,19 @@ let bacula = callPackage ../tools/backup/bacula { }; + beanstalkd = callPackage ../servers/beanstalkd { }; + bgs = callPackage ../tools/X11/bgs { }; + biber = callPackage ../tools/typesetting/biber { + inherit (perlPackages) + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter; + }; + bibtextools = callPackage ../tools/typesetting/bibtex-tools { inherit (strategoPackages016) strategoxt sdf; }; @@ -604,26 +695,36 @@ let inherit unzip; }; - bogofilter = callPackage ../tools/misc/bogofilter { - bdb = db4; - }; + bogofilter = callPackage ../tools/misc/bogofilter { }; bsdiff = callPackage ../tools/compression/bsdiff { }; btar = callPackage ../tools/backup/btar { }; + bud = callPackage ../tools/networking/bud { + inherit (pythonPackages) gyp; + }; + bup = callPackage ../tools/backup/bup { inherit (pythonPackages) pyxattr pylibacl setuptools fuse; inherit (haskellPackages) pandoc; par2Support = (config.bup.par2Support or false); }; + ori = callPackage ../tools/backup/ori { }; + atool = callPackage ../tools/archivers/atool { }; bzip2 = callPackage ../tools/compression/bzip2 { }; cabextract = callPackage ../tools/archivers/cabextract { }; + cadaver = callPackage ../tools/networking/cadaver { }; + + cantata = callPackage ../applications/audio/cantata { }; + + can-utils = callPackage ../os-specific/linux/can-utils { }; + ccid = callPackage ../tools/security/ccid { }; ccrypt = callPackage ../tools/security/ccrypt { }; @@ -634,9 +735,10 @@ let cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; + ceph = callPackage ../tools/filesystems/ceph { }; + cfdg = builderDefsPackage ../tools/graphics/cfdg { - inherit libpng bison flex; - ffmpeg = ffmpeg_1; + inherit libpng bison flex ffmpeg; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -649,20 +751,34 @@ let chrony = callPackage ../tools/networking/chrony { }; + chunkfs = callPackage ../tools/filesystems/chunkfs { }; + + chunksync = callPackage ../tools/backup/chunksync { }; + cjdns = callPackage ../tools/networking/cjdns { }; cksfv = callPackage ../tools/networking/cksfv { }; + clementine = callPackage ../applications/audio/clementine { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; colord = callPackage ../tools/misc/colord { }; + colord-gtk = callPackage ../tools/misc/colord-gtk { }; + colordiff = callPackage ../tools/text/colordiff { }; + concurrencykit = callPackage ../development/libraries/concurrencykit { }; + connect = callPackage ../tools/networking/connect { }; conspy = callPackage ../os-specific/linux/conspy {}; + connman = callPackage ../tools/networking/connman { }; + + connmanui = callPackage ../tools/networking/connmanui { }; + convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { }; @@ -671,6 +787,8 @@ let cowsay = callPackage ../tools/misc/cowsay { }; + cpuminer = callPackage ../tools/misc/cpuminer { }; + cuetools = callPackage ../tools/cd-dvd/cuetools { }; unifdef = callPackage ../development/tools/misc/unifdef { }; @@ -679,6 +797,8 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; + clamav = callPackage ../tools/security/clamav { }; cloc = callPackage ../tools/misc/cloc { @@ -703,10 +823,16 @@ let cron = callPackage ../tools/system/cron { }; - cudatoolkit = callPackage ../development/compilers/cudatoolkit { + cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix { + python = python26; + }; + + cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix { python = python26; }; + cudatoolkit = cudatoolkit5; + curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; zlibSupport = true; @@ -723,6 +849,8 @@ let curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; + cutter = callPackage ../tools/networking/cutter { }; + dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { }; daq = callPackage ../applications/networking/ids/daq { }; @@ -755,12 +883,7 @@ let despotify = callPackage ../development/libraries/despotify { }; - dev86 = callPackage ../development/compilers/dev86 { - /* Using GNU Make 3.82 leads to this: - make[4]: *** No rule to make target `__ldivmod.o)' - So use 3.81. */ - stdenv = overrideInStdenv stdenv [gnumake381]; - }; + dev86 = callPackage ../development/compilers/dev86 { }; dnsmasq = callPackage ../tools/networking/dnsmasq { }; @@ -780,11 +903,16 @@ let disper = callPackage ../tools/misc/disper { }; + dmd = callPackage ../development/compilers/dmd { }; + dmg2img = callPackage ../tools/misc/dmg2img { }; + docbook2odf = callPackage ../tools/typesetting/docbook2odf { + inherit (perlPackages) PerlMagick; + }; + docbook2x = callPackage ../tools/typesetting/docbook2x { inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; - texinfo = texinfo5; }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -797,8 +925,10 @@ let dtach = callPackage ../tools/misc/dtach { }; + duo-unix = callPackage ../tools/security/duo-unix { }; + duplicity = callPackage ../tools/backup/duplicity { - inherit (pythonPackages) boto; + inherit (pythonPackages) boto lockfile; gnupg = gnupg1; }; @@ -808,6 +938,8 @@ let dvgrab = callPackage ../tools/video/dvgrab { }; + dvtm = callPackage ../tools/misc/dvtm { }; + e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; easyrsa = callPackage ../tools/networking/easyrsa { }; @@ -825,20 +957,23 @@ let efibootmgr = callPackage ../tools/system/efibootmgr { }; + efivar = callPackage ../tools/system/efivar { }; + + evemu = callPackage ../tools/system/evemu { }; + elasticsearch = callPackage ../servers/search/elasticsearch { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { - boost = boost149; - }; + elasticsearchPlugins = recurseIntoAttrs ( + callPackage ../servers/search/elasticsearch/plugins.nix { } + ); + + emv = callPackage ../tools/misc/emv { }; + + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; - enscript = callPackage ../tools/text/enscript { - # fix syntax errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + enscript = callPackage ../tools/text/enscript { }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -848,6 +983,10 @@ let evtest = callPackage ../applications/misc/evtest { }; + exempi = callPackage ../development/libraries/exempi { }; + + exercism = callPackage ../development/tools/exercism { }; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -856,12 +995,20 @@ let expect = callPackage ../tools/misc/expect { }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; + fabric = pythonPackages.fabric; - fail2ban = callPackage ../tools/security/fail2ban { }; + fail2ban = callPackage ../tools/security/fail2ban { + systemd = systemd.override { + pythonSupport = true; + }; + }; fakeroot = callPackage ../tools/system/fakeroot { }; + fakechroot = callPackage ../tools/system/fakechroot { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; fcron = callPackage ../tools/system/fcron { }; @@ -882,6 +1029,10 @@ let fio = callPackage ../tools/system/fio { }; + flashtool = callPackage_i686 ../development/mobile/flashtool { + platformTools = androidenv.platformTools; + }; + flpsed = callPackage ../applications/editors/flpsed { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; @@ -890,6 +1041,8 @@ let lprof = callPackage ../tools/graphics/lprof { }; + fdk_aac = callPackage ../development/libraries/fdk-aac { }; + flvtool2 = callPackage ../tools/video/flvtool2 { }; fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); @@ -940,8 +1093,19 @@ let g500-control = callPackage ../tools/misc/g500-control { }; + galculator = callPackage ../applications/misc/galculator { + gtk = gtk3; + }; + gawk = callPackage ../tools/text/gawk { }; + gawkInteractive = appendToName "interactive" + (gawk.override { readlineSupport = true; }); + + gbdfed = callPackage ../tools/misc/gbdfed { + gtk = gtk2; + }; + gdmap = callPackage ../tools/system/gdmap { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -958,6 +1122,8 @@ let glusterfs = callPackage ../tools/filesystems/glusterfs { }; + glmark2 = callPackage ../tools/graphics/glmark2 { }; + glxinfo = callPackage ../tools/graphics/glxinfo { }; gmvault = callPackage ../tools/networking/gmvault { }; @@ -993,15 +1159,12 @@ let libassuan = libassuan2_1; }); - gnuplot = callPackage ../tools/graphics/gnuplot { - texLive = null; - lua = null; + gnuplot = callPackage ../tools/graphics/gnuplot { }; - # use gccApple to compile on darwin, seems to resolve a malloc error - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + gnuplot_qt = gnuplot.override { withQt = true; }; + + # must have AquaTerm installed separately + gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; gnused = callPackage ../tools/text/gnused { }; @@ -1009,12 +1172,20 @@ let gnuvd = callPackage ../tools/misc/gnuvd { }; + goaccess = callPackage ../tools/misc/goaccess { }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; gource = callPackage ../applications/version-management/gource {}; + gpodder = callPackage ../applications/audio/gpodder { }; + gptfdisk = callPackage ../tools/system/gptfdisk { }; + grafana = callPackage ../development/tools/misc/grafana { }; + + grafx2 = callPackage ../applications/graphics/grafx2 {}; + graphviz = callPackage ../tools/graphics/graphviz { }; /* Readded by Michael Raskin. There are programs in the wild @@ -1023,7 +1194,9 @@ let */ graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { }; - grive = callPackage ../tools/filesystems/grive { }; + grive = callPackage ../tools/filesystems/grive { + json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable + }; groff = callPackage ../tools/text/groff { ghostscript = null; @@ -1033,7 +1206,7 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; }; grub2_efi = grub2.override { EFIsupport = true; }; @@ -1043,6 +1216,8 @@ let gt5 = callPackage ../tools/system/gt5 { }; + gtest = callPackage ../development/libraries/gtest {}; + gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; @@ -1051,22 +1226,24 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; - gummiboot = callPackage ../tools/misc/gummiboot { stdenv = overrideGCC stdenv gcc47; }; + gummiboot = callPackage ../tools/misc/gummiboot { }; gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; + gupnp_av = callPackage ../development/libraries/gupnp-av {}; + gupnp_igd = callPackage ../development/libraries/gupnp-igd {}; - gupnptools = callPackage ../tools/networking/gupnp-tools { - inherit (gnome) libsoup libglade gnomeicontheme; - }; + gupnptools = callPackage ../tools/networking/gupnp-tools {}; gvpe = builderDefsPackage ../tools/networking/gvpe { inherit openssl gmp nettools iproute; }; + gvolicon = callPackage ../tools/audio/gvolicon {}; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -1083,11 +1260,15 @@ let hardlink = callPackage ../tools/system/hardlink { }; + hashcat = callPackage ../tools/security/hashcat { }; + halibut = callPackage ../tools/typesetting/halibut { }; hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf5 = callPackage ../tools/misc/hdf5 { }; + hdf5 = callPackage ../tools/misc/hdf5 { + szip = null; + }; heimdall = callPackage ../tools/misc/heimdall { }; @@ -1149,9 +1330,12 @@ let ised = callPackage ../tools/misc/ised {}; isl = callPackage ../development/libraries/isl { }; + isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isync = callPackage ../tools/networking/isync { }; + jd-gui = callPackage_i686 ../tools/security/jd-gui { }; + jdiskreport = callPackage ../tools/misc/jdiskreport { }; jfsrec = callPackage ../tools/filesystems/jfsrec { @@ -1164,6 +1348,8 @@ let jing = callPackage ../tools/text/xml/jing { }; + jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; + jnettop = callPackage ../tools/networking/jnettop { }; jq = callPackage ../development/tools/jq {}; @@ -1172,6 +1358,10 @@ let jwhois = callPackage ../tools/networking/jwhois { }; + kazam = callPackage ../applications/video/kazam { }; + + kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; + kexectools = callPackage ../os-specific/linux/kexectools { }; keychain = callPackage ../tools/misc/keychain { }; @@ -1184,9 +1374,17 @@ let logstash = callPackage ../tools/misc/logstash { }; + logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; + + kippo = callPackage ../servers/kippo { }; + klavaro = callPackage ../games/klavaro {}; - minidlna = callPackage ../tools/networking/minidlna { }; + kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + + minidlna = callPackage ../tools/networking/minidlna { + ffmpeg = ffmpeg_0_10; + }; mmv = callPackage ../tools/misc/mmv { }; @@ -1201,11 +1399,13 @@ let nodejs = callPackage ../development/web/nodejs {}; nodePackages = recurseIntoAttrs (import ./node-packages.nix { - inherit pkgs stdenv nodejs fetchurl; + inherit pkgs stdenv nodejs fetchurl fetchgit; neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; self = pkgs.nodePackages; }); + ldapvi = callPackage ../tools/misc/ldapvi { }; + ldns = callPackage ../development/libraries/ldns { }; lftp = callPackage ../tools/networking/lftp { }; @@ -1216,10 +1416,18 @@ let libestr = callPackage ../development/libraries/libestr { }; + libevdev = callPackage ../development/libraries/libevdev { }; + + liboauth = callPackage ../development/libraries/liboauth { }; + libtirpc = callPackage ../development/libraries/ti-rpc { }; libshout = callPackage ../development/libraries/libshout { }; + libqmi = callPackage ../development/libraries/libqmi { }; + + libmbim = callPackage ../development/libraries/libmbim { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; logcheck = callPackage ../tools/system/logcheck { @@ -1228,7 +1436,7 @@ let logrotate = callPackage ../tools/system/logrotate { }; - logstalgica = callPackage ../tools/graphics/logstalgica {}; + logstalgia = callPackage ../tools/graphics/logstalgia {}; lout = callPackage ../tools/typesetting/lout { }; @@ -1242,7 +1450,7 @@ let lxc = callPackage ../os-specific/linux/lxc { }; - lzip = callPackage ../tools/compression/lzip { texinfo = texinfo5; }; + lzip = callPackage ../tools/compression/lzip { }; lzma = xz; @@ -1252,6 +1460,8 @@ let maildrop = callPackage ../tools/networking/maildrop { }; + mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; + mailutils = callPackage ../tools/networking/mailutils { guile = guile_1_8; }; @@ -1280,7 +1490,13 @@ let mdbtools = callPackage ../tools/misc/mdbtools { }; - mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { + inherit (gnome) scrollkeeper; + }; + + mednafen = callPackage ../misc/emulators/mednafen { }; + + mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; megacli = callPackage ../tools/misc/megacli { }; @@ -1288,6 +1504,8 @@ let minecraft = callPackage ../games/minecraft { }; + minecraft-server = callPackage ../games/minecraft-server { }; + minetest = callPackage ../games/minetest { libpng = libpng12; }; @@ -1310,9 +1528,7 @@ let modemmanager = callPackage ../tools/networking/modemmanager {}; - monit = builderDefsPackage ../tools/system/monit { - inherit openssl flex bison; - }; + monit = callPackage ../tools/system/monit { }; mosh = callPackage ../tools/networking/mosh { boost = boostHeaders; @@ -1363,6 +1579,8 @@ let nbd = callPackage ../tools/networking/nbd { }; + ndjbdns = callPackage ../tools/networking/ndjbdns { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; @@ -1383,6 +1601,8 @@ let netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; + nethogs = callPackage ../tools/networking/nethogs { }; + netkittftp = callPackage ../tools/networking/netkit/tftp { }; netpbm = callPackage ../tools/graphics/netpbm { }; @@ -1397,30 +1617,48 @@ let networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; - networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; }; - networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; - networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { gconf = gnome.GConf; }; + networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; + + ngrep = callPackage ../tools/networking/ngrep { }; + ngrok = callPackage ../tools/misc/ngrok { }; mpack = callPackage ../tools/networking/mpack { }; pa_applet = callPackage ../tools/audio/pa-applet { }; + nifskope = callPackage ../tools/graphics/nifskope { }; + nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; + nitrogen = callPackage ../tools/X11/nitrogen {}; + nlopt = callPackage ../development/libraries/nlopt {}; + npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; + npth = callPackage ../development/libraries/npth {}; - nmap = callPackage ../tools/security/nmap { + nmap = callPackage ../tools/security/nmap { }; + + nmap_graphical = callPackage ../tools/security/nmap { inherit (pythonPackages) pysqlite; + graphicalSupport = true; + }; + + notbit = callPackage ../applications/networking/notbit { }; + + nox = callPackage ../tools/package-management/nox { + pythonPackages = python3Packages; + nix = nixUnstable; }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; @@ -1432,6 +1670,8 @@ let ntop = callPackage ../tools/networking/ntop { }; + ntopng = callPackage ../tools/networking/ntopng { }; + ntp = callPackage ../tools/networking/ntp { }; numdiff = callPackage ../tools/text/numdiff { }; @@ -1466,17 +1706,27 @@ let opendkim = callPackage ../development/libraries/opendkim { }; + opendylan = callPackage ../development/compilers/opendylan { + opendylan-bootstrap = opendylan_bin; + }; + + opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + openjade = callPackage ../tools/text/sgml/openjade { perl = perl510; }; openobex = callPackage ../tools/bluetooth/openobex { }; - openresolv = callPackage ../tools/networking/openresolv { }; + openopc = callPackage ../tools/misc/openopc { + pythonFull = python27Full.override { + extraLibs = [ python27Packages.pyro3 ]; + }; + }; - opensc_0_11_7 = callPackage ../tools/security/opensc/0.11.7.nix { }; + openresolv = callPackage ../tools/networking/openresolv { }; - opensc = opensc_0_11_7; + opensc = callPackage ../tools/security/opensc { }; opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { }; @@ -1487,7 +1737,10 @@ let etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; - openssh_with_kerberos = lowPrio (pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; })); + + openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + + openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); opensp = callPackage ../tools/text/sgml/opensp { }; @@ -1495,7 +1748,11 @@ let openvpn = callPackage ../tools/networking/openvpn { }; - optipng = callPackage ../tools/graphics/optipng { }; + openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; + + optipng = callPackage ../tools/graphics/optipng { + libpng = libpng12; + }; oslrd = callPackage ../tools/networking/oslrd { }; @@ -1519,6 +1776,16 @@ let parted = callPackage ../tools/misc/parted { hurd = null; }; + pitivi = callPackage ../applications/video/pitivi { + gst = gst_all_1; + clutter-gtk = clutter_gtk; + inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic; + }; + + p0f = callPackage ../tools/security/p0f { }; + + pngout = callPackage ../tools/graphics/pngout { }; + hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (makeOverridable @@ -1537,7 +1804,7 @@ let { hurd = gnu.hurdCrossIntermediate; }) else null; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { }; + ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; }; patch = gnupatch; @@ -1557,8 +1824,12 @@ let briss = callPackage ../tools/graphics/briss { }; + bully = callPackage ../tools/networking/bully { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; + peco = callPackage ../tools/text/peco { }; + pg_top = callPackage ../tools/misc/pg_top { }; pdsh = callPackage ../tools/networking/pdsh { @@ -1618,12 +1889,16 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + projectm = callPackage ../applications/audio/projectm { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; cntlm = callPackage ../tools/networking/cntlm { }; + pastebinit = callPackage ../tools/misc/pastebinit { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -1634,6 +1909,8 @@ let pwnat = callPackage ../tools/networking/pwnat { }; + pycangjie = callPackage ../development/python-modules/pycangjie { }; + pydb = callPackage ../development/tools/pydb { }; pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; @@ -1656,8 +1933,12 @@ let qshowdiff = callPackage ../tools/text/qshowdiff { }; + quilt = callPackage ../development/tools/quilt { }; + radvd = callPackage ../tools/networking/radvd { }; + ranger = callPackage ../applications/misc/ranger { }; + privateer = callPackage ../games/privateer { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -1668,8 +1949,6 @@ let recoll = callPackage ../applications/search/recoll { }; - refind = callPackage ../tools/misc/refind { }; - reiser4progs = callPackage ../tools/filesystems/reiser4progs { }; reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; @@ -1678,6 +1957,8 @@ let inherit (gnome) gnome_vfs GConf; }; + remarkjs = callPackage ../development/web/remarkjs { }; + remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina {}; @@ -1690,8 +1971,16 @@ let rdiff_backup = callPackage ../tools/backup/rdiff-backup { }; + rdmd = callPackage ../development/compilers/rdmd { }; + + rhash = callPackage ../tools/security/rhash { }; + + riemann_c_client = callPackage ../tools/misc/riemann-c-client { }; + ripmime = callPackage ../tools/networking/ripmime {}; + rkflashtool = callPackage ../tools/misc/rkflashtool { }; + rmlint = callPackage ../tools/misc/rmlint {}; rng_tools = callPackage ../tools/security/rng-tools { }; @@ -1710,9 +1999,7 @@ let inherit ppp; }; - rpm = callPackage ../tools/package-management/rpm { - db4 = db45; - }; + rpm = callPackage ../tools/package-management/rpm { }; rrdtool = callPackage ../tools/misc/rrdtool { }; @@ -1728,6 +2015,8 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; + s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); + s3sync = callPackage ../tools/networking/s3sync { ruby = ruby18; }; @@ -1748,6 +2037,8 @@ let sdcv = callPackage ../applications/misc/sdcv { }; + sec = callPackage ../tools/admin/sec { }; + seccure = callPackage ../tools/security/seccure { }; setserial = builderDefsPackage (import ../tools/system/setserial) { @@ -1756,18 +2047,28 @@ let seqdiag = pythonPackages.seqdiag; + screenfetch = callPackage ../tools/misc/screenfetch { }; + sg3_utils = callPackage ../tools/system/sg3_utils { }; sharutils = callPackage ../tools/archivers/sharutils { }; + shotwell = callPackage ../applications/graphics/shotwell { }; + shebangfix = callPackage ../tools/misc/shebangfix { }; + shellinabox = callPackage ../servers/shellinabox { }; + siege = callPackage ../tools/networking/siege {}; silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; + silver-searcher = callPackage ../tools/text/silver-searcher { }; + + simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + sleuthkit = callPackage ../tools/system/sleuthkit {}; slimrat = callPackage ../tools/networking/slimrat { @@ -1791,6 +2092,16 @@ let inherit (pkgsi686Linux.xlibs) libX11; }; + solr = callPackage ../servers/search/solr { }; + + sparsehash = callPackage ../development/libraries/sparsehash { }; + + spiped = callPackage ../tools/networking/spiped { }; + + sproxy = haskellPackages.callPackage ../tools/networking/sproxy { }; + + sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; }; @@ -1803,14 +2114,14 @@ let socat = callPackage ../tools/networking/socat { }; + socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); + sourceHighlight = callPackage ../tools/text/source-highlight { # Boost 1.54 causes the "test_regexranges" test to fail - boost = boost153; + boost = boost149; }; - socat2pre = lowPrio (builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix { - inherit fetchurl stdenv openssl; - }); + spaceFM = callPackage ../applications/misc/spacefm { }; squashfsTools = callPackage ../tools/filesystems/squashfs { }; @@ -1824,6 +2135,8 @@ let super = callPackage ../tools/security/super { }; + ssdeep = callPackage ../tools/security/ssdeep { }; + ssmtp = callPackage ../tools/networking/ssmtp { tlsSupport = true; }; @@ -1838,7 +2151,7 @@ let stunnel = callPackage ../tools/networking/stunnel { }; - su = shadow; + su = shadow.su; surfraw = callPackage ../tools/networking/surfraw { }; @@ -1856,16 +2169,20 @@ let sitecopy = callPackage ../tools/networking/sitecopy { }; - privoxy = callPackage ../tools/networking/privoxy { - autoconf = autoconf213; - }; + privoxy = callPackage ../tools/networking/privoxy { }; + + t1utils = callPackage ../tools/misc/t1utils { }; tarsnap = callPackage ../tools/backup/tarsnap { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + tboot = callPackage ../tools/security/tboot { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; + tcpflow = callPackage ../tools/networking/tcpflow { }; + teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { }; # Work In Progress: it doesn't start unless running a daemon as root @@ -1879,20 +2196,36 @@ let guile = guile_1_8; }; + texmaker = callPackage ../applications/editors/texmaker { }; + + texstudio = callPackage ../applications/editors/texstudio { }; + tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; }; tinc = callPackage ../tools/networking/tinc { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + + tmpwatch = callPackage ../tools/misc/tmpwatch { }; + tmux = callPackage ../tools/misc/tmux { }; tor = callPackage ../tools/security/tor { }; torbutton = callPackage ../tools/security/torbutton { }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; + + tpm-tools = callPackage ../tools/security/tpm-tools { }; + trickle = callPackage ../tools/networking/trickle {}; + trousers = callPackage ../tools/security/trousers { }; + ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; @@ -1903,6 +2236,8 @@ let ucl = callPackage ../development/libraries/ucl { }; + ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; + udftools = callPackage ../tools/filesystems/udftools {}; udptunnel = callPackage ../tools/networking/udptunnel { }; @@ -1916,13 +2251,15 @@ let unoconv = callPackage ../tools/text/unoconv { }; upx = callPackage ../tools/compression/upx { }; - + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; + volatility = callPackage ../tools/security/volatility { }; + vidalia = callPackage ../tools/security/vidalia { }; vbetool = builderDefsPackage ../tools/system/vbetool { @@ -1933,6 +2270,8 @@ let vboot_reference = callPackage ../tools/system/vboot_reference { }; + vcsh = callPackage ../applications/version-management/vcsh { }; + verilog = callPackage ../applications/science/electronics/verilog {}; vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; @@ -1953,6 +2292,8 @@ let vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; + vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; + vorbisgain = callPackage ../tools/misc/vorbisgain { }; vpnc = callPackage ../tools/networking/vpnc { }; @@ -1961,6 +2302,10 @@ let vtun = callPackage ../tools/networking/vtun { }; + wal_e = callPackage ../tools/backup/wal-e { }; + + watchman = callPackage ../development/tools/watchman { }; + wbox = callPackage ../tools/networking/wbox {}; welkin = callPackage ../tools/graphics/welkin {}; @@ -1989,8 +2334,6 @@ let tkabber = callPackage ../applications/networking/instant-messengers/tkabber { }; - tkabber_plugins = callPackage ../applications/networking/instant-messengers/tkabber-plugins { }; - qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { @@ -2030,6 +2373,10 @@ let xarchive = callPackage ../tools/archivers/xarchive { }; + xarchiver = callPackage ../tools/archivers/xarchiver { }; + + xcruiser = callPackage ../applications/misc/xcruiser { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -2042,6 +2389,8 @@ let varnish = callPackage ../servers/varnish { }; + varnish2 = callPackage ../servers/varnish/2.1.nix { }; + venus = callPackage ../tools/misc/venus { python = python27; }; @@ -2122,8 +2471,12 @@ let xclip = callPackage ../tools/misc/xclip { }; + xtitle = callPackage ../tools/misc/xtitle { }; + xdelta = callPackage ../tools/compression/xdelta { }; + xdummy = callPackage ../tools/misc/xdummy { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { @@ -2162,6 +2515,10 @@ let zdelta = callPackage ../tools/compression/zdelta { }; + zfstools = callPackage ../tools/filesystems/zfstools { + zfs = linuxPackages.zfs; + }; + zile = callPackage ../applications/editors/zile { }; zip = callPackage ../tools/archivers/zip { }; @@ -2180,14 +2537,15 @@ let bashInteractive = appendToName "interactive" (callPackage ../shells/bash { interactive = true; - texinfo = texinfo5; }); bashCompletion = callPackage ../shells/bash-completion { }; dash = callPackage ../shells/dash { }; - fish = callPackage ../shells/fish { }; + fish = callPackage ../shells/fish { + python = python27Full; + }; tcsh = callPackage ../shells/tcsh { }; @@ -2209,8 +2567,11 @@ let aldor = callPackage ../development/compilers/aldor { }; + aliceml = callPackage ../development/compilers/aliceml { }; + aspectj = callPackage ../development/compilers/aspectj { }; + ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; avra = callPackage ../development/compilers/avra { }; @@ -2221,16 +2582,37 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; + clang = wrapClang llvmPackages.clang; + + clang_34 = wrapClang llvmPackages_34.clang; + clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); + + clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { + clang = clang_34; + llvmPackages = llvmPackages_34; + }; + + clangUnwrapped = llvm: pkg: callPackage pkg { + stdenv = if stdenv.isDarwin then stdenvApple else stdenv; + inherit llvm; }; - clang = wrapClang clangUnwrapped; + clangSelf = clangWrapSelf llvmPackagesSelf.clang; + + clangWrapSelf = build: (import ../build-support/clang-wrapper) { + clang = build; + stdenv = clangStdenv; + libc = glibc; + binutils = binutils; + shell = bash; + inherit libcxx coreutils zlib; + nativeTools = false; + nativeLibc = false; + }; #Use this instead of stdenv to build with clang clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); + libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmPackages.clang); clean = callPackage ../development/compilers/clean { }; @@ -2238,7 +2620,17 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; - cython = callPackage ../development/interpreters/cython { }; + compcert = callPackage ../development/compilers/compcert {}; + + cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {}); + cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix { + Cabal = Cabal_1_18_1_3; + cabalInstall = cabalInstall_1_18_0_3; + process = process_1_2_0_0; + }; + + cython = pythonPackages.cython; + cython3 = python3Packages.cython; dylan = callPackage ../development/compilers/gwydion-dylan { dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; @@ -2255,7 +2647,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc46; + gcc = gcc48; gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 { inherit fetchurl stdenv noSysDirs; @@ -2265,35 +2657,9 @@ let inherit fetchurl stdenv noSysDirs; }); - # XXX: GCC 4.2 (and possibly others) misdetects `makeinfo' when - # using Texinfo >= 4.10, just because it uses a stupid regexp that - # expects a single digit after the dot. As a workaround, we feed - # GCC with Texinfo 4.9. Stupid bug, hackish workaround. - - gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2) { - inherit fetchurl stdenv noSysDirs; - profiledCompiler = false; - }); - - gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) { - inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; - profiledCompiler = true; - })); - - gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) { - inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; - binutilsCross = binutilsCross; - libcCross = libcCross; - profiledCompiler = false; - enableMultilib = true; - crossStageStatic = false; - cross = assert crossSystem != null; crossSystem; - }; - - gcc44_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc/4.4) { - inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs - gettext which; + gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; } + (callPackage ../development/compilers/gcc/4.8 { + inherit noSysDirs; binutilsCross = binutilsCross; libcCross = libcCross; profiledCompiler = false; @@ -2302,89 +2668,16 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc45 = gcc45_real; - - wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper { - nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; - nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; - nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; - gcc = baseGCC; - libc = glibc; - shell = bash; - binutils = binutils_deterministic; - inherit stdenv coreutils zlib; - }; - - wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc; - - gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 { - inherit noSysDirs; - - # bootstrapping a profiled compiler does not work in the sheevaplug: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = !stdenv.isArm; - - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; - libcCross = if crossSystem != null then libcCross else null; - libpthreadCross = - if crossSystem != null && crossSystem.config == "i586-pc-gnu" - then gnu.libpthreadCross - else null; - })); - - gcc46 = gcc46_real; - - gcc47 = gcc47_real; - - gcc45_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc/4.5) { - inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib - ppl cloogppl gettext which noSysDirs; - binutilsCross = binutilsCross; - libcCross = libcCross; - profiledCompiler = false; - enableMultilib = false; - crossStageStatic = false; - cross = assert crossSystem != null; crossSystem; - }); - - gcc46_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc/4.6) { - inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib - cloog ppl gettext which noSysDirs; - binutilsCross = binutilsCross; - libcCross = libcCross; - profiledCompiler = false; - enableMultilib = false; - crossStageStatic = false; - cross = assert crossSystem != null; crossSystem; - }); - - gcc47_realCross = lib.addMetaAttrs { platforms = []; } - (makeOverridable (import ../development/compilers/gcc/4.7) { - inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib - cloog ppl gettext which noSysDirs; - binutilsCross = binutilsCross; - libcCross = libcCross; - profiledCompiler = false; - enableMultilib = false; - crossStageStatic = false; - cross = assert crossSystem != null; crossSystem; - }); - - gcc_realCross = gcc47_realCross; + gcc_realCross = gcc48_realCross; gccCrossStageStatic = let - isMingw = (stdenv.cross.libc == "msvcrt"); - isMingw64 = isMingw && stdenv.cross.config == "x86_64-w64-mingw32"; - libcCross1 = if isMingw64 then windows.mingw_w64_headers else - if isMingw then windows.mingw_headers1 else null; + libcCross1 = + if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers + else if stdenv.cross.libc == "libSystem" then darwin.xcode + else null; in wrapGCCCross { - gcc = forceNativeDrv (lib.addMetaAttrs { platforms = []; } ( + gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } ( gcc_realCross.override { crossStageStatic = true; langCC = false; @@ -2423,15 +2716,20 @@ let }; gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) { - inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */ + inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */ gettext which noSysDirs; + texinfo = texinfo4; profiledCompiler = true; })); - gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) { - inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl - ppl cloogppl + gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 { + inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl gettext which noSysDirs; + texinfo = texinfo4; + + ppl = null; + cloogppl = null; + # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = !stdenv.isArm; @@ -2447,12 +2745,15 @@ let else null; })); - gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { + gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; + ppl = null; + cloog = null; + # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = !stdenv.isArm; + profiledCompiler = false; # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -2466,30 +2767,46 @@ let texinfo = texinfo413; })); - # A non-stripped version of GCC. - gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { - stripped = false; - + gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. cross = null; - libcCross = null; - binutilsCross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; })); - gcc46_multi = + gcc48_multi = if system == "x86_64-linux" then lowPrio ( - wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { + wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override { stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); profiledCompiler = false; enableMultilib = true; })) else throw "Multilib gcc not supported on ‘${system}’"; - gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { + gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { + stripped = false; + inherit noSysDirs; - # I'm not sure if profiling with enableParallelBuilding helps a lot. - # We can enable it back some day. This makes the *gcc* builds faster now. - profiledCompiler = false; + cross = null; + libcCross = null; + binutilsCross = null; + })); + + gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -2502,15 +2819,6 @@ let else null; })); - gcc47_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { - stripped = false; - - inherit noSysDirs; - cross = null; - libcCross = null; - binutilsCross = null; - })); - gccApple = assert stdenv.isDarwin; wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) { @@ -2521,17 +2829,9 @@ let stdenv = allStdenvs.stdenvNative; }); - gfortran = gfortran46; + gfortran = gfortran48; - gfortran42 = wrapGCC (gcc42.gcc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - inherit gmp mpfr; - }); - - gfortran43 = wrapGCC (gcc43.gcc.override { + gfortran48 = wrapGCC (gcc48.gcc.override { name = "gfortran"; langFortran = true; langCC = false; @@ -2539,65 +2839,13 @@ let profiledCompiler = false; }); - gfortran44 = wrapGCC (gcc44.gcc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); + gcj = gcj48; - gfortran45 = wrapGCC (gcc45_real.gcc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran46 = wrapGCC (gcc46_real.gcc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gcj = gcj45; - - gcj44 = wrapGCC (gcc44.gcc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = true; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig; - inherit gtk; - inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender - libXrandr xproto renderproto xextproto inputproto randrproto; - }); - - gcj45 = wrapGCC (gcc45.gcc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = true; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender - libXrandr xproto renderproto xextproto inputproto randrproto; - }); - - gcj46 = wrapGCC (gcc46.gcc.override { + gcj48 = wrapGCC (gcc48.gcc.override { name = "gcj"; langJava = true; langFortran = false; - langCC = true; + langCC = false; langC = false; profiledCompiler = false; inherit zip unzip zlib boehmgc gettext pkgconfig perl; @@ -2609,20 +2857,7 @@ let gnat = gnat45; - gnat44 = wrapGCC (gcc44.gcc.override { - name = "gnat"; - langCC = false; - langC = true; - langAda = true; - profiledCompiler = false; - inherit gnatboot; - # We can't use the ppl stuff, because we would have - # libstdc++ problems. - cloogppl = null; - ppl = null; - }); - - gnat45 = wrapGCC (gcc45_real.gcc.override { + gnat45 = wrapGCC (gcc45.gcc.override { name = "gnat"; langCC = false; langC = true; @@ -2635,7 +2870,7 @@ let ppl = null; }); - gnat46 = wrapGCC (gcc46_real.gcc.override { + gnat46 = wrapGCC (gcc46.gcc.override { name = "gnat"; langCC = false; langC = true; @@ -2652,10 +2887,9 @@ let inherit fetchurl stdenv; }); - # gccgo46 does not work. I set 4.7 then. - gccgo = gccgo47; + gccgo = gccgo48; - gccgo47 = wrapGCC (gcc47_real.gcc.override { + gccgo48 = wrapGCC (gcc48.gcc.override { name = "gccgo"; langCC = true; #required for go. langC = true; @@ -2663,7 +2897,8 @@ let }); ghdl = wrapGCC (import ../development/compilers/gcc/4.3 { - inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat; + inherit stdenv fetchurl gmp mpfr noSysDirs gnat; + texinfo = texinfo4; name = "ghdl"; langVhdl = true; langCC = false; @@ -2672,17 +2907,7 @@ let enableMultilib = false; }); - # Not officially supported version for ghdl - ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 { - inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which - ppl cloogppl; - name = "ghdl"; - langVhdl = true; - langCC = false; - langC = false; - profiledCompiler = false; - enableMultilib = false; - })); + ghdl_mcode = callPackage ../development/compilers/ghdl { }; gcl = builderDefsPackage ../development/compilers/gcl { inherit mpfr m4 binutils fetchcvs emacs zlib which @@ -2699,15 +2924,30 @@ let }; jhc = callPackage ../development/compilers/jhc { - inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl - regexCompat HsSyck random; + inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl + regexCompat HsSyck random; + }; + + gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + version = "4.7-2013q3-20130916"; + releaseType = "update"; + sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; }; + gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + version = "4.8-2014q1-20140314"; + releaseType = "update"; + sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; + }; + gcc-arm-embedded = gcc-arm-embedded-4_8; # Haskell and GHC # Import Haskell infrastructure. - haskell = callPackage ./haskell-defaults.nix { inherit pkgs; }; + haskell = let pkgs_ = pkgs // { gmp = gmp.override { withStatic = true; }; }; + callPackage = newScope pkgs_; + newScope = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra); + in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; }; # Available GHC versions. @@ -2717,43 +2957,34 @@ let # NOTE (recurseIntoAttrs): After discussion, we originally decided to # enable it for all GHC versions. However, this is getting too much, # particularly in connection with Hydra builds for all these packages. - # So we enable it for selected versions only. - - # Current default version: 7.6.3. - haskellPackages = haskellPackages_ghc763; - # Current Haskell Platform: 2013.2.0.0 - haskellPlatform = haskellPackages.haskellPlatform; - - haskellPackages_ghc6104 = haskell.packages_ghc6104; - haskellPackages_ghc6121 = haskell.packages_ghc6121; - haskellPackages_ghc6122 = haskell.packages_ghc6122; - haskellPackages_ghc6123 = haskell.packages_ghc6123; - haskellPackages_ghc701 = haskell.packages_ghc701; - haskellPackages_ghc702 = haskell.packages_ghc702; - haskellPackages_ghc703 = haskell.packages_ghc703; - haskellPackages_ghc704 = haskell.packages_ghc704; - haskellPackages_ghc721 = haskell.packages_ghc721; - haskellPackages_ghc722 = haskell.packages_ghc722; - haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742 = haskell.packages_ghc742; - haskellPackages_ghc761 = haskell.packages_ghc761; - haskellPackages_ghc762 = haskell.packages_ghc762; - # 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_ghc763_no_profiling = recurseIntoAttrs (haskell.packages_ghc763.noProfiling); - haskellPackages_ghc763_profiling = recurseIntoAttrs (haskell.packages_ghc763.profiling); - haskellPackages_ghc763 = recurseIntoAttrs (haskell.packages_ghc763.highPrio); - # Reasonably current HEAD snapshot. - haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; + # So we enable it for selected versions only. We build all ghcs, though + + ghc = recurseIntoAttrs (lib.mapAttrs' (name: value: + lib.nameValuePair (builtins.substring (builtins.stringLength "packages_") (builtins.stringLength name) name) value.ghc + ) (lib.filterAttrs (name: value: + builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" + ) haskell)); + + haskellPackages = haskellPackages_ghc783; + haskellPlatform = haskellPlatformPackages."2013_2_0_0"; + + haskellPackages_ghc6104 = haskell.packages_ghc6104; + haskellPackages_ghc6123 = haskell.packages_ghc6123; + haskellPackages_ghc704 = haskell.packages_ghc704; + haskellPackages_ghc722 = haskell.packages_ghc722; + haskellPackages_ghc742 = haskell.packages_ghc742; + haskellPackages_ghc763 = haskell.packages_ghc763; + haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; + haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; + haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; + haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; + + haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); haxe = callPackage ../development/compilers/haxe { }; - hiphopvm = callPackage ../development/interpreters/hiphopvm { - libevent = libevent14; - boost = boost149; - }; + hhvm = callPackage ../development/compilers/hhvm { }; + hiphopvm = hhvm; /* Compatibility alias */ falcon = builderDefsPackage (import ../development/interpreters/falcon) { inherit cmake; @@ -2769,12 +3000,31 @@ let else callPackage ../development/compilers/go/1.1.nix { }; - go = go_1_1; + go_1_2 = callPackage ../development/compilers/go/1.2.nix { }; + + go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; + + go = go_1_3; + + gox = callPackage ../development/compilers/go/gox.nix { }; gprolog = callPackage ../development/compilers/gprolog { }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; + icedtea7_jdk = callPackage ../development/compilers/icedtea rec { + jdk = openjdk; + jdkPath = "${openjdk}/lib/openjdk"; + } // { outputs = [ "out" ]; }; + + icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs + { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; } + pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; }; + + icedtea7_web = callPackage ../development/compilers/icedtea-web { + jdk = "${icedtea7_jdk}/lib/icedtea"; + }; + ikarus = callPackage ../development/compilers/ikarus { }; hugs = callPackage ../development/compilers/hugs { }; @@ -2786,31 +3036,35 @@ let callPackage ../development/compilers/openjdk-darwin { } else let - openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; - openjdkStage1 = callPackage ../development/compilers/openjdk { - jdk = openjdkBootstrap; - ant = pkgs.ant.override { jdk = openjdkBootstrap; }; - }; - in callPackage ../development/compilers/openjdk { - jdk = openjdkStage1; - ant = pkgs.ant.override { jdk = openjdkStage1; }; - }; + openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; + in (callPackage ../development/compilers/openjdk { + jdk = openjdkBootstrap; + }) // { outputs = [ "out" ]; }; - openjre = pkgs.openjdk.override { - jreOnly = true; - }; + # FIXME: Need a way to set per-output meta attributes. + openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs + { description = "The open-source Java Runtime Environment"; } + pkgs.openjdk.jre)) // { outputs = [ "jre" ]; }; jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk else pkgs.oraclejdk; - jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjre else pkgs.oraclejre; oraclejdk = pkgs.jdkdistro true false; + oraclejdk7 = pkgs.oraclejdk7distro true false; + + oraclejdk8 = pkgs.oraclejdk8distro true false; + oraclejre = lowPrio (pkgs.jdkdistro false false); + oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); + + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); + jrePlugin = lowPrio (pkgs.jdkdistro false true); supportsJDK = @@ -2819,17 +3073,30 @@ let jdkdistro = installjdk: pluginSupport: assert supportsJDK; - (if pluginSupport then appendToName "plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); + + oraclejdk7distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); + + oraclejdk8distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; }); jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { + juliaGit = callPackage ../development/compilers/julia/git-20131013.nix { + liblapack = liblapack.override {shared = true;}; + llvm = llvm_33; + }; + julia021 = callPackage ../development/compilers/julia/0.2.1.nix { liblapack = liblapack.override {shared = true;}; - mpfr = mpfr_3_1_2; - fftw = fftw.override {pthreads = true;}; - fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; + llvm = llvm_33; }; + julia = julia021; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; @@ -2839,16 +3106,35 @@ let lessc = callPackage ../development/compilers/lessc { }; - llvm = callPackage ../development/compilers/llvm { - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; + llvm = llvmPackages.llvm; + + llvm_34 = llvmPackages_34.llvm; + llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; + + llvm_v = path: callPackage path { + stdenv = if stdenv.isDarwin then stdenvApple else stdenv; + }; + + llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // { + # until someone solves build problems with _34 + llvm = llvm_33; + clang = clang_33; }; + llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { + inherit stdenv newScope fetchurl; + isl = isl_0_12; + }); + llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; + + manticore = callPackage ../development/compilers/manticore { }; + mentorToolchains = recurseIntoAttrs ( callPackage_i686 ../development/compilers/mentor {} ); + mercury = callPackage ../development/compilers/mercury { }; + mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; @@ -2867,7 +3153,7 @@ let nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - ocaml = ocaml_3_12_1; + ocaml = ocamlPackages.ocaml; ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { }; @@ -2915,14 +3201,21 @@ let camlimages = callPackage ../development/ocaml-modules/camlimages { libpng = libpng12; + giflib = giflib_4_1; }; + biniou = callPackage ../development/ocaml-modules/biniou { }; + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + cppo = callPackage ../development/tools/ocaml/cppo { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; deriving = callPackage ../development/tools/ocaml/deriving { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; @@ -2943,34 +3236,44 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + merlin = callPackage ../development/tools/ocaml/merlin { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - ocaml_batteries = callPackage ../development/ocaml-modules/batteries { - camomile = camomile_0_8_2; - }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; + ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; + ocaml_expat = callPackage ../development/ocaml-modules/expat { }; ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocaml_http = callPackage ../development/ocaml-modules/http { }; + ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; + ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; + ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; + ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; + ocaml_pcre = callPackage ../development/ocaml-modules/pcre { inherit pcre; }; ocaml_react = callPackage ../development/ocaml-modules/react { }; + ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; + ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; @@ -2985,60 +3288,63 @@ let ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { }; + ocaml_typeconv_3_0_5 = callPackage ../development/ocaml-modules/typeconv/3.0.5.nix { }; + ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { }; ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; - opam = callPackage ../development/tools/ocaml/opam { }; + opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; + opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; + opam = opam_1_1; + + yojson = callPackage ../development/ocaml-modules/yojson { }; + + zarith = callPackage ../development/ocaml-modules/zarith { }; }; - ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; + ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; + ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; + ocamlPackages_latest = ocamlPackages_4_01_0; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { }; + opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; - opencxx = callPackage ../development/compilers/opencxx { - gcc = gcc33; - }; - qcmm = callPackage ../development/compilers/qcmm { lua = lua4; ocaml = ocaml_3_08_0; }; - deterministicStdenv = lowPrio ( - overrideInStdenv ( - stdenvAdapters.overrideGCC - (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh ) - gcc46_deterministic - ) - [ binutils_deterministic ] - ); - roadsend = callPackage ../development/compilers/roadsend { }; - # TODO: the corresponding nix file is missing - # rust = pkgsi686Linux.callPackage ../development/compilers/rust {}; + rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - sbcl = builderDefsPackage (import ../development/compilers/sbcl) { - inherit makeWrapper clisp; - }; + rust = rustc; - scala = callPackage ../development/compilers/scala { }; - sdcc = callPackage ../development/compilers/sdcc { - boost = boost149; # sdcc 3.2.0 fails to build with boost 1.53 + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; + sbcl = callPackage ../development/compilers/sbcl { + clisp = clisp; }; + scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; + scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; + scala_2_11 = callPackage ../development/compilers/scala { }; + scala = scala_2_11; + + sdcc = callPackage ../development/compilers/sdcc { }; + + smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; stalin = callPackage ../development/compilers/stalin { }; @@ -3067,13 +3373,7 @@ let urweb = callPackage ../development/compilers/urweb { }; - vala = vala19; - - vala15 = callPackage ../development/compilers/vala/15.2.nix { }; - - vala16 = callPackage ../development/compilers/vala/16.1.nix { }; - - vala19 = callPackage ../development/compilers/vala/default.nix { }; + vala = callPackage ../development/compilers/vala/default.nix { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; @@ -3094,9 +3394,9 @@ let }; wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper { - nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; - nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; - nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; + nativeTools = stdenv.gcc.nativeTools or false; + nativeLibc = stdenv.gcc.nativeLibc or false; + nativePrefix = stdenv.gcc.nativePrefix or ""; clang = baseClang; libc = glibc; shell = bash; @@ -3104,9 +3404,9 @@ let inherit stdenv coreutils zlib; }; - wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc; + wrapClang = wrapClangWith (makeOverridable (import ../build-support/clang-wrapper)) glibc; - wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc; + wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc; wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -3142,24 +3442,13 @@ let clojure = callPackage ../development/interpreters/clojure { }; - clojureUnstable = callPackage ../development/interpreters/clojure { version = "1.5.0-RC1"; }; - - clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { }; + clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix { - #clojure = clojure_binary; - }; - - clooj_standalone_binary = callPackage ../development/interpreters/clojure/clooj.nix { }; - - clooj_wrapper = callPackage ../development/interpreters/clojure/clooj-wrapper.nix { - clooj = clooj_standalone_binary; - }; - - erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; - erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlangR16B01 = callPackage ../development/interpreters/erlang/R16B01.nix { }; - erlang = erlangR16B01; + erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; + erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; + erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; + erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; + erlang = erlangR17; rebar = callPackage ../development/tools/build-managers/rebar { }; @@ -3181,33 +3470,72 @@ let jmeter = callPackage ../applications/networking/jmeter {}; - kaffe = callPackage ../development/interpreters/kaffe { }; + davmail = callPackage ../applications/networking/davmail {}; + + lxappearance = callPackage ../applications/misc/lxappearance {}; kona = callPackage ../development/interpreters/kona {}; - love = callPackage ../development/interpreters/love {}; + love = callPackage ../development/interpreters/love {lua=lua5;}; + love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; + love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; lua4 = callPackage ../development/interpreters/lua-4 { }; 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_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix { + compat = true; + }; lua5 = lua5_1; + lua = lua5; + + lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {}; + lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; + lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {}; + lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {}; luarocks = callPackage ../development/tools/misc/luarocks { lua = lua5; }; + luajit = callPackage ../development/interpreters/luajit {}; + lush2 = callPackage ../development/interpreters/lush {}; - maude = callPackage ../development/interpreters/maude { }; + maude = callPackage ../development/interpreters/maude { + bison = bison2; + flex = flex_2_5_35; + }; + + mesos = callPackage ../applications/networking/cluster/mesos { + sasl = cyrus_sasl; + automake = automake114x; + inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; + pythonProtobuf = pythonPackages.protobuf; + }; octave = callPackage ../development/interpreters/octave { fltk = fltk13; - }; + qt = null; + ghostscript = null; + llvm = null; + hdf5 = null; + glpk = null; + suitesparse = null; + openjdk = null; + gnuplot = null; + }; + octaveFull = (lowPrio (callPackage ../development/interpreters/octave { + fltk = fltk13; + qt = qt4; + })); # mercurial (hg) bleeding edge version octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; + ocropus = callPackage ../applications/misc/ocropus { }; + perl58 = callPackage ../development/interpreters/perl/5.8 { impureLibcPath = if stdenv.isLinux then null else "/usr"; }; @@ -3220,25 +3548,28 @@ let fetchurl = fetchurlBoot; }; + perl520 = callPackage ../development/interpreters/perl/5.20 { }; + perl = if system != "i686-cygwin" then perl516 else sysPerl; php = php54; - php53 = callPackage ../development/interpreters/php/5.3.nix { }; - - php54 = callPackage ../development/interpreters/php/5.4.nix { }; - - php_apc = callPackage ../development/libraries/php-apc { }; - - php_xcache = callPackage ../development/libraries/php-xcache { }; - - phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug { - php = php53; + phpPackages = recurseIntoAttrs (import ./php-packages.nix { + inherit php pkgs; }); - phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { }; + php53 = callPackage ../development/interpreters/php/5.3.nix { }; + + php_fpm53 = callPackage ../development/interpreters/php/5.3.nix { + config = config // { + php = (config.php or {}) // { + fpm = true; + apxs2 = false; + }; + }; + }; - phpXdebug = phpXdebug_5_4; + php54 = callPackage ../development/interpreters/php/5.4.nix { }; picolisp = callPackage ../development/interpreters/picolisp {}; @@ -3246,28 +3577,39 @@ let polyml = callPackage ../development/compilers/polyml { }; - pure = callPackage ../development/interpreters/pure {}; + pure = callPackage ../development/interpreters/pure { + llvm = llvm_33 ; + }; - python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); - python33 = callPackage ../development/interpreters/python/3.3 { }; - python32 = callPackage ../development/interpreters/python/3.2 { }; + python = python2; + python2 = python27; + python3 = python34; - python = python27; - python26 = callPackage ../development/interpreters/python/2.6 { }; - python27 = callPackage ../development/interpreters/python/2.7 { - libX11 = xlibs.libX11; - }; + # pythonPackages further below, but assigned here because they need to be in sync + pythonPackages = python2Packages; + python2Packages = python27Packages; + python3Packages = python34Packages; + + pythonFull = python2Full; + python2Full = python27Full; + + python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; + python27 = callPackage ../development/interpreters/python/2.7 { }; + python32 = callPackage ../development/interpreters/python/3.2 { }; + python33 = callPackage ../development/interpreters/python/3.3 { }; + python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); - pypy = callPackage ../development/interpreters/pypy/2.1 { }; + pypy = callPackage ../development/interpreters/pypy/2.3 { }; - pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = lib.attrValues python26.modules; + extraLibs = []; + postBuild = ""; python = python26; inherit (python26Packages) recursivePthLoader; }; python27Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = lib.attrValues python27.modules; + extraLibs = []; + postBuild = ""; python = python27; inherit (python27Packages) recursivePthLoader; }; @@ -3290,10 +3632,13 @@ let racket = callPackage ../development/interpreters/racket { }; - regina = callPackage ../development/interpreters/regina {}; + rakudo = callPackage ../development/interpreters/rakudo { }; + + rascal = callPackage ../development/interpreters/rascal { }; + + regina = callPackage ../development/interpreters/regina { }; renpy = callPackage ../development/interpreters/renpy { - ffmpeg = ffmpeg_1; wrapPython = pythonPackages.wrapPython; }; @@ -3318,20 +3663,33 @@ let scsh = callPackage ../development/interpreters/scsh { }; + scheme48 = callPackage ../development/interpreters/scheme48 { }; + + spark = callPackage ../applications/networking/cluster/spark { }; + spidermonkey = callPackage ../development/interpreters/spidermonkey { }; spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; + spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; + + supercollider = callPackage ../development/interpreters/supercollider { + qt = qt4; + fftw = fftwSinglePrec; + }; + + supercollider_scel = supercollider.override { useSCEL = true; }; sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; tcl = callPackage ../development/interpreters/tcl { }; - xulrunnerWrapper = {application, launcher}: - import ../development/interpreters/xulrunner/wrapper { - inherit stdenv application launcher xulrunner; - }; + xulrunner = callPackage ../development/interpreters/xulrunner { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; - xulrunner = pkgs.firefoxPkgs.xulrunner; + xulrunner_30 = firefox30Pkgs.xulrunner; ### DEVELOPMENT / MISC @@ -3357,7 +3715,10 @@ let samples = true; }; - avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {}; + avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc { + gcc = gcc46; + stdenv = overrideGCC stdenv gcc46; + }; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -3382,6 +3743,10 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + + pharo-vm = callPackage_i686 ../development/pharo/vm { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( @@ -3392,6 +3757,8 @@ let ### DEVELOPMENT / TOOLS + ansible = callPackage ../tools/system/ansible { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; @@ -3400,14 +3767,6 @@ let apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; - apacheAntOracleJDK = ant.override { jdk = pkgs.oraclejdk; }; - - apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { - # must be either pre-built or built with GCJ *alone* - gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm - }; - astyle = callPackage ../development/tools/misc/astyle { }; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -3420,14 +3779,14 @@ let automake = automake112x; - automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; - automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; + automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; + automoc4 = callPackage ../development/tools/misc/automoc4 { }; avrdude = callPackage ../development/tools/misc/avrdude { }; @@ -3442,25 +3801,22 @@ let inherit noSysDirs; }; - binutils_deterministic = lowPrio (callPackage ../development/tools/misc/binutils { + binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs; - deterministic = true; + gold = false; }); - binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils { - inherit noSysDirs; - gold = true; - }); - - binutilsCross = lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { - inherit stdenv fetchurl zlib; - noSysDirs = true; - cross = assert crossSystem != null; crossSystem; - })); + binutilsCross = + if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools + else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { + inherit stdenv fetchurl zlib bison; + noSysDirs = true; + cross = assert crossSystem != null; crossSystem; + })); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; - bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { }); - bison = bison2; + bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; + bison = bison3; buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate; @@ -3497,10 +3853,14 @@ let wrapGCC (ccache.links extraConfig)) {}; ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper); + cccc = callPackage ../development/tools/analysis/cccc { }; + cgdb = callPackage ../development/tools/misc/cgdb { }; chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + chrpath = callPackage ../development/tools/misc/chrpath { }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; complexity = callPackage ../development/tools/misc/complexity { }; @@ -3521,7 +3881,7 @@ let coccinelle = callPackage ../development/tools/misc/coccinelle { }; - framac = callPackage ../development/tools/misc/frama-c { }; + framac = callPackage ../development/tools/analysis/frama-c { }; cppi = callPackage ../development/tools/misc/cppi { }; @@ -3529,6 +3889,8 @@ let cflow = callPackage ../development/tools/misc/cflow { }; + cov-build = callPackage ../development/tools/analysis/cov-build {}; + cppcheck = callPackage ../development/tools/analysis/cppcheck { }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -3536,9 +3898,20 @@ let csslint = callPackage ../development/web/csslint { }; libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; + libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; + + libsigrok = callPackage ../development/tools/libsigrok { }; + + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; + dfeet = callPackage ../development/tools/misc/d-feet { + inherit (pythonPackages) pep8; + }; + + dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; + ddd = callPackage ../development/tools/misc/ddd { }; distcc = callPackage ../development/tools/misc/distcc { }; @@ -3569,15 +3942,13 @@ let inherit python pil makeWrapper; }; - doxygen = lowPrio (doxygen_gui.override { qt4 = null; }); - - /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf. - See <https://bugzilla.gnome.org/show_bug.cgi?id=670973>. */ - doxygen_1_7 = callPackage ../development/tools/documentation/doxygen/1.7.nix { + doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; }; - doxygen_gui = callPackage ../development/tools/documentation/doxygen { }; + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); + + drush = callPackage ../development/tools/misc/drush { }; eggdbus = callPackage ../development/tools/misc/eggdbus { }; @@ -3595,19 +3966,9 @@ let checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - flex = flex2535; - - flex2535 = callPackage ../development/tools/parsing/flex/flex-2.5.35.nix { }; - - flex2534 = callPackage ../development/tools/parsing/flex/flex-2.5.34.nix { }; - - flex2533 = callPackage ../development/tools/parsing/flex/flex-2.5.33.nix { }; - - # Note: 2.5.4a is much older than 2.5.35 but happens first when sorting - # alphabetically, hence the low priority. - flex254a = lowPrio (import ../development/tools/parsing/flex/flex-2.5.4a.nix { - inherit fetchurl stdenv yacc; - }); + flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; + flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { }; + flex = flex_2_5_39; m4 = gnum4; @@ -3617,10 +3978,11 @@ let gnum4 = callPackage ../development/tools/misc/gnum4 { }; - gnumake = callPackage ../development/tools/build-managers/gnumake { }; - - gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { }; - gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { }; + gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; + gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; + gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; + gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; + gnumake = gnumake382; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -3642,6 +4004,8 @@ let hyenae = callPackage ../tools/networking/hyenae { }; + ibus = callPackage ../development/libraries/ibus { }; + iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { inherit (perlPackages) XMLSimple; }; @@ -3652,7 +4016,9 @@ let inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; - intelgen4asm = callPackage ../development/misc/intelgen4asm { }; + intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { + inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr; + }; ired = callPackage ../development/tools/analysis/radare/ired.nix { }; @@ -3662,6 +4028,8 @@ let jikespg = callPackage ../development/tools/parsing/jikespg { }; + jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; + lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; @@ -3676,9 +4044,9 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; - lttngTools = callPackage ../development/tools/misc/lttng-tools { }; + lttng-tools = callPackage ../development/tools/misc/lttng-tools { }; - lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; lttv = callPackage ../development/tools/misc/lttv { }; @@ -3690,22 +4058,30 @@ let ninja = callPackage ../development/tools/build-managers/ninja { }; + node_webkit = callPackage ../development/tools/node-webkit { + gconf = pkgs.gnome.GConf; + }; + noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; + opengrok = callPackage ../development/tools/misc/opengrok { }; + openocd = callPackage ../development/tools/misc/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { }; patchelf = callPackage ../development/tools/misc/patchelf { }; - patchelfUnstable = callPackage ../development/tools/misc/patchelf/unstable.nix { }; - peg = callPackage ../development/tools/parsing/peg { }; - phantomjs = callPackage ../development/tools/phantomjs { }; + phantomjs = callPackage ../development/tools/phantomjs { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -3718,6 +4094,8 @@ let pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { }); pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); + prelink = callPackage ../development/tools/misc/prelink { }; + premake3 = callPackage ../development/tools/misc/premake/3.nix { }; premake4 = callPackage ../development/tools/misc/premake { }; @@ -3741,17 +4119,21 @@ let remake = callPackage ../development/tools/build-managers/remake { }; - saleaeLogic = callPackage ../development/tools/misc/saleae-logic { }; + saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; # couldn't find the source yet seleniumRCBin = callPackage ../development/tools/selenium/remote-control { jre = jdk; }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; + scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; + sigrok-cli = callPackage ../development/tools/sigrok-cli { }; + slimerjs = callPackage ../development/tools/slimerjs {}; sloccount = callPackage ../development/tools/misc/sloccount { }; @@ -3761,13 +4143,17 @@ let buildc2xml = false; }; + smc = callPackage ../tools/misc/smc { }; + sparse = callPackage ../development/tools/analysis/sparse { }; speedtest_cli = callPackage ../tools/networking/speedtest-cli { }; spin = callPackage ../development/tools/analysis/spin { }; - splint = callPackage ../development/tools/analysis/splint { }; + splint = callPackage ../development/tools/analysis/splint { + flex = flex_2_5_35; + }; stm32flash = callPackage ../development/tools/misc/stm32flash { }; @@ -3777,6 +4163,8 @@ let swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; + swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; + swigWithJava = swig; swfmill = callPackage ../tools/video/swfmill { }; @@ -3785,17 +4173,28 @@ let tcptrack = callPackage ../development/tools/misc/tcptrack { }; + teensy-loader = callPackage ../development/tools/misc/teensy { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; - texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; - texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { }; - texinfo = texinfo413; + texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; + texinfo4 = texinfo413; + texinfo = texinfo5; + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { }; + uhd = callPackage ../development/tools/misc/uhd { }; + uisp = callPackage ../development/tools/misc/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; + vagrant = callPackage ../development/tools/vagrant { + ruby = ruby2; + }; + gdb = callPackage ../development/tools/misc/gdb { hurd = gnu.hurdCross; inherit (gnu) mig; @@ -3818,7 +4217,13 @@ let xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; - xxdiff = callPackage ../development/tools/misc/xxdiff { }; + xmlindent = callPackage ../development/web/xmlindent {}; + + xpwn = callPackage ../development/mobile/xpwn {}; + + xxdiff = callPackage ../development/tools/misc/xxdiff { + bison = bison2; + }; yacc = bison; @@ -3833,6 +4238,8 @@ let aalib = callPackage ../development/libraries/aalib { }; + accountsservice = callPackage ../development/libraries/accountsservice { }; + acl = callPackage ../development/libraries/acl { }; activemq = callPackage ../development/libraries/apache-activemq { }; @@ -3845,6 +4252,8 @@ let allegro = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; + allegro5unstable = callPackage + ../development/libraries/allegro/5-unstable.nix {}; amrnb = callPackage ../development/libraries/amrnb { }; @@ -3874,15 +4283,15 @@ let attr = callPackage ../development/libraries/attr { }; + at_spi2_core = callPackage ../development/libraries/at-spi2-core { }; + + at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { }; + aqbanking = callPackage ../development/libraries/aqbanking { }; aubio = callPackage ../development/libraries/aubio { }; - audiofile = callPackage ../development/libraries/audiofile { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + audiofile = callPackage ../development/libraries/audiofile { }; axis = callPackage ../development/libraries/axis { }; @@ -3898,13 +4307,13 @@ let boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; - boost153 = callPackage ../development/libraries/boost/1.53.nix { }; - boost154 = callPackage ../development/libraries/boost/1.54.nix { }; - boost = boost154; + boost155 = callPackage ../development/libraries/boost/1.55.nix { }; + boost = boost155; boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { }; botan = callPackage ../development/libraries/botan { }; + botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; box2d = callPackage ../development/libraries/box2d { }; box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { }; @@ -3919,6 +4328,8 @@ let caelum = callPackage ../development/libraries/caelum { }; + capnproto = callPackage ../development/libraries/capnproto { }; + scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; @@ -3967,12 +4378,18 @@ let clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; - clucene_core = callPackage ../development/libraries/clucene-core { }; + clucene_core_1 = callPackage ../development/libraries/clucene-core { }; - cluceneCore = clucene_core; # !!! remove this + clucene_core = clucene_core_1; clutter = callPackage ../development/libraries/clutter { }; + clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { + cogl = cogl_1_18; + }; + + clutter-gst = callPackage ../development/libraries/clutter-gst { }; + clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { }; @@ -3980,6 +4397,8 @@ let cogl = callPackage ../development/libraries/cogl { }; + cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { }; + coin3d = callPackage ../development/libraries/coin3d { }; commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; @@ -3990,6 +4409,8 @@ let ctl = callPackage ../development/libraries/ctl { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + cppunit = callPackage ../development/libraries/cppunit { }; cppnetlib = callPackage ../development/libraries/cppnetlib { @@ -4002,37 +4423,45 @@ let cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; - db4 = db45; - - db44 = callPackage ../development/libraries/db4/db4-4.4.nix { }; - - db45 = callPackage ../development/libraries/db4/db4-4.5.nix { }; - - db47 = callPackage ../development/libraries/db4/db4-4.7.nix { }; - - db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; + # Make bdb5 the default as it is the last release under the custom + # bsd-like license + db = db5; + db4 = db48; + db44 = callPackage ../development/libraries/db/db-4.4.nix { }; + db45 = callPackage ../development/libraries/db/db-4.5.nix { }; + db47 = callPackage ../development/libraries/db/db-4.7.nix { }; + db48 = callPackage ../development/libraries/db/db-4.8.nix { }; + db5 = db53; + db53 = callPackage ../development/libraries/db/db-5.3.nix { }; + db6 = db60; + db60 = callPackage ../development/libraries/db/db-6.0.nix { }; 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 { }; dbus_python = callPackage ../development/python-modules/dbus { }; + # Should we deprecate these? Currently there are many references. - dbus_tools = dbus.tools; - dbus_libs = dbus.libs; - dbus_daemon = dbus.daemon; + dbus_tools = pkgs.dbus.tools; + dbus_libs = pkgs.dbus.libs; + dbus_daemon = pkgs.dbus.daemon; dhex = callPackage ../applications/editors/dhex { }; dclib = callPackage ../development/libraries/dclib { }; + dillo = callPackage ../applications/networking/browsers/dillo { + fltk = fltk13; + }; + directfb = callPackage ../development/libraries/directfb { }; dotconf = callPackage ../development/libraries/dotconf { }; dssi = callPackage ../development/libraries/dssi {}; - dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { }; + dragonegg = llvmPackages.dragonegg; dxflib = callPackage ../development/libraries/dxflib {}; @@ -4046,6 +4475,10 @@ let enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { }; + epoxy = callPackage ../development/libraries/epoxy { + inherit (xorg) utilmacros libX11; + }; + esdl = callPackage ../development/libraries/esdl { }; exiv2 = callPackage ../development/libraries/exiv2 { }; @@ -4070,36 +4503,43 @@ let farsight2 = callPackage ../development/libraries/farsight2 { }; - farstream = callPackage ../development/libraries/farstream { }; + farstream = callPackage ../development/libraries/farstream { + inherit (gst_all_1) + gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad + gst-libav; + }; fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg = callPackage ../development/libraries/ffmpeg { + ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { vpxSupport = !stdenv.isMips; - - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; }; ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { vpxSupport = !stdenv.isMips; }; + ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { + vpxSupport = !stdenv.isMips; + + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; + ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { vpxSupport = !stdenv.isMips; - texinfo = texinfo5; }; - ffms = callPackage ../development/libraries/ffms { }; + ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; - fftw = callPackage ../development/libraries/fftw { - singlePrecision = false; - }; + ffmpeg = ffmpeg_2; - fftwSinglePrec = callPackage ../development/libraries/fftw { - singlePrecision = true; - }; + ffms = callPackage ../development/libraries/ffms { }; + + fftw = callPackage ../development/libraries/fftw { }; + fftwSinglePrec = fftw.override { precision = "single"; }; + fftwFloat = fftwSinglePrec; # the configure option is just an alias flann = callPackage ../development/libraries/flann { }; @@ -4126,11 +4566,12 @@ let freealut = callPackage ../development/libraries/freealut { }; - freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else - callPackage ../development/libraries/freeglut { }; + freeglut = callPackage ../development/libraries/freeglut { }; freetype = callPackage ../development/libraries/freetype { }; + frei0r = callPackage ../development/libraries/frei0r { }; + fribidi = callPackage ../development/libraries/fribidi { }; funambol = callPackage ../development/libraries/funambol { }; @@ -4139,6 +4580,8 @@ let gamin = callPackage ../development/libraries/gamin { }; + ganv = callPackage ../development/libraries/ganv { }; + gav = callPackage ../games/gav { }; gsb = callPackage ../games/gsb { }; @@ -4160,13 +4603,9 @@ let geoclue = callPackage ../development/libraries/geoclue {}; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix { - libsoup = libsoup_2_40; - }; + geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; - geoip = builderDefsPackage ../development/libraries/geoip { - inherit zlib; - }; + geoip = callPackage ../development/libraries/geoip { }; geoipjava = callPackage ../development/libraries/java/geoipjava { }; @@ -4189,32 +4628,11 @@ let glew = callPackage ../development/libraries/glew { }; - glfw = callPackage ../development/libraries/glfw { }; - - glibcCross = glibc217Cross; - - glibc213 = (callPackage ../development/libraries/glibc/2.13 { - kernelHeaders = linuxHeaders; - installLocales = config.glibc.locales or false; - machHeaders = null; - hurdHeaders = null; - gccCross = null; - }) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {}); - - glibc213Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.13) - (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; - in { - inherit stdenv fetchurl; - gccCross = gccCrossStageStatic; - kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; - installLocales = config.glibc.locales or false; - } - // lib.optionalAttrs crossGNU { - inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; - inherit fetchgit; - })); + glfw = glfw3; + glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; + glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc = callPackage ../development/libraries/glibc/2.17 { + glibc = callPackage ../development/libraries/glibc/2.19 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; @@ -4222,13 +4640,13 @@ let gccCross = null; }; - glibc_memusage = callPackage ../development/libraries/glibc/2.17 { + glibc_memusage = callPackage ../development/libraries/glibc/2.19 { kernelHeaders = linuxHeaders; installLocales = false; withGd = true; }; - glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17) + glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19) (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; in { inherit stdenv fetchurl; @@ -4245,9 +4663,8 @@ let # We can choose: libcCrossChooser = name : if name == "glibc" then glibcCross else if name == "uclibc" then uclibcCross - else if name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32" then - windows.mingw_w64 - else if name == "msvcrt" then windows.mingw_headers3 + else if name == "msvcrt" then windows.mingw_w64 + else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; @@ -4257,9 +4674,9 @@ let installLocales = config.glibc.locales or false; }; - glibcLocales = callPackage ../development/libraries/glibc/2.17/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc/2.17/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi" @@ -4276,6 +4693,15 @@ let ln -s $glibc32/lib $out/lib/32 ln -s lib $out/lib64 + # fixing ldd RLTDLIST + rm $out/bin + cp -rs $glibc64/bin $out + chmod u+w $out/bin + rm $out/bin/ldd + sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ + $glibc64/bin/ldd > $out/bin/ldd + chmod 555 $out/bin/ldd + rm $out/include cp -rs $glibc32/include $out chmod -R u+w $out/include @@ -4283,11 +4709,18 @@ let '' # */ ; + glm = callPackage ../development/libraries/glm { }; + + glog = callPackage ../development/libraries/glog { }; + + gloox = callPackage ../development/libraries/gloox { }; + glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; libpng = libpng12; + giflib = giflib_4_1; }; gmime = callPackage ../development/libraries/gmime { }; @@ -4295,38 +4728,29 @@ let gmm = callPackage ../development/libraries/gmm { }; gmp = gmp5; + gmp5 = gmp51; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x. gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; - gmp5 = callPackage ../development/libraries/gmp/5.0.5.nix { }; + gmp51 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp51 = callPackage ../development/libraries/gmp/5.1.1.nix { }; + #GMP ex-satellite, so better keep it near gmp + mpfr = callPackage ../development/libraries/mpfr/default.nix { }; gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; - goffice = callPackage ../development/libraries/goffice { - inherit (gnome) libglade libgnomeui; - gconf = gnome.GConf; - libart = gnome.libart_lgpl; - }; - - goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix { - inherit (gnome) libglade libgnomeui; - gconf = gnome.GConf; - libart = gnome.libart_lgpl; - gtk = gtk3; - }; - goocanvas = callPackage ../development/libraries/goocanvas { }; + google-gflags = callPackage ../development/libraries/google-gflags { }; + gperftools = callPackage ../development/libraries/gperftools { }; - #GMP ex-satellite, so better keep it near gmp - mpfr = callPackage ../development/libraries/mpfr { }; - mpfr_3_1_2 = callPackage ../development/libraries/mpfr/3.1.2.nix { }; + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; }); + }); gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; @@ -4337,48 +4761,49 @@ let gstFfmpeg = pkgs.gst_ffmpeg; }; - gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {}; + gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { + bison = bison2; + }; + + gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {}; - gst_plugins_base = callPackage ../development/libraries/gstreamer/gst-plugins-base {}; + gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; - gst_plugins_good = callPackage ../development/libraries/gstreamer/gst-plugins-good {}; + gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {}; - gst_plugins_bad = callPackage ../development/libraries/gstreamer/gst-plugins-bad {}; + gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; + gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { + ffmpeg = ffmpeg_0_10; + }; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {}; + gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; - gst_python = callPackage ../development/libraries/gstreamer/gst-python {}; + gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; - gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; + gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gusb = callPackage ../development/libraries/gusb { inherit (gnome) gtkdoc; }; - qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; + qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; gnet = callPackage ../development/libraries/gnet { }; - gnu-efi = callPackage ../development/libraries/gnu-efi { - stdenv = overrideGCC stdenv gcc47; - }; + gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = callPackage ../development/libraries/gnutls { - guileBindings = config.gnutls.guile or true; - }; + gnutls = gnutls32; - gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { - guileBindings = config.gnutls.guile or true; + gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { + guileBindings = config.gnutls.guile or false; }; gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { - guileBindings = config.gnutls.guile or true; + guileBindings = config.gnutls.guile or false; }; - gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); - gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); + gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; @@ -4407,10 +4832,9 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib { - stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; - automake = automake113x; - }; + glib = callPackage ../development/libraries/glib { }; + + glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles glibmm = callPackage ../development/libraries/glibmm { }; @@ -4427,27 +4851,26 @@ let !stdenv.isArm && !stdenv.isMips); }; - cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; - - pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { - cairo = cairo_1_12_2; - }; + pangomm = callPackage ../development/libraries/pangomm { }; pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { + # workaround signal 10 in gdk_pixbuf tests + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { - inherit (gnome3) at_spi2_atk; - }); + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; gtk = pkgs.gtk2; @@ -4477,23 +4900,22 @@ let gtkspell = callPackage ../development/libraries/gtkspell { }; - gts = callPackage ../development/libraries/gts { }; + gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; - gurobi = callPackage ../development/libraries/gurobi {}; + gts = callPackage ../development/libraries/gts { }; - gvfs = callPackage ../development/libraries/gvfs { }; + gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; + hamlib = callPackage ../development/libraries/hamlib { }; + # TODO : Add MIT Kerberos and let admin choose. kerberos = heimdal; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; - harfbuzz = callPackage ../development/libraries/harfbuzz { - icu = null; - graphite2 = null; - }; + harfbuzz = callPackage ../development/libraries/harfbuzz { }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -4505,7 +4927,7 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; - http_parser = callPackage ../development/libraries/http_parser { inherit (pythonPackages) gyp; }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -4515,14 +4937,6 @@ let hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - icedtea = callPackage ../development/libraries/java/icedtea { - ant = apacheAntGcj; - xerces = xercesJava; - xulrunner = icecatXulrunner3; - inherit (xlibs) libX11 libXp libXtst libXinerama libXt - libXrender xproto; - }; - icu = callPackage ../development/libraries/icu { }; id3lib = callPackage ../development/libraries/id3lib { }; @@ -4531,6 +4945,8 @@ let ilbc = callPackage ../development/libraries/ilbc { }; + ilixi = callPackage ../development/libraries/ilixi { }; + ilmbase = callPackage ../development/libraries/ilmbase { }; imlib = callPackage ../development/libraries/imlib { @@ -4545,8 +4961,6 @@ let iniparser = callPackage ../development/libraries/iniparser { }; - inteltbb = callPackage ../development/libraries/intel-tbb { }; - intltool = callPackage ../development/tools/misc/intltool { }; irrlicht3843 = callPackage ../development/libraries/irrlicht { }; @@ -4573,6 +4987,7 @@ let json_glib = callPackage ../development/libraries/json-glib { }; + json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable json_c = callPackage ../development/libraries/json-c { }; jsoncpp = callPackage ../development/libraries/jsoncpp { }; @@ -4581,6 +4996,16 @@ let judy = callPackage ../development/libraries/judy { }; + keybinder = callPackage ../development/libraries/keybinder { + automake = automake111x; + lua = lua5_1; + }; + + keybinder3 = callPackage ../development/libraries/keybinder3 { + automake = automake111x; + lua = lua5_1; + }; + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lcms = lcms1; @@ -4603,6 +5028,10 @@ let libpng = libpng12; }; + lgi = callPackage ../development/libraries/lgi { + lua = lua5_1; + }; + lib3ds = callPackage ../development/libraries/lib3ds { }; libaacs = callPackage ../development/libraries/libaacs { }; @@ -4623,9 +5052,11 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = libav_9; + libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; + + libav = libav_10; libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_9 libav_0_8; + inherit (libav_all) libav_0_8 libav_9 libav_10; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -4650,6 +5081,7 @@ let libcddb = callPackage ../development/libraries/libcddb { }; libcdio = callPackage ../development/libraries/libcdio { }; + libcdio082 = callPackage ../development/libraries/libcdio/0.82.nix { }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; @@ -4665,6 +5097,10 @@ let inherit (gnome3) libcroco; + libcangjie = callPackage ../development/libraries/libcangjie { }; + + libcredis = callPackage ../development/libraries/libcredis { }; + libctemplate = callPackage ../development/libraries/libctemplate { }; libcue = callPackage ../development/libraries/libcue { }; @@ -4724,18 +5160,25 @@ let libelf = callPackage ../development/libraries/libelf { }; + libfm = callPackage ../development/libraries/libfm { }; + libgadu = callPackage ../development/libraries/libgadu { }; - libgdata = (newScope gnome) ../development/libraries/libgdata {}; - libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {}; + libgdata = gnome3.libgdata; libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = gnome3.libgnome_keyring; + libgnurl = callPackage ../development/libraries/libgnurl { }; + + libseccomp = callPackage ../development/libraries/libseccomp { }; + libsecret = callPackage ../development/libraries/libsecret { }; + libserialport = callPackage ../development/libraries/libserialport { }; + libgtop = callPackage ../development/libraries/libgtop {}; liblo = callPackage ../development/libraries/liblo { }; @@ -4744,6 +5187,9 @@ let liblscp = callPackage ../development/libraries/liblscp { }; + libe-book = callPackage ../development/libraries/libe-book {}; + libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {}; + libev = builderDefsPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; @@ -4777,12 +5223,16 @@ let libftdi = callPackage ../development/libraries/libftdi { }; + libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; + libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_git = lowPrio (callPackage ../development/libraries/libgcrypt/git.nix { }); + libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { }); libgdiplus = callPackage ../development/libraries/libgdiplus { }; + libgksu = callPackage ../development/libraries/libgksu { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; @@ -4805,6 +5255,8 @@ let useGTK = config.libiodbc.gtk or false; }; + libivykis = callPackage ../development/libraries/libivykis { }; + liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; liblastfm = callPackage ../development/libraries/liblastfm { }; @@ -4813,18 +5265,26 @@ let liblockfile = callPackage ../development/libraries/liblockfile { }; + liblogging = callPackage ../development/libraries/liblogging { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmhash = callPackage ../development/libraries/libmhash {}; + libmodbus = callPackage ../development/libraries/libmodbus {}; + libmtp = callPackage ../development/libraries/libmtp { }; + libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libnatspec = callPackage ../development/libraries/libnatspec { }; libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; libnice = callPackage ../development/libraries/libnice { }; + liboping = callPackage ../development/libraries/liboping { }; + libplist = callPackage ../development/libraries/libplist { }; libQGLViewer = callPackage ../development/libraries/libqglviewer { }; @@ -4832,9 +5292,13 @@ let libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; - libsamplerate = callPackage ../development/libraries/libsamplerate { - stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; - }; + libresample = callPackage ../development/libraries/libresample {}; + + librevenge = callPackage ../development/libraries/librevenge {}; + + librevisa = callPackage ../development/libraries/librevisa { }; + + libsamplerate = callPackage ../development/libraries/libsamplerate { }; libspectre = callPackage ../development/libraries/libspectre { }; @@ -4849,6 +5313,9 @@ let then null else libiconv; + # The logic behind this attribute is broken: libiconvOrNull==null does + # NOT imply libiconv=glibc! On Darwin, for example, we have a native + # libiconv library which is not glibc. libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv; # On non-GNU systems we need GNU Gettext for libintl. @@ -4905,11 +5372,13 @@ let libmilter = callPackage ../development/libraries/libmilter { }; + libmkv = callPackage ../development/libraries/libmkv { }; + libmms = callPackage ../development/libraries/libmms { }; libmowgli = callPackage ../development/libraries/libmowgli { }; - libmng = callPackage ../development/libraries/libmng { lcms = lcms2; }; + libmng = callPackage ../development/libraries/libmng { }; libmnl = callPackage ../development/libraries/libmnl { }; @@ -4917,6 +5386,8 @@ let libmpcdec = callPackage ../development/libraries/libmpcdec { }; + libmp3splt = callPackage ../development/libraries/libmp3splt { }; + libmrss = callPackage ../development/libraries/libmrss { }; libmsn = callPackage ../development/libraries/libmsn { }; @@ -4929,8 +5400,15 @@ let libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { }; + libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; + libmusicbrainz = libmusicbrainz3; + libmwaw = callPackage ../development/libraries/libmwaw { }; + libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { }; + + libmx = callPackage ../development/libraries/libmx { }; + libnet = callPackage ../development/libraries/libnet { }; libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; @@ -4945,6 +5423,8 @@ let libnxml = callPackage ../development/libraries/libnxml { }; + libodfgen = callPackage ../development/libraries/libodfgen { }; + libofa = callPackage ../development/libraries/libofa { }; libofx = callPackage ../development/libraries/libofx { }; @@ -4959,11 +5439,15 @@ let libopus = callPackage ../development/libraries/libopus { }; + libosinfo = callPackage ../development/libraries/libosinfo {}; + libosip = callPackage ../development/libraries/osip {}; libosip_3 = callPackage ../development/libraries/osip/3.nix {}; - libotr = callPackage ../development/libraries/libotr { }; + libotr = callPackage ../development/libraries/libotr { + libgcrypt = libgcrypt_1_6; + }; libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { }; @@ -4973,6 +5457,8 @@ let libpcap = callPackage ../development/libraries/libpcap { }; + libpipeline = callPackage ../development/libraries/libpipeline { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; @@ -4980,10 +5466,16 @@ let libpaper = callPackage ../development/libraries/libpaper { }; - libproxy = callPackage ../development/libraries/libproxy { }; + libproxy = callPackage ../development/libraries/libproxy { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gcc + else stdenv; + }; libpseudo = callPackage ../development/libraries/libpseudo { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; + libqalculate = callPackage ../development/libraries/libqalculate { }; librsvg = callPackage ../development/libraries/librsvg { @@ -4992,6 +5484,8 @@ let librsync = callPackage ../development/libraries/librsync { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; + libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -5001,14 +5495,11 @@ let # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; - libsndfile = callPackage ../development/libraries/libsndfile { - stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; - }; + libsndfile = callPackage ../development/libraries/libsndfile { }; 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 { }; @@ -5039,10 +5530,14 @@ let libtoxcore = callPackage ../development/libraries/libtoxcore { }; + libtsm = callPackage ../development/libraries/libtsm { }; + libtunepimp = callPackage ../development/libraries/libtunepimp { }; libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; + libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { }; + libgeotiff = callPackage ../development/libraries/libgeotiff { }; libunistring = callPackage ../development/libraries/libunistring { }; @@ -5050,29 +5545,28 @@ let libupnp = callPackage ../development/libraries/pupnp { }; giflib = callPackage ../development/libraries/giflib { }; + giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { }; - libunibreak = callPackage ../development/libraries/libunibreak/default.nix { }; + libunibreak = callPackage ../development/libraries/libunibreak { }; 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 - else stdenv; - }; + libusb = callPackage ../development/libraries/libusb {}; libusb1 = callPackage ../development/libraries/libusb1 { - stdenv = if stdenv.isDarwin # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50909 - then overrideGCC stdenv gccApple + stdenv = if stdenv.isDarwin + then clangStdenv else stdenv; }; libunwind = callPackage ../development/libraries/libunwind { }; + libuvVersions = callPackage ../development/libraries/libuv { }; + libv4l = lowPrio (v4l_utils.override { withQt4 = false; }); @@ -5083,6 +5577,8 @@ let libvirt = callPackage ../development/libraries/libvirt { }; + libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; + libvisio = callPackage ../development/libraries/libvisio { }; libvisual = callPackage ../development/libraries/libvisual { }; @@ -5101,7 +5597,8 @@ let libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = callPackage ../development/libraries/libwnck { }; + libwnck = libwnck2; + libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; libwpd = callPackage ../development/libraries/libwpd { }; @@ -5130,6 +5627,8 @@ let libxmlxx = callPackage ../development/libraries/libxmlxx { }; + libxmp = callPackage ../development/libraries/libxmp { }; + libxslt = callPackage ../development/libraries/libxslt { }; libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { @@ -5141,13 +5640,19 @@ let libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { }; + libyubikey = callPackage ../development/libraries/libyubikey {}; + libzip = callPackage ../development/libraries/libzip { }; + libzdb = callPackage ../development/libraries/libzdb { }; + libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix { ccrtp = ccrtp_1_8; }; + libwacom = callPackage ../development/libraries/libwacom { }; + lightning = callPackage ../development/libraries/lightning { }; lirc = callPackage ../development/libraries/lirc { }; @@ -5158,7 +5663,7 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis + libogg libvorbis libcaca csound cunit ; guile = guile_1_8; libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 @@ -5174,27 +5679,35 @@ let lzo = callPackage ../development/libraries/lzo { }; + mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds = callPackage ../development/libraries/mdds { }; # failed to build - mediastreamer = callPackage ../development/libraries/mediastreamer { - ffmpeg = ffmpeg_1; - }; + mediastreamer = callPackage ../development/libraries/mediastreamer { }; + + menu-cache = callPackage ../development/libraries/menu-cache { }; mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa_original = callPackage ../development/libraries/mesa { }; - mesa_noglu = if stdenv.isDarwin - then darwinX11AndOpenGL // { driverLink = mesa_noglu; } - else mesa_original; - mesa_drivers = mesa_original.drivers; - mesa_glu = callPackage ../development/libraries/mesa-glu { }; - mesa = if stdenv.isDarwin then darwinX11AndOpenGL - else buildEnv { - name = "mesa-${mesa_noglu.version}"; - paths = [ mesa_glu mesa_noglu ]; + mesaDarwinOr = alternative: if stdenv.isDarwin + then callPackage ../development/libraries/mesa-darwin { } + else alternative; + mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa { + # makes it slower, but during runtime we link against just mesa_drivers + # through /run/opengl-driver*, which is overriden according to config.grsecurity + grsecEnabled = true; + }); + mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); + mesa_drivers = mesaDarwinOr ( + let mo = mesa_noglu.override { + grsecEnabled = config.grsecurity or false; }; - darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; + in mo.drivers + ); + mesa = mesaDarwinOr (buildEnv { + name = "mesa-${mesa_noglu.version}"; + paths = [ mesa_noglu mesa_glu ]; + }); metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; @@ -5215,6 +5728,8 @@ let ming = callPackage ../development/libraries/ming { }; + minizip = callPackage ../development/libraries/minizip { }; + minmay = callPackage ../development/libraries/minmay { }; miro = callPackage ../applications/video/miro { @@ -5223,10 +5738,20 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { - ffmpeg = ffmpeg_1; + mlt-qt4 = callPackage ../development/libraries/mlt { + qt = qt4; + SDL = SDL_pulseaudio; + }; + + mlt-qt5 = callPackage ../development/libraries/mlt { + qt = qt5; + SDL = SDL_pulseaudio; }; + movit = callPackage ../development/libraries/movit { }; + + mps = callPackage ../development/libraries/mps { }; + libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; mpeg2dec = libmpeg2; @@ -5241,10 +5766,16 @@ let mtdev = callPackage ../development/libraries/mtdev { }; - mu = callPackage ../tools/networking/mu { }; + mtpfs = callPackage ../tools/filesystems/mtpfs { }; + + mu = callPackage ../tools/networking/mu { + texinfo = texinfo4; + }; muparser = callPackage ../development/libraries/muparser { }; + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mygui = callPackage ../development/libraries/mygui {}; myguiSvn = callPackage ../development/libraries/mygui/svn.nix {}; @@ -5253,25 +5784,11 @@ let mythes = callPackage ../development/libraries/mythes { }; - ncurses_5_4 = makeOverridable (import ../development/libraries/ncurses/5_4.nix) { - inherit fetchurl; - unicode = system != "i686-cygwin"; - stdenv = if stdenv.isDarwin - then allStdenvs.stdenvNative - else stdenv; - }; - ncurses_5_9 = makeOverridable (import ../development/libraries/ncurses) { - inherit fetchurl; + nanomsg = callPackage ../development/libraries/nanomsg { }; + + ncurses = callPackage ../development/libraries/ncurses { unicode = system != "i686-cygwin"; - stdenv = - # On Darwin, NCurses uses `-no-cpp-precomp', which is specific to - # Apple-GCC. Since NCurses is part of stdenv, always use - # `stdenvNative' to build it. - if stdenv.isDarwin - then allStdenvs.stdenvNative - else stdenv; }; - ncurses = ncurses_5_9; neon = callPackage ../development/libraries/neon { compressionSupport = true; @@ -5286,6 +5803,10 @@ let newt = callPackage ../development/libraries/newt { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = pkgs.nixUnstable; + }; + nspr = callPackage ../development/libraries/nspr { }; nss = lowPrio (callPackage ../development/libraries/nss { }); @@ -5296,6 +5817,8 @@ let ntrack = callPackage ../development/libraries/ntrack { }; + nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; + ode = builderDefsPackage (import ../development/libraries/ode) { }; ogre = callPackage ../development/libraries/ogre {}; @@ -5324,12 +5847,9 @@ let openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { - ffmpeg = ffmpeg_0_6_90; - }; + opencv = callPackage ../development/libraries/opencv { }; opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { - ffmpeg = ffmpeg_0_6_90; libpng = libpng12; }; @@ -5342,9 +5862,7 @@ let openlierox = callPackage ../games/openlierox { }; - libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { - opensc = opensc_0_11_7; - }; + libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { }; opencolorio = callPackage ../development/libraries/opencolorio { }; @@ -5354,7 +5872,16 @@ let openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; - openscenegraph = callPackage ../development/libraries/openscenegraph {}; + openscenegraph = callPackage ../development/libraries/openscenegraph { + giflib = giflib_4_1; + ffmpeg = ffmpeg_0_10; + }; + + openspades = callPackage ../games/openspades {}; + + libressl = callPackage ../development/libraries/libressl { }; + + boringssl = callPackage ../development/libraries/boringssl { }; openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -5370,6 +5897,8 @@ let p11_kit = callPackage ../development/libraries/p11-kit { }; + paperkey = callPackage ../tools/security/paperkey { }; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcl = callPackage ../development/libraries/pcl { @@ -5400,7 +5929,9 @@ let podofo = callPackage ../development/libraries/podofo { }; - polkit = callPackage ../development/libraries/polkit { }; + polkit = callPackage ../development/libraries/polkit { + spidermonkey = spidermonkey_185; + }; polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { }; @@ -5409,13 +5940,6 @@ let poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; - poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { - lcms = lcms2; - glibSupport = true; - gtk3Support = false; - qt4Support = false; - }; - popt = callPackage ../development/libraries/popt { }; portaudio = callPackage ../development/libraries/portaudio { @@ -5478,6 +6002,51 @@ let docs = true; demos = true; examples = true; + developerBuild = true; + }; + + qt4SDK = qtcreator.override { + sdkBuild = true; + qtLib = qt48Full; + }; + + qt53Full = qt53.override { + buildDocs = true; + buildExamples = true; + buildTests = true; + developerBuild = true; + }; + + qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix { + mesa = mesa_noglu; + cups = if stdenv.isLinux then cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (gnome) libgnomeui GConf gnome_vfs; + bison = bison2; # error: too few arguments to function 'int yylex(... + }; + + qt5 = callPackage ../development/libraries/qt-5 { + mesa = mesa_noglu; + cups = if stdenv.isLinux then cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (gnome) libgnomeui GConf gnome_vfs; + bison = bison2; # error: too few arguments to function 'int yylex(... + }; + + qt5Full = qt5.override { + buildDocs = true; + buildExamples = true; + buildTests = true; + developerBuild = true; + }; + + qt5SDK = qtcreator.override { + sdkBuild = true; + qtLib = qt5Full; + }; + + qtcreator = callPackage ../development/qtcreator { + qtLib = qt48.override { developerBuild = true; }; }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -5486,20 +6055,20 @@ let qwt = callPackage ../development/libraries/qwt {}; - readline = readline6; + qwt6 = callPackage ../development/libraries/qwt/6.nix { }; - readline4 = callPackage ../development/libraries/readline/readline4.nix { }; + rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; - readline5 = callPackage ../development/libraries/readline/readline5.nix { }; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; - readline6 = callPackage ../development/libraries/readline/readline6.nix { - stdenv = - # On Darwin, Readline uses `-arch_only', which is specific to - # Apple-GCC. So give it what it expects. - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + raul = callPackage ../development/libraries/audio/raul { }; + + readline = readline6; + readline6 = readline63; + + readline62 = callPackage ../development/libraries/readline/readline6.nix { }; + + readline63 = callPackage ../development/libraries/readline/readline6.3.nix { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -5515,12 +6084,13 @@ let lv2 = callPackage ../development/libraries/audio/lv2 { }; + lvtk = callPackage ../development/libraries/audio/lvtk { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; redland = pkgs.librdf_redland; rhino = callPackage ../development/libraries/java/rhino { - ant = apacheAntGcj; javac = gcj; jvm = gcj; }; @@ -5548,6 +6118,9 @@ let else stdenv; }; + # Fixes major problems with choppy sound in MLT / Kdenlive / Shotcut + SDL_pulseaudio = SDL.override { pulseaudioSupport = true; }; + SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; SDL_image = callPackage ../development/libraries/SDL_image { @@ -5580,6 +6153,8 @@ let serd = callPackage ../development/libraries/serd {}; + serf = callPackage ../development/libraries/serf {}; + silgraphite = callPackage ../development/libraries/silgraphite {}; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; @@ -5591,6 +6166,7 @@ let slibGuile = callPackage ../development/libraries/slib { scheme = guile_1_8; + texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx' }; smpeg = callPackage ../development/libraries/smpeg { }; @@ -5627,6 +6203,8 @@ let inherit (pythonPackages) pyparsing; }; + spice_gtk = callPackage ../development/libraries/spice-gtk { }; + spice_protocol = callPackage ../development/libraries/spice-protocol { }; sratom = callPackage ../development/libraries/audio/sratom { }; @@ -5644,6 +6222,11 @@ let inherit readline ncurses; }); + sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { + readline = null; + ncurses = null; + }); + stfl = callPackage ../development/libraries/stfl { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple @@ -5652,14 +6235,22 @@ let stlink = callPackage ../development/tools/misc/stlink { }; + steghide = callPackage ../tools/security/steghide {}; + + stepmania = callPackage ../games/stepmania {}; + stlport = callPackage ../development/libraries/stlport { }; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + suil = callPackage ../development/libraries/audio/suil { }; suitesparse = callPackage ../development/libraries/suitesparse { }; + sutils = callPackage ../tools/misc/sutils { }; + sword = callPackage ../development/libraries/sword { }; szip = callPackage ../development/libraries/szip { }; @@ -5690,13 +6281,13 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; + thrift = callPackage ../development/libraries/thrift { }; + tinyxml = tinyxml2; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; - tk = callPackage ../development/libraries/tk { - libX11 = xlibs.libX11; - }; + tk = callPackage ../development/libraries/tk { }; tnt = callPackage ../development/libraries/tnt { }; @@ -5720,8 +6311,16 @@ let ustr = callPackage ../development/libraries/ustr { }; + usbredir = callPackage ../development/libraries/usbredir { + libusb = libusb1; + }; + ucommon = callPackage ../development/libraries/ucommon { }; + v8 = callPackage ../development/libraries/v8 { + inherit (pythonPackages) gyp; + }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; @@ -5742,7 +6341,7 @@ let vtk = callPackage ../development/libraries/vtk { }; - vtkWithQt4 = vtk.override { useQt4 = true; }; + vtkWithQt4 = vtk.override { qtLib = qt4; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; @@ -5750,26 +6349,19 @@ let wayland = callPackage ../development/libraries/wayland { }; - webkit = - builderDefsPackage ../development/libraries/webkit { - inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild - inherit gtk3 glib atk cairo pango fontconfig freetype; - 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; - inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; - }; + webkit = webkitgtk; - webkit_gtk2 = - builderDefsPackage ../development/libraries/webkit/gtk2.nix { - inherit gtk2 glib atk cairo pango fontconfig freetype; - 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; - inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + webkitgtk = callPackage ../development/libraries/webkitgtk { + harfbuzz = harfbuzz.override { + withIcu = true; }; + gst-plugins-base = gst_all_1.gst-plugins-base; + }; + + webkitgtk2 = webkitgtk.override { + withGtk2 = true; + enableIntrospection = false; + }; wildmidi = callPackage ../development/libraries/wildmidi { }; @@ -5792,6 +6384,16 @@ let else stdenv; }; + wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { + inherit (gnome) GConf; + withMesa = lib.elem system lib.platforms.mesaPlatforms; + + # use for Objective-C++ compiler + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; + wtk = callPackage ../development/libraries/wtk { }; x264 = callPackage ../development/libraries/x264 { }; @@ -5810,18 +6412,18 @@ let xbase = callPackage ../development/libraries/xbase { }; - xineLib = callPackage ../development/libraries/xine-lib { }; + xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; + + xdo = callPackage ../tools/misc/xdo { }; + + xineLib = callPackage ../development/libraries/xine-lib { + ffmpeg = ffmpeg_1; + }; xautolock = callPackage ../misc/screensavers/xautolock { }; xercesc = callPackage ../development/libraries/xercesc {}; - xercesJava = callPackage ../development/libraries/java/xerces { - ant = apacheAntGcj; # for bootstrap purposes - javac = gcj; - jvm = gcj; - }; - xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt @@ -5832,14 +6434,20 @@ let xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; + xmlsec = callPackage ../development/libraries/xmlsec { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; + xylib = callPackage ../development/libraries/xylib { }; + yajl = callPackage ../development/libraries/yajl { }; zangband = builderDefsPackage (import ../games/zangband) { inherit ncurses flex bison autoconf automake m4 coreutils; }; + zeitgeist = callPackage ../development/libraries/zeitgeist { }; + zlib = callPackage ../development/libraries/zlib { fetchurl = fetchurlBoot; }; @@ -5850,6 +6458,9 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; + zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / JAVA @@ -5888,7 +6499,9 @@ let stdenv = overrideInStdenv stdenv [gnumake380]; }; - junit = callPackage ../development/libraries/java/junit { }; + junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; }; + + junixsocket = callPackage ../development/libraries/java/junixsocket { }; jzmq = callPackage ../development/libraries/java/jzmq { }; @@ -5910,43 +6523,39 @@ let inherit (gnome) libsoup; }; - v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; }; - - xalanj = xalanJava; - xalanJava = callPackage ../development/libraries/java/xalanj { - ant = apacheAntGcj; # for bootstrap purposes - javac = gcj; - jvm = gcj; - xerces = xercesJava; }; - - xmlsec = callPackage ../development/libraries/xmlsec { }; - - zziplib = callPackage ../development/libraries/zziplib { }; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + yuicompressor = callPackage ../development/tools/yuicompressor { }; + ### DEVELOPMENT / LISP MODULES - asdf = callPackage ../development/lisp-modules/asdf {}; + asdf = callPackage ../development/lisp-modules/asdf { + texLive = null; + }; + clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; - wrapLisp = lisp: clwrapperFunction {lisp=lisp;}; - lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{ + + wrapLisp = lisp: clwrapperFunction { inherit 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 buildPerlPackage = import ../development/perl-modules/generic perl; perlPackages = recurseIntoAttrs (import ./perl-packages.nix { inherit pkgs; - __overrides = (config.perlPackageOverrides or (p: {})) pkgs; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); perl510Packages = import ./perl-packages.nix { @@ -5954,7 +6563,7 @@ let perl = perl510; buildPerlPackage = import ../development/perl-modules/generic perl510; }; - __overrides = (config.perl510PackageOverrides or (p: {})) pkgs; + overrides = (config.perl510PackageOverrides or (p: {})) pkgs; }; perl514Packages = import ./perl-packages.nix { @@ -5962,56 +6571,56 @@ let perl = perl514; buildPerlPackage = import ../development/perl-modules/generic perl514; }; - __overrides = (config.perl514PackageOverrides or (p: {})) pkgs; + overrides = (config.perl514PackageOverrides or (p: {})) pkgs; }; perlXMLParser = perlPackages.XMLParser; ack = perlPackages.ack; + perlArchiveCpio = perlPackages.ArchiveCpio; + perlcritic = perlPackages.PerlCritic; + planetary_annihilation = callPackage ../games/planetaryannihilation { }; + ### DEVELOPMENT / PYTHON MODULES # python function with default python interpreter buildPythonPackage = pythonPackages.buildPythonPackage; - pythonPackages = python27Packages; - # `nix-env -i python-nose` installs for 2.7, the default python. # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works # regardless. python26Packages = import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python26; }; - python3Packages = python33Packages; - - python33Packages = recurseIntoAttrs (import ./python-packages.nix { + python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; - python = python33; - }); + python = python27; + })); python32Packages = import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = python32; }; - python27Packages = recurseIntoAttrs (import ./python-packages.nix { + python33Packages = recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs; + python = python33; + }); + + python34Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; - python = python27; + python = python34; }); pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; - inherit (lib) lowPrio; python = pypy; }); @@ -6019,6 +6628,8 @@ let bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + ecdsa = callPackage ../development/python-modules/ecdsa { }; + numeric = callPackage ../development/python-modules/numeric { }; pil = pythonPackages.pil; @@ -6027,6 +6638,8 @@ let pycairo = pythonPackages.pycairo; + pycapnp = pythonPackages.pycapnp; + pycrypto = pythonPackages.pycrypto; pycups = callPackage ../development/python-modules/pycups { }; @@ -6051,9 +6664,9 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - sip = callPackage ../development/python-modules/python-sip { }; + sip = callPackage ../development/python-modules/sip { }; - pyqt4 = callPackage ../development/python-modules/pyqt { + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { stdenv = if stdenv.isDarwin then clangStdenv else stdenv; @@ -6077,6 +6690,8 @@ let setuptools = pythonPackages.setuptools; + slowaes = callPackage ../development/python-modules/slowaes { }; + wxPython = pythonPackages.wxPython; wxPython28 = pythonPackages.wxPython28; @@ -6086,12 +6701,25 @@ let ### DEVELOPMENT / R MODULES - buildRPackage = import ../development/r-modules/generic R; + R = callPackage ../applications/science/math/R { + inherit (xlibs) libX11 libXt; + texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + withRecommendedPackages = false; + }; - rPackages = recurseIntoAttrs (import ./r-packages.nix { + rWrapper = callPackage ../development/r-modules/wrapper.nix { + # Those packages are usually installed as part of the R build. + recommendedPackages = with rPackages; [ MASS lattice Matrix nlme + survival boot cluster codetools foreign KernSmooth rpart class + nnet spatial mgcv ]; + # Override this attribute to register additional libraries. + packages = []; + }; + + rPackages = import ../development/r-modules/cran-packages.nix { inherit pkgs; - __overrides = (config.rPackageOverrides or (p: {})) pkgs; - }); + overrides = (config.rPackageOverrides or (p: {})) pkgs; + }; ### SERVERS @@ -6117,11 +6745,16 @@ let couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; + python = python27; + sphinx = python27Packages.sphinx; + erlang = erlangR16; }; dico = callPackage ../servers/dico { }; - dict = callPackage ../servers/dict { }; + dict = callPackage ../servers/dict { + libmaa = callPackage ../servers/dict/libmaa.nix {}; + }; dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix { inherit builderDefs; @@ -6145,10 +6778,18 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; - ejabberd = callPackage ../servers/xmpp/ejabberd { }; + etcd = callPackage ../servers/etcd { }; + + ejabberd = callPackage ../servers/xmpp/ejabberd { + erlang = erlangR16; + }; elasticmq = callPackage ../servers/elasticmq { }; + etcdctl = callPackage ../development/tools/etcdctl { }; + + fcgiwrap = callPackage ../servers/fcgiwrap { }; + felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; @@ -6158,6 +6799,8 @@ let firebird = callPackage ../servers/firebird { icu = null; }; firebirdSuper = callPackage ../servers/firebird { superServer = true; }; + fleet = callPackage ../servers/fleet { }; + freepops = callPackage ../servers/mail/freepops { }; freeswitch = callPackage ../servers/sip/freeswitch { }; @@ -6178,16 +6821,18 @@ let joseki = callPackage ../servers/http/joseki {}; + leafnode = callPackage ../servers/news/leafnode { }; + lighttpd = callPackage ../servers/http/lighttpd { }; mailman = callPackage ../servers/mail/mailman { }; - mediatomb = callPackage ../servers/mediatomb { - ffmpeg = ffmpeg_0_6_90; - }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; + mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd/default.nix { }; + mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; @@ -6197,10 +6842,8 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; mpd = callPackage ../servers/mpd { - # resolve the "stray '@' in program" errors - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; + aacSupport = config.mpd.aacSupport or true; + ffmpegSupport = config.mpd.ffmpegSupport or true; }; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; @@ -6209,7 +6852,22 @@ let myserver = callPackage ../servers/http/myserver { }; - nginx = callPackage ../servers/http/nginx { }; + nginx = callPackage ../servers/http/nginx { + rtmp = true; + fullWebDAV = true; + syslog = true; + moreheaders = true; + }; + + ngircd = callPackage ../servers/irc/ngircd { }; + + nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; + + nsd = callPackage ../servers/dns/nsd { }; + + nsq = callPackage ../servers/nsq { }; + + openresty = callPackage ../servers/http/openresty { }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; @@ -6219,6 +6877,8 @@ let postfix = callPackage ../servers/mail/postfix { }; + postfix211 = callPackage ../servers/mail/postfix/2.11.nix { }; + pulseaudio = callPackage ../servers/pulseaudio { gconf = gnome.GConf; # The following are disabled in the default build, because if this @@ -6227,6 +6887,12 @@ let bluez = null; avahi = null; }; + pulseaudioFull = pulseaudio.override { + bluez = bluez5; + avahi = avahi; + jackaudioSupport = true; + x11Support = true; + }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -6238,10 +6904,14 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; + mariadb = callPackage ../servers/sql/mariadb {}; + mongodb = callPackage ../servers/nosql/mongodb { }; riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; + influxdb = callPackage ../servers/nosql/influxdb { }; + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ @@ -6253,13 +6923,11 @@ let mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - nagios = callPackage ../servers/monitoring/nagios { - gdSupport = true; - }; + nagios = callPackage ../servers/monitoring/nagios { }; munin = callPackage ../servers/monitoring/munin { }; - nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; + nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { }; net_snmp = callPackage ../servers/monitoring/net-snmp { }; @@ -6273,8 +6941,6 @@ let postgresql = postgresql92; - postgresql83 = callPackage ../servers/sql/postgresql/8.3.x.nix { }; - postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { }; @@ -6283,6 +6949,8 @@ let postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { }; + postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -6301,17 +6969,16 @@ let radius = callPackage ../servers/radius { }; - redis = callPackage ../servers/nosql/redis { - stdenv = - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + redis = callPackage ../servers/nosql/redis { }; redstore = callPackage ../servers/http/redstore { }; restund = callPackage ../servers/restund {}; + rethinkdb = callPackage ../servers/nosql/rethinkdb { }; + + rippled = callPackage ../servers/rippled { }; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL; @@ -6330,13 +6997,19 @@ let libunwind = null; }); + serfdom = callPackage ../servers/serfdom { }; + + seyren = callPackage ../servers/monitoring/seyren { }; + shishi = callPackage ../servers/shishi { }; sipwitch = callPackage ../servers/sip/sipwitch { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; + squids = recurseIntoAttrs( import ../servers/squid/squids.nix { inherit fetchurl stdenv perl lib composableDerivation - openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool + openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool openssl; }); squid = squids.squid31; # has ipv6 support @@ -6353,6 +7026,8 @@ let axis2 = callPackage ../servers/http/tomcat/axis2 { }; + unifi = callPackage ../servers/unifi { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; @@ -6361,15 +7036,23 @@ let vsftpd = callPackage ../servers/ftp/vsftpd { }; + winstone = callPackage ../servers/http/winstone { }; + xinetd = callPackage ../servers/xinetd { }; + xquartz = callPackage ../servers/x11/xquartz { }; + quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; + xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig - libxslt expat libdrm libpng zlib perl mesa_drivers - xkeyboard_config dbus libuuid openssl gperf m4 - autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman; - automake = automake110x; + inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig + libxslt expat libpng zlib perl mesa_drivers + dbus libuuid openssl gperf m4 + autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; mesa = mesa_noglu; + udev = if stdenv.isLinux then udev else null; + libdrm = if stdenv.isLinux then libdrm else null; + } // { + xf86videointel-testing = callPackage ../servers/x11/xorg/xf86-video-intel-testing.nix { }; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; @@ -6383,6 +7066,7 @@ let }); zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; + zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; ### OS-SPECIFIC @@ -6403,10 +7087,12 @@ let acpitool = callPackage ../os-specific/linux/acpitool { }; + alienfx = callPackage ../os-specific/linux/alienfx { }; + alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { - jackaudio = null; + jack2 = null; }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; @@ -6420,10 +7106,13 @@ let apparmor = callPackage ../os-specific/linux/apparmor { inherit (perlPackages) LocaleGettext TermReadKey RpcXML; + bison = bison2; }; atop = callPackage ../os-specific/linux/atop { }; + audit = callPackage ../os-specific/linux/audit { }; + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; @@ -6438,6 +7127,8 @@ let bluez = bluez4; + inherit (pythonPackages) bedup; + beret = callPackage ../games/beret { }; bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; @@ -6446,20 +7137,51 @@ let checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; + checksec = callPackage ../os-specific/linux/checksec { }; + cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; - conky = callPackage ../os-specific/linux/conky { }; + conky = callPackage ../os-specific/linux/conky { + mpdSupport = config.conky.mpdSupport or true; + x11Support = config.conky.x11Support or false; + xdamage = config.conky.xdamage or false; + wireless = config.conky.wireless or false; + luaSupport = config.conky.luaSupport or false; + rss = config.conky.rss or false; + weatherMetar = config.conky.weatherMetar or false; + weatherXoap = config.conky.weatherXoap or false; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; + criu = callPackage ../os-specific/linux/criu { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; + darwin = rec { + cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port { + cross = assert crossSystem != null; crossSystem; + inherit maloader; + xctoolchain = xcode.toolchain; + }); + + maloader = callPackage ../os-specific/darwin/maloader { + inherit opencflite; + }; + + opencflite = callPackage ../os-specific/darwin/opencflite {}; + + xcode = callPackage ../os-specific/darwin/xcode {}; + }; + devicemapper = lvm2; + disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; + dmidecode = callPackage ../os-specific/linux/dmidecode { }; dmtcp = callPackage ../os-specific/linux/dmtcp { }; @@ -6481,6 +7203,8 @@ let python = pythonFull; }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { @@ -6510,6 +7234,8 @@ let fbterm = callPackage ../os-specific/linux/fbterm { }; + firejail = callPackage ../os-specific/linux/firejail {}; + fuse = callPackage ../os-specific/linux/fuse { }; fxload = callPackage ../os-specific/linux/fxload { }; @@ -6518,13 +7244,22 @@ let gpm = callPackage ../servers/gpm { }; + gradm = callPackage ../os-specific/linux/gradm { + flex = flex_2_5_35; + }; + hdparm = callPackage ../os-specific/linux/hdparm { }; hibernate = callPackage ../os-specific/linux/hibernate { }; hostapd = callPackage ../os-specific/linux/hostapd { }; - htop = callPackage ../os-specific/linux/htop { }; + htop = + if stdenv.isLinux then + callPackage ../os-specific/linux/htop { } + else if stdenv.isDarwin then + callPackage ../os-specific/darwin/htop { } + else null; # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { @@ -6537,6 +7272,8 @@ let ifplugd = callPackage ../os-specific/linux/ifplugd { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; + iotop = callPackage ../os-specific/linux/iotop { }; iproute = callPackage ../os-specific/linux/iproute { }; @@ -6554,8 +7291,12 @@ let kbd = callPackage ../os-specific/linux/kbd { }; + kmscon = callPackage ../os-specific/linux/kmscon { }; + latencytop = callPackage ../os-specific/linux/latencytop { }; + ldm = callPackage ../os-specific/linux/ldm { }; + libaio = callPackage ../os-specific/linux/libaio { }; libatasmart = callPackage ../os-specific/linux/libatasmart { }; @@ -6563,25 +7304,28 @@ let libcgroup = callPackage ../os-specific/linux/libcgroup { }; libnl = callPackage ../os-specific/linux/libnl { }; - - linuxHeaders = linuxHeaders37; + libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { }; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - linuxHeaders26 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { }; + # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { }; + linuxHeaders = linuxHeaders_3_7; - linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { + linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); - linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix { + linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); + linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { }; + + linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { }; + # We can choose: linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross else if ver == "2.6" then linuxHeaders26Cross @@ -6590,56 +7334,13 @@ let linuxHeadersCross = assert crossSystem != null; linuxHeadersCrossChooser crossSystem.platform.kernelMajor; - linuxHeaders_2_6_28 = callPackage ../os-specific/linux/kernel-headers/2.6.28.nix { }; - 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 kmod ubootChooser; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_0 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_2 - ]; + inherit fetchurl stdenv perl buildLinux; + kernelPatches = []; }; - # 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_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 ]; - extraConfig = '' - SECURITY_APPARMOR y - DEFAULT_SECURITY_APPARMOR y - ''; - }); - linux_3_2_xen = lowPrio (linux_3_2.override { extraConfig = '' XEN_DOM0 y @@ -6647,76 +7348,104 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_4 - ] ++ lib.optionals (platform.kernelArch == "mips") + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill ]; }; - linux_3_4_apparmor = lowPrio (linux_3_4.override { - kernelPatches = [ kernelPatches.apparmor_3_4 ]; - extraConfig = '' - SECURITY_APPARMOR y - DEFAULT_SECURITY_APPARMOR y - ''; - }); - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; + inherit fetchurl stdenv perl buildLinux; }; - linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") + linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; }; - linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") + linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; }; - linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") + linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; }; - 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") + linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + /* grsec configuration + + We build several flavors of 'default' grsec kernels. These are + built by default with Hydra. If the user selects a matching + 'default' flavor, then the pre-canned package set can be + chosen. Typically, users will make very basic choices like + 'security' + 'server' or 'performance' + 'desktop' with + virtualisation support. These will then be picked. + + Note: Xen guest kernels are included for e.g. NixOps deployments + to EC2, where Xen is the Hypervisor. + */ + + grFlavors = import ../build-support/grsecurity/flavors.nix; + + mkGrsecurity = opts: + (import ../build-support/grsecurity { + grsecOptions = opts; + inherit pkgs lib; + }); + + grKernel = opts: (mkGrsecurity opts).grsecKernel; + grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; + + # Stable kernels + linux_grsec_stable_desktop = grKernel grFlavors.linux_grsec_stable_desktop; + linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; + linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; + + # Testing kernels + linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; + linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; + linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -6727,8 +7456,6 @@ let linuxPackagesFor = kernel: self: let callPackage = newScope self; in { inherit kernel; - kernelDev = kernel.dev or kernel; - acpi_call = callPackage ../os-specific/linux/acpi-call {}; batman_adv = callPackage ../os-specific/linux/batman-adv {}; @@ -6737,45 +7464,28 @@ let ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - aufs = - if self.kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs/2.nix { } - else if self.kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs/3.nix { } - else null; - - aufs_util = - if self.kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs-util/2.nix { } - else if self.kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs-util/3.nix { } - else null; - blcr = callPackage ../os-specific/linux/blcr { }; cryptodev = callPackage ../os-specific/linux/cryptodev { }; + cpupower = callPackage ../os-specific/linux/cpupower { }; + e1000e = callPackage ../os-specific/linux/e1000e {}; - exmap = callPackage ../os-specific/linux/exmap { }; + v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; frandom = callPackage ../os-specific/linux/frandom { }; - iscsitarget = callPackage ../os-specific/linux/iscsitarget { }; + ktap = callPackage ../os-specific/linux/ktap { }; - iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; - - lttngModules = callPackage ../os-specific/linux/lttng-modules { }; - - atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; + lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; - broadcom_sta6 = callPackage ../os-specific/linux/broadcom-sta-v6/default.nix { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; @@ -6785,9 +7495,12 @@ let wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - klibc = callPackage ../os-specific/linux/klibc { - linuxHeaders = glibc.kernelHeaders; - }; + kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; + + klibc = callPackage ../os-specific/linux/klibc { }; + + klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); + /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. @@ -6800,16 +7513,10 @@ let psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; - spl = callPackage ../os-specific/linux/spl/default.nix { }; + spl = callPackage ../os-specific/linux/spl { }; + spl_git = callPackage ../os-specific/linux/spl/git.nix { }; - sysprof = callPackage ../development/tools/profiling/sysprof { - inherit (gnome) libglade; - }; - - systemtap = callPackage ../development/tools/profiling/systemtap { - linux = self.kernelDev; - inherit (gnome) libglademm; - }; + sysdig = callPackage ../os-specific/linux/sysdig {}; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; @@ -6823,32 +7530,46 @@ let virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - zfs = callPackage ../os-specific/linux/zfs/default.nix { }; + zfs = callPackage ../os-specific/linux/zfs { }; + zfs_git = callPackage ../os-specific/linux/zfs/git.nix { }; }; + # The current default kernel / kernel modules. + linux = linuxPackages.kernel; + linuxPackages = linuxPackages_3_12; + + # Update this when adding the newest kernel major version! + linux_latest = pkgs.linux_3_16; + linuxPackages_latest = pkgs.linuxPackages_3_16; + # Build the kernel modules for the some of the kernels. - 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; - linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); - linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); + linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; 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_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; 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; - - # The current default kernel / kernel modules. - linux = linuxPackages.kernel; - linuxPackages = linuxPackages_3_4; + linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); + linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); + linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); + linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); + + # grsecurity flavors + # Stable kernels + linuxPackages_grsec_stable_desktop = grPackage grFlavors.linux_grsec_stable_desktop; + linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; + linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; + + # Testing kernels + linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; + linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; + linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; # A function to build a manually-configured kernel - linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { - inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile; + linuxManualConfig = pkgs.buildLinux; + buildLinux = import ../os-specific/linux/kernel/manual-config.nix { + inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser; }; keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -6857,6 +7578,8 @@ let libsemanage = callPackage ../os-specific/linux/libsemanage { }; + libraw = callPackage ../development/libraries/libraw { }; + libraw1394 = callPackage ../development/libraries/libraw1394 { }; libsexy = callPackage ../development/libraries/libsexy { }; @@ -6867,16 +7590,14 @@ let lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; - lsiutil = callPackage ../os-specific/linux/lsiutil { }; - - klibc = callPackage ../os-specific/linux/klibc { - linuxHeaders = glibc.kernelHeaders; - }; + lockdep = callPackage ../os-specific/linux/lockdep { }; - klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); + lsiutil = callPackage ../os-specific/linux/lsiutil { }; kmod = callPackage ../os-specific/linux/kmod { }; + kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; + kvm = qemu_kvm; libcap = callPackage ../os-specific/linux/libcap { }; @@ -6912,6 +7633,8 @@ let multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; + musl = callPackage ../os-specific/linux/musl { }; + nettools = callPackage ../os-specific/linux/net-tools { }; neverball = callPackage ../games/neverball { @@ -6920,6 +7643,8 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + gocode = callPackage ../development/tools/gocode { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -6928,9 +7653,7 @@ let # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) - pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { - db = db4; - }; + pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; pam_console = callPackage ../os-specific/linux/pam_console { libtool = libtool_1_5; @@ -6948,12 +7671,18 @@ let pam_usb = callPackage ../os-specific/linux/pam_usb { }; + paxctl = callPackage ../os-specific/linux/paxctl { }; + + pax-utils = callPackage ../os-specific/linux/pax-utils { }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { firmware = config.pcmciaUtils.firmware or []; config = config.pcmciaUtils.config or null; }; - plymouth = callPackage ../os-specific/linux/plymouth { }; + plymouth = callPackage ../os-specific/linux/plymouth { + automake = automake113x; + }; pmount = callPackage ../os-specific/linux/pmount { }; @@ -6967,9 +7696,13 @@ let prayer = callPackage ../servers/prayer { }; - procps = callPackage ../os-specific/linux/procps { }; + procps = procps-ng; - "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; + procps-old = lowPrio (callPackage ../os-specific/linux/procps { }); + + procps-ng = callPackage ../os-specific/linux/procps-ng { }; + + watch = callPackage ../os-specific/linux/procps/watch.nix { }; qemu_kvm = lowPrio (qemu.override { x86Only = true; }); @@ -6991,12 +7724,22 @@ let sepolgen = callPackage ../os-specific/linux/sepolgen { }; + setools = callPackage ../os-specific/linux/setools { }; + shadow = callPackage ../os-specific/linux/shadow { }; statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + sysdig = callPackage ../os-specific/linux/sysdig { + kernel = null; + }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor + sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; + sysprof = callPackage ../development/tools/profiling/sysprof { + inherit (gnome) libglade; + }; + # Provided with sysfsutils. libsysfs = sysfsutils; systool = sysfsutils; @@ -7007,7 +7750,13 @@ let sysstat = callPackage ../os-specific/linux/sysstat { }; - systemd = callPackage ../os-specific/linux/systemd { }; + systemd = callPackage ../os-specific/linux/systemd { + linuxHeaders = linuxHeaders_3_14; + }; + + systemtap = callPackage ../development/tools/profiling/systemtap { + inherit (gnome) libglademm; + }; # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get # LVM2 working in systemd. @@ -7069,14 +7818,16 @@ let untie = callPackage ../os-specific/linux/untie { }; - upower = callPackage ../os-specific/linux/upower { - libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {}; - }; + upower = callPackage ../os-specific/linux/upower { }; + + upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { }; upstart = callPackage ../os-specific/linux/upstart { }; usbutils = callPackage ../os-specific/linux/usbutils { }; + usermount = callPackage ../os-specific/linux/usermount { }; + utillinux = lowPrio (callPackage ../os-specific/linux/util-linux { ncurses = null; perl = null; @@ -7091,6 +7842,8 @@ let }; windows = rec { + cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; + jom = callPackage ../os-specific/windows/jom { }; w32api = callPackage ../os-specific/windows/w32api { @@ -7135,6 +7888,10 @@ let onlyHeaders = true; }; + mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 { + onlyPthreads = true; + }; + pthreads = callPackage ../os-specific/windows/pthread-w32 { mingw_headers = mingw_headers3; }; @@ -7165,10 +7922,7 @@ let inherit (xorg) fontsproto renderproto utilmacros xorgserver; }; - xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { - inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto - videoproto utilmacros; - }; + xf86_video_nouveau = xorg.xf86videonouveau; xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng @@ -7189,6 +7943,8 @@ let arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; + aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; cacert = callPackage ../data/misc/cacert { }; @@ -7236,6 +7992,8 @@ let dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + eb-garamond = callPackage ../data/fonts/eb-garamond { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freepats = callPackage ../data/misc/freepats { }; @@ -7250,8 +8008,14 @@ let inconsolata = callPackage ../data/fonts/inconsolata {}; + ipafont = callPackage ../data/fonts/ipafont {}; + junicode = callPackage ../data/fonts/junicode { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; + + kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { @@ -7262,6 +8026,8 @@ let lmodern = callPackage ../data/fonts/lmodern { }; + lohit-fonts = callPackage ../data/fonts/lohit-fonts { }; + manpages = callPackage ../data/documentation/man-pages { }; miscfiles = callPackage ../data/misc/miscfiles { }; @@ -7270,8 +8036,14 @@ let mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; + nafees = callPackage ../data/fonts/nafees { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; + opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + + poly = callPackage ../data/fonts/poly { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { }; @@ -7282,6 +8054,8 @@ let stdmanpages = callPackage ../data/documentation/std-man-pages { }; + symbola = callPackage ../data/fonts/symbola { }; + iana_etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; @@ -7292,6 +8066,17 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + source-code-pro = callPackage ../data/fonts/source-code-pro {}; + + source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; + + source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + + source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {}; + source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {}; + source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {}; + source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {}; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { @@ -7318,19 +8103,19 @@ let vistafonts = callPackage ../data/fonts/vista-fonts { }; + wqy_microhei = callPackage ../data/fonts/wqy-microhei { }; + wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; - xkeyboard_config = callPackage ../data/misc/xkeyboard-config { }; + xkeyboard_config = xorg.xkeyboardconfig; ### APPLICATIONS a2jmidid = callPackage ../applications/audio/a2jmidid { }; - aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; @@ -7345,8 +8130,11 @@ let aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; + aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; + abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + libcdio = libcdio082; }; abiword = callPackage ../applications/office/abiword { @@ -7355,32 +8143,41 @@ let abook = callPackage ../applications/misc/abook { }; - adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; + adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; aewan = callPackage ../applications/editors/aewan { }; alchemy = callPackage ../applications/graphics/alchemy { }; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; - ardour = callPackage ../applications/audio/ardour { - inherit (gnome) libgnomecanvas libgnomecanvasmm; - }; + ardour = ardour3; - ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix { + ardour3 = lowPrio (callPackage ../applications/audio/ardour { inherit (gnome) libgnomecanvas libgnomecanvasmm; - boost = boost149; }); arora = callPackage ../applications/networking/browsers/arora { }; - aseprite = callPackage ../applications/editors/aseprite { }; + atom = callPackage ../applications/editors/atom { + gconf = gnome.GConf; + }; + + aseprite = callPackage ../applications/editors/aseprite { + giflib = giflib_4_1; + }; audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { }; + audacity = callPackage ../applications/audio/audacity { + ffmpeg = ffmpeg_0_10; + }; + + milkytracker = callPackage ../applications/audio/milkytracker { }; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -7394,14 +8191,27 @@ let eigen = eigen2; }; + avrdudess = callPackage ../applications/misc/avrdudess { }; + avxsynth = callPackage ../applications/video/avxsynth { }; - awesome = callPackage ../applications/window-managers/awesome { + awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { lua = lua5; cairo = cairo.override { xcbSupport = true; }; }; + awesome-3-5 = callPackage ../applications/window-managers/awesome { + lua = lua5_1; + cairo = cairo.override { xcbSupport = true; }; + }; + awesome = awesome-3-5; - baresip = callPackage ../applications/networking/instant-messengers/baresip {}; + inherit (gnome3) baobab; + + bar = callPackage ../applications/window-managers/bar { }; + + baresip = callPackage ../applications/networking/instant-messengers/baresip { + ffmpeg = ffmpeg_1; + }; batik = callPackage ../applications/graphics/batik { }; @@ -7418,23 +8228,21 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin { - db4 = db48; - }; + bitcoin = callPackage ../applications/misc/bitcoin { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { - # For some reason, TLS support is broken when using GnuTLS 3.0 (can't - # connect to jabber.org, for instance.) - gnutls = gnutls2; + gnutls = gnutls; libotr = libotr_3_2; }; blender = callPackage ../applications/misc/blender { - python = python3; + python = python34; }; bristol = callPackage ../applications/audio/bristol { }; + bspwm = callPackage ../applications/window-managers/bspwm { }; + bvi = callPackage ../applications/editors/bvi { }; calf = callPackage ../applications/audio/calf { @@ -7443,6 +8251,8 @@ let calibre = callPackage ../applications/misc/calibre { }; + camlistore = callPackage ../applications/misc/camlistore { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python @@ -7471,14 +8281,13 @@ let amdappsdk = amdappsdk28; }; - chatzilla = callPackage ../applications/networking/irc/chatzilla { - xulrunner = firefox36Pkgs.xulrunner; - }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { }; chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { channel = "stable"; - gconf = gnome.GConf; pulseSupport = config.pulseaudio or true; + enablePepperFlash = config.chromium.enablePepperFlash or false; + enablePepperPDF = config.chromium.enablePepperPDF or false; }); chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); @@ -7509,6 +8318,9 @@ let libpng = libpng12; }; + codeblocks = callPackage ../applications/editors/codeblocks { }; + codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; }; + codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) { inherit makeWrapper; python = pythonFull; @@ -7517,6 +8329,7 @@ let comical = callPackage ../applications/graphics/comical { }; conkeror = callPackage ../applications/networking/browsers/conkeror { }; + conkerorWrapper = wrapFirefox { browser = conkeror; browserName = "conkeror"; @@ -7536,20 +8349,20 @@ let d4x = callPackage ../applications/misc/d4x { }; - 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; - }; + darcs = with haskellPackages_ghc763; callPackage ../applications/version-management/darcs { + cabal = cabal.override { + extension = self : super : { + isLibrary = false; + configureFlags = "-f-library " + super.configureFlags or ""; + }; + }; }; darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; }; - "dd-agent" = callPackage ../tools/networking/dd-agent { }; + dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; @@ -7561,6 +8374,8 @@ let djvulibre = callPackage ../applications/misc/djvulibre { }; + djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; + djview = callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; @@ -7575,6 +8390,8 @@ let inherit (xlibs) libX11; }; + docker = callPackage ../applications/virtualization/docker { }; + doodle = callPackage ../applications/search/doodle { }; dunst = callPackage ../applications/misc/dunst { }; @@ -7583,70 +8400,60 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; - dvswitch = callPackage ../applications/video/dvswitch { }; + dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; - dwb = callPackage ../applications/networking/browsers/dwb { }; + dwbWrapper = wrapFirefox + { browser = dwb; browserName = "dwb"; desktopName = "dwb"; + }; dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; }; + dzen2 = callPackage ../applications/window-managers/dzen2 { }; + eaglemode = callPackage ../applications/misc/eaglemode { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); ed = callPackage ../applications/editors/ed { }; + ekho = callPackage ../applications/audio/ekho { }; + + electrum = callPackage ../applications/misc/electrum { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; emacs = emacs24; - emacs23 = callPackage ../applications/editors/emacs-23 { - stdenv = - if stdenv.isDarwin - /* On Darwin, use Apple-GCC, otherwise: - configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */ - then overrideGCC stdenv gccApple - else stdenv; - - # use override to select the appropriate gui toolkit - libXaw = if stdenv.isDarwin then xlibs.libXaw else null; - Xaw3d = null; - gtk = if stdenv.isDarwin then null else gtk; - # TODO: these packages don't build on Darwin. - gconf = null /* if stdenv.isDarwin then null else gnome.GConf */; - librsvg = null /* if stdenv.isDarwin then null else librsvg */; - }; - emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features - libXaw = if stdenv.isDarwin then xlibs.libXaw else null; + libXaw = xlibs.libXaw; Xaw3d = null; gconf = null; librsvg = null; alsaLib = null; imagemagick = null; - texinfo = texinfo5; - - # use clangStdenv on darwin to deal with: unexec: 'my_edata is not in - # section __data' - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { withX = false; })); + emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix { + stdenv = pkgs.clangStdenv; + }); + emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; - bbdb = callPackage ../applications/editors/emacs-modes/bbdb { texinfo = texinfo5; }; + bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; + + bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; cedet = callPackage ../applications/editors/emacs-modes/cedet { }; @@ -7656,8 +8463,12 @@ let colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; + cryptol = callPackage ../applications/editors/emacs-modes/cryptol { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; + darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; + # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; jabber = callPackage ../applications/editors/emacs-modes/jabber { }; @@ -7666,9 +8477,9 @@ let emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { }; - emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { texinfo = texinfo5; }; + emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { }; - emms = callPackage ../applications/editors/emacs-modes/emms { texinfo = texinfo5; }; + emms = callPackage ../applications/editors/emacs-modes/emms { }; ess = callPackage ../applications/editors/emacs-modes/ess { }; @@ -7680,6 +8491,8 @@ let gist = callPackage ../applications/editors/emacs-modes/gist { }; + idris = callPackage ../applications/editors/emacs-modes/idris { }; + jade = callPackage ../applications/editors/emacs-modes/jade { }; jdee = callPackage ../applications/editors/emacs-modes/jdee { @@ -7694,6 +8507,10 @@ let ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; + structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { + inherit (haskellPackages) cabal haskellSrcExts; + }; + tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; @@ -7704,15 +8521,19 @@ let loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; - magit = callPackage ../applications/editors/emacs-modes/magit { texinfo = texinfo5; }; + magit = callPackage ../applications/editors/emacs-modes/magit { }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; + metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; + notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); + offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; + # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. - org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; }); + org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; @@ -7722,11 +8543,19 @@ let prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { + proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix { + texinfo = texinfo4 ; + texLive = pkgs.texLiveAggregationFun { + paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; + }; + }; + proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix { + texinfo = texinfo4 ; texLive = pkgs.texLiveAggregationFun { paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; }; }; + proofgeneral = self.proofgeneral_4_2; quack = callPackage ../applications/editors/emacs-modes/quack { }; @@ -7736,18 +8565,26 @@ let rudel = callPackage ../applications/editors/emacs-modes/rudel { }; - scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { }; + sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; + + scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; + scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; + writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; + xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; }; - emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + inherit (gnome3) empathy; + epdfview = callPackage ../applications/misc/epdfview { }; + inherit (gnome3) epiphany; + espeak = callPackage ../applications/audio/espeak { }; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -7761,11 +8598,12 @@ let evopedia = callPackage ../applications/misc/evopedia { }; keepassx = callPackage ../applications/misc/keepassx { }; + keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; inherit (gnome3) evince; - keepass = callPackage ../applications/misc/keepass { }; + evolution_data_server = gnome3.evolution_data_server; - evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; + keepass = callPackage ../applications/misc/keepass { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { fltk = fltk20; @@ -7779,6 +8617,8 @@ let inherit stdenv fetchurl openssl; }; + fldigi = callPackage ../applications/audio/fldigi { }; + fluidsynth = callPackage ../applications/audio/fluidsynth { }; fossil = callPackage ../applications/version-management/fossil { }; @@ -7789,12 +8629,23 @@ let geany = callPackage ../applications/editors/geany { }; + gksu = callPackage ../applications/misc/gksu { }; + + gnuradio = callPackage ../applications/misc/gnuradio { + inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; + fftw = fftwFloat; + }; + + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; + goldendict = callPackage ../applications/misc/goldendict { }; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; gpicview = callPackage ../applications/graphics/gpicview { }; + gqrx = callPackage ../applications/misc/gqrx { }; + grass = import ../applications/misc/grass { inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm libXaw libXrender; @@ -7802,8 +8653,9 @@ let lib flex bison cairo fontconfig gdal zlib ncurses gdbm proj pkgconfig swig blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python - readline sqlite tcl tk libtiff freetype ffmpeg makeWrapper wxGTK; + readline sqlite tcl tk libtiff freetype makeWrapper wxGTK; fftw = fftwSinglePrec; + ffmpeg = ffmpeg_0_10; motif = lesstif; opendwg = libdwg; wxPython = wxPython28; @@ -7815,10 +8667,14 @@ let gtimelog = pythonPackages.gtimelog; + inherit (gnome3) gucharmap; + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; + photivo = callPackage ../applications/graphics/photivo { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { }; @@ -7833,37 +8689,41 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox = pkgs.firefoxPkgs.firefox; - - firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { + firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { inherit (gnome) libIDL; }; - firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; + firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; - firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { + firefox30Pkgs = callPackage ../applications/networking/browsers/firefox/30.nix { inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + libpng = libpng_apng; }; - firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - - firefoxPkgs = callPackage ../applications/networking/browsers/firefox { + firefox = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; - libpng = libpng.override { apngSupport = true; }; }; - firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; }; + firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; + + firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXext + libXinerama libXrender libXt; + }; flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { debug = config.flashplayer.debug or false; - # !!! Fix the dependency on two different builds of nss. }; freecad = callPackage ../applications/graphics/freecad { opencascade = opencascade_6_5; + inherit (pythonPackages) matplotlib pycollada; }; freemind = callPackage ../applications/misc/freemind { @@ -7878,33 +8738,33 @@ let xfontsel = callPackage ../applications/misc/xfontsel { }; xlsfonts = callPackage ../applications/misc/xlsfonts { }; - freerdp = callPackage ../applications/networking/remote/freerdp { }; + freerdp = callPackage ../applications/networking/remote/freerdp { + ffmpeg = ffmpeg_1; + }; freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; - freicoin = callPackage ../applications/misc/freicoin { - db4 = db48; - }; + freicoin = callPackage ../applications/misc/freicoin { }; fspot = callPackage ../applications/graphics/f-spot { inherit (gnome) libgnome libgnomeui; gtksharp = gtksharp1; }; - get_iplayer = callPackage ../applications/misc/get_iplayer {}; + fuze = callPackage ../applications/networking/instant-messengers/fuze {}; - gimp_2_6 = callPackage ../applications/graphics/gimp { - inherit (gnome) libart_lgpl; - libpng = libpng12; - }; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; + + get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome) libart_lgpl; webkit = null; lcms = lcms2; + wrapPython = pythonPackages.wrapPython; }; - gimp = gimp_2_6; + gimp = gimp_2_8; gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { inherit pkgs gimp; @@ -7917,6 +8777,14 @@ let gitFull = gitAndTools.gitFull; gitSVN = gitAndTools.gitSVN; + gitRepo = callPackage ../applications/version-management/git-repo { + python = python27; + }; + + gitolite = callPackage ../applications/version-management/gitolite { }; + + inherit (gnome3) gitg; + giv = callPackage ../applications/graphics/giv { pcre = pcre.override { unicodeSupport = true; }; }; @@ -7928,8 +8796,18 @@ let gconf = gnome2.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; + goffice = goffice_0_8; }; + goffice_0_8 = callPackage ../desktops/gnome-3/3.10/misc/goffice/0.8.nix { + inherit (gnome2) libglade libgnomeui; + gconf = gnome2.GConf; + libart = gnome2.libart_lgpl; + }; # latest version: gnome3.goffice + + ideas = recurseIntoAttrs ( (callPackage ../applications/editors/idea { }) + // (callPackage ../applications/editors/idea/pycharm.nix { })); + libquvi = callPackage ../applications/video/quvi/library.nix { }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -7947,7 +8825,6 @@ let gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - xulrunner = firefoxPkgs.xulrunner; inherit (gnome) gtkglext; }; @@ -7956,14 +8833,15 @@ let }; gnumeric = callPackage ../applications/office/gnumeric { - goffice = goffice_0_10; - inherit (gnome) libglade scrollkeeper; + inherit (gnome3) goffice gnome_icon_theme; }; - gnunet = callPackage ../applications/networking/p2p/gnunet { }; + gnunet = callPackage ../applications/networking/p2p/gnunet { + libgcrypt = libgcrypt_1_6; + }; gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { - libgcrypt = libgcrypt_git; + libgcrypt = libgcrypt_1_6; }); gocr = callPackage ../applications/graphics/gocr { }; @@ -7979,6 +8857,7 @@ let }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; + graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix { libpng = libpng12; @@ -8016,10 +8895,6 @@ let inherit (gnome) GConf; }; - gnome_terminator = callPackage ../applications/misc/gnome_terminator { - vte = gnome.vte.override { pythonSupport = true; }; - }; - googleearth = callPackage_i686 ../applications/misc/googleearth { }; google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { @@ -8040,13 +8915,17 @@ let gv = callPackage ../applications/misc/gv { }; + guvcview = callPackage ../os-specific/linux/guvcview { }; + hello = callPackage ../applications/misc/hello/ex-2 { }; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; + hexedit = callPackage ../applications/editors/hexedit { }; - hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; + hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; homebank = callPackage ../applications/office/homebank { }; @@ -8065,6 +8944,8 @@ let cairo = cairo.override { xcbSupport = true; }; }; + i3minator = callPackage ../tools/misc/i3minator { }; + i3status = callPackage ../applications/window-managers/i3/status.nix { }; i810switch = callPackage ../os-specific/linux/i810switch { }; @@ -8093,6 +8974,8 @@ let id3v2 = callPackage ../applications/audio/id3v2 { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; + ii = callPackage ../applications/networking/irc/ii { }; ike = callPackage ../applications/ike { }; @@ -8117,6 +9000,8 @@ let inherit (pythonPackages) pyopengl; }; + inferno = callPackage_i686 ../applications/inferno { }; + inkscape = callPackage ../applications/graphics/inkscape { inherit (pythonPackages) lxml; lcms = lcms2; @@ -8157,6 +9042,8 @@ let jigdo = callPackage ../applications/misc/jigdo { }; + jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; + joe = callPackage ../applications/editors/joe { }; jbrout = callPackage ../applications/graphics/jbrout { @@ -8197,6 +9084,8 @@ let lastwatch = callPackage ../applications/audio/lastwatch { }; + lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; + lbdb = callPackage ../tools/misc/lbdb { }; lci = callPackage ../applications/science/logic/lci {}; @@ -8213,16 +9102,18 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; - boost = boost149; + boost = boost155; jdk = openjdk; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; - poppler = poppler_0_18; clucene_core = clucene_core_2; lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; @@ -8236,6 +9127,8 @@ let ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + lighttable = callPackage ../applications/editors/lighttable {}; + links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/instant-messengers/linphone rec { @@ -8244,12 +9137,22 @@ let libosip = libosip_3; }; - linuxsampler = callPackage ../applications/audio/linuxsampler { }; + linuxsampler = callPackage ../applications/audio/linuxsampler { + bison = bison2; + }; + + llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; lmms = callPackage ../applications/audio/lmms { }; + lrzsz = callPackage ../tools/misc/lrzsz { }; + + luminanceHDR = callPackage ../applications/graphics/luminance-hdr { }; + lxdvdrip = callPackage ../applications/video/lxdvdrip { }; + handbrake = callPackage ../applications/video/handbrake { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = callPackage ../applications/misc/lyx { }; @@ -8258,6 +9161,8 @@ let matchbox = callPackage ../applications/window-managers/matchbox { }; + mcpp = callPackage ../development/compilers/mcpp { }; + mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; meld = callPackage ../applications/version-management/meld { @@ -8272,7 +9177,7 @@ let guiSupport = false; # use mercurialFull to get hgk GUI }; - mercurialFull = lowPrio (appendToName "full" (pkgs.mercurial.override { guiSupport = true; })); + mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); merkaartor = callPackage ../applications/misc/merkaartor { }; @@ -8282,15 +9187,7 @@ let mid2key = callPackage ../applications/audio/mid2key { }; - 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 glib_networking; - inherit gtk3 glib; - inherit (gnome) gtksourceview; - inherit (webkit.passthru.args) libsoup; - inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; - }; + midori = callPackage ../applications/networking/browsers/midori { }; midoriWrapper = wrapFirefox { browser = midori; browserName = "midori"; desktopName = "Midori"; @@ -8301,6 +9198,8 @@ let minicom = callPackage ../tools/misc/minicom { }; + minimodem = callPackage ../applications/audio/minimodem { }; + minidjvu = callPackage ../applications/graphics/minidjvu { }; mirage = callPackage ../applications/graphics/mirage {}; @@ -8311,6 +9210,8 @@ let mmex = callPackage ../applications/office/mmex { }; + moc = callPackage ../applications/audio/moc { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monodevelop = callPackage ../applications/editors/monodevelop { @@ -8336,6 +9237,10 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + + mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; @@ -8349,6 +9254,8 @@ let mp3info = callPackage ../applications/audio/mp3info { }; + mp3splt = callPackage ../applications/audio/mp3splt { }; + mpc123 = callPackage ../applications/audio/mpc123 { }; mpg123 = callPackage ../applications/audio/mpg123 { }; @@ -8357,16 +9264,19 @@ let mpc_cli = callPackage ../applications/audio/mpc { }; + ncmpc = callPackage ../applications/audio/ncmpc { }; + ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; normalize = callPackage ../applications/audio/normalize { }; mplayer = callPackage ../applications/video/mplayer { pulseSupport = config.pulseaudio or false; + vdpauSupport = config.mplayer.vdpauSupport or false; }; mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = ffmpeg_1; + ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 }; MPlayerPlugin = browser: @@ -8377,6 +9287,13 @@ let # !!! should depend on MPlayer }; + mpv = callPackage ../applications/video/mpv { + lua = lua5_1; + bs2bSupport = true; + quviSupport = true; + cacaSupport = true; + }; + mrxvt = callPackage ../applications/misc/mrxvt { }; multisync = callPackage ../applications/misc/multisync { @@ -8388,10 +9305,20 @@ let withLibdnssdCompat = true; }; jackSupport = config.mumble.jackSupport or false; + speechdSupport = config.mumble.speechdSupport or false; + }; + + murmur = callPackage ../applications/networking/mumble/murmur.nix { + avahi = avahi.override { + withLibdnssdCompat = true; + }; + iceSupport = config.murmur.iceSupport or true; }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { ruby = ruby19; hoe = rubyLibs.hoe; @@ -8399,6 +9326,8 @@ let ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; + smplayer = callPackage ../applications/video/smplayer { }; sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { @@ -8406,15 +9335,28 @@ let cursesSupport = true; }; - inherit gettext highline iconv locale lockfile mime_types rmail_sup text - trollop unicode xapian_ruby which; + inherit gettext highline iconv locale lockfile rmail_sup + text trollop unicode xapian_ruby which; + + # See https://github.com/NixOS/nixpkgs/issues/1804 and + # https://github.com/NixOS/nixpkgs/issues/2146 + bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler ( + oldAttrs: { + dontPatchShebangs = 1; + } + ); chronic = chronic_0_9_1; gpgme = ruby_gpgme; + mime_types = mime_types_1_25; ncursesw_sup = ruby_ncursesw_sup; - rake = rake_10_1_0; + rake = rubyLibs.rake_10_1_0; }; + synfigstudio = callPackage ../applications/graphics/synfigstudio { }; + + sxhkd = callPackage ../applications/window-managers/sxhkd { }; + msmtp = callPackage ../applications/networking/msmtp { }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -8441,6 +9383,8 @@ let ncdu = callPackage ../tools/misc/ncdu { }; + ncdc = callPackage ../applications/networking/p2p/ncdc { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; @@ -8469,9 +9413,7 @@ let ogmtools = callPackage ../applications/video/ogmtools { }; - omxplayer = callPackage ../applications/video/omxplayer { - stdenv = overrideGCC stdenv gcc47; - }; + omxplayer = callPackage ../applications/video/omxplayer { }; oneteam = callPackage ../applications/networking/instant-messengers/oneteam {}; @@ -8487,8 +9429,12 @@ let inherit (pkgs.kde4) kdelibs; }; + opusfile = callPackage ../applications/audio/opusfile { }; + opusTools = callPackage ../applications/audio/opus-tools { }; + pamixer = callPackage ../applications/audio/pamixer { }; + pan = callPackage ../applications/networking/newsreaders/pan { spellChecking = false; }; @@ -8499,11 +9445,14 @@ let paraview = callPackage ../applications/graphics/paraview { }; + pencil = callPackage ../applications/graphics/pencil { }; + petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome) libgnomecanvas; }; pdftk = callPackage ../tools/typesetting/pdftk { }; + pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pianobar = callPackage ../applications/audio/pianobar { }; @@ -8517,7 +9466,7 @@ let openssl = if config.pidgin.openssl or true then openssl else null; gnutls = if config.pidgin.gnutls or false then gnutls else null; libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; - inherit (gnome) startupnotification; + startupnotification = libstartup_notification; }; pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { @@ -8548,6 +9497,10 @@ let inherit (xorg) libXpm; }; + potrace = callPackage ../applications/graphics/potrace {}; + + posterazor = callPackage ../applications/misc/posterazor { }; + pqiv = callPackage ../applications/graphics/pqiv { }; qiv = callPackage ../applications/graphics/qiv { }; @@ -8558,13 +9511,17 @@ let pstree = callPackage ../applications/misc/pstree { }; + pulseview = callPackage ../applications/science/electronics/pulseview { }; + puredata = callPackage ../applications/audio/puredata { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qemu = callPackage ../applications/virtualization/qemu { }; + qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; + + eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { }; - qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; + qemu = callPackage ../applications/virtualization/qemu { }; qmmp = callPackage ../applications/audio/qmmp { }; @@ -8572,8 +9529,6 @@ let qsynth = callPackage ../applications/audio/qsynth { }; - qtcreator = callPackage ../development/qtcreator { }; - qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; @@ -8582,6 +9537,12 @@ let inherit (pythonPackages) mutagen; }; + quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { + inherit (pythonPackages) mutagen; + withGstPlugins = true; + gst_plugins_bad = null; + }; + rakarrack = callPackage ../applications/audio/rakarrack { inherit (xorg) libXpm libXft; fltk = fltk13; @@ -8594,7 +9555,7 @@ let ratpoison = callPackage ../applications/window-managers/ratpoison { }; rawtherapee = callPackage ../applications/graphics/rawtherapee { - fftw = fftw.override {float = true;}; + fftw = fftwSinglePrec; }; rcs = callPackage ../applications/version-management/rcs { }; @@ -8607,11 +9568,17 @@ let qt = qt4; }; + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { + qt = qt4; + }); + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); }; + rtl-sdr = callPackage ../applications/misc/rtl-sdr { }; + rubyripper = callPackage ../applications/audio/rubyripper {}; rxvt = callPackage ../applications/misc/rxvt { }; @@ -8620,6 +9587,7 @@ let rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { perlSupport = true; gdkPixbufSupport = true; + unicode3Support = true; }; sakura = callPackage ../applications/misc/sakura { @@ -8628,10 +9596,14 @@ let sbagen = callPackage ../applications/misc/sbagen { }; + scite = callPackage ../applications/editors/scite { }; + scribus = callPackage ../applications/office/scribus { inherit (gnome) libart_lgpl; }; + seafile-client = callPackage ../applications/networking/seafile-client { }; + seeks = callPackage ../tools/networking/p2p/seeks { opencv = opencv_2_1; }; @@ -8642,26 +9614,36 @@ let seq24 = callPackage ../applications/audio/seq24 { }; + setbfree = callPackage ../applications/audio/setbfree { }; + sflphone = callPackage ../applications/networking/instant-messengers/sflphone { gtk = gtk3; }; siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = config.pulseaudio or true; - }; + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; + + spideroak = callPackage ../applications/networking/spideroak { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; st = callPackage ../applications/misc/st { conf = config.st.conf or null; }; + sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) + // (callPackage ../applications/misc/sweethome3d/editors.nix { + sweethome3dApp = sweethome3d.application; + }) + ); + sxiv = callPackage ../applications/graphics/sxiv { }; bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; @@ -8676,27 +9658,23 @@ let # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended" slic3r = callPackage ../applications/misc/slic3r { - inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp - BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi - MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus; + perlPackages = perl514Packages; perl = perl514; }; + curaengine = callPackage ../applications/misc/curaengine { }; + + cura = callPackage ../applications/misc/cura { }; + + printrun = callPackage ../applications/misc/printrun { }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; - sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) { - inherit fetchurl stdenv stringsWithDeps lib fftw; - inherit pkgconfig gmp gettext; - inherit (xlibs) libXpm libX11; - inherit gtk glib; - }); + smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snd = sndBase.passthru.function { - inherit mesa libtool jackaudio alsaLib; - guile = guile_1_8; - }; + snd = callPackage ../applications/audio/snd { }; shntool = callPackage ../applications/audio/shntool { }; @@ -8721,33 +9699,34 @@ let stalonetray = callPackage ../applications/window-managers/stalonetray {}; + stp = callPackage ../applications/science/logic/stp {}; + stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime { }; + sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); + subversion = callPackage ../applications/version-management/subversion/default.nix { bdbSupport = true; httpServer = false; httpSupport = true; - sslSupport = true; pythonBindings = false; perlBindings = false; javahlBindings = false; saslSupport = false; - compressionSupport = true; httpd = apacheHttpd; sasl = cyrus_sasl; }; - subversionClient = lowPrio (appendToName "client" (subversion.override { + subversionClient = appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; - })); + }); surf = callPackage ../applications/misc/surf { - libsoup = gnome.libsoup; - webkit = webkit_gtk2; + webkit = webkitgtk2; }; svk = perlPackages.SVK; @@ -8759,6 +9738,10 @@ let gpgSupport = true; }; + symlinks = callPackage ../tools/system/symlinks { }; + + syncthing = callPackage ../applications/networking/syncthing { }; + # linux only by now synergy = callPackage ../applications/misc/synergy { }; @@ -8766,7 +9749,7 @@ let tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { inherit (pythonPackages) twisted foolscap simplejson nevow zfec - pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs + pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs numpy pyasn1 mock; }; @@ -8779,14 +9762,17 @@ let }; teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskjuggler = callPackage ../applications/misc/taskjuggler { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; - telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { - inherit (pkgs.gnome) libsoup; - }; + taskserver = callPackage ../servers/misc/taskserver { }; + + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { }; + + telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; @@ -8798,28 +9784,48 @@ let telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + terminator = callPackage ../applications/misc/terminator { + vte = gnome.vte.override { pythonSupport = true; }; + inherit (pythonPackages) notify; + }; + tesseract = callPackage ../applications/graphics/tesseract { }; thinkingRock = callPackage ../applications/misc/thinking-rock { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + libpng = libpng_apng; + }; + + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXext + libXinerama libXrender libXt; }; tig = gitAndTools.tig; timidity = callPackage ../tools/misc/timidity { }; + tint2 = callPackage ../applications/misc/tint2 { }; + tkcvs = callPackage ../applications/version-management/tkcvs { }; tla = callPackage ../applications/version-management/arch { }; + todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; }; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; + transcode = callPackage ../applications/audio/transcode { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_gtk = transmission.override { enableGTK3 = true; }; @@ -8827,20 +9833,15 @@ let trayer = callPackage ../applications/window-managers/trayer { }; - tree = callPackage ../tools/system/tree { - # use gccApple to compile on darwin as the configure script adds a - # -no-cpp-precomp flag, which is not compatible with the default gcc - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + tree = callPackage ../tools/system/tree {}; tribler = callPackage ../applications/networking/p2p/tribler { }; - twinkle = callPackage ../applications/networking/instant-messengers/twinkle { - ccrtp = ccrtp_1_8; - libzrtpcpp = libzrtpcpp_1_6; - }; + twister = callPackage ../applications/networking/p2p/twister { }; + + twmn = callPackage ../applications/misc/twmn { }; + + twinkle = callPackage ../applications/networking/instant-messengers/twinkle { }; umurmur = callPackage ../applications/networking/umurmur { }; @@ -8853,18 +9854,18 @@ let uwimap = callPackage ../tools/networking/uwimap { }; - uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { - inherit pkgconfig webkit makeWrapper glib_networking python3; - inherit glib pango cairo gdk_pixbuf atk; - inherit (xlibs) libX11 kbproto; - inherit (gnome) libsoup; - gtk = gtk3; + uzbl = callPackage ../applications/networking/browsers/uzbl { + webkit = webkitgtk2; }; + uTox = callPackage ../applications/networking/instant-messengers/utox { }; + vanitygen = callPackage ../applications/misc/vanitygen { }; vbindiff = callPackage ../applications/editors/vbindiff { }; + vcprompt = callPackage ../applications/version-management/vcprompt { }; + vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; veracity = callPackage ../applications/version-management/veracity {}; @@ -8876,17 +9877,14 @@ let flup = pythonPackages.flup; }; - vim = callPackage ../applications/editors/vim { - # for Objective-C compilation - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + vim = callPackage ../applications/editors/vim { }; + + macvim = callPackage ../applications/editors/vim/macvim.nix { }; vimHugeX = vim_configurable; vim_configurable = callPackage ../applications/editors/vim/configurable.nix { - inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext + inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; @@ -8904,10 +9902,31 @@ let vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); - virtviewer = callPackage ../applications/virtualization/virt-viewer {}; + qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { + inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext + composableDerivation lib config python perl tcl ruby qt4; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu + libICE; + + inherit (pkgs) stdenvAdapters gccApple; + + features = "huge"; # one of tiny, small, normal, big or huge + lua = pkgs.lua5; + flags = [ "python" "X11" ]; # only flag "X11" by now + }); + + vimpc = callPackage ../applications/audio/vimpc { }; + + virtviewer = callPackage ../applications/virtualization/virt-viewer { + gtkvnc = gtkvnc.override { enableGTK3 = true; }; + spice_gtk = spice_gtk.override { enableGTK3 = true; }; + }; virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; - vte = gnome.vte.override { pythonSupport = true; }; + vte = gnome3.vte; + dconf = gnome3.dconf; + gtkvnc = gtkvnc.override { enableGTK3 = true; }; + spice_gtk = spice_gtk.override { enableGTK3 = true; }; }; virtinst = callPackage ../applications/virtualization/virtinst {}; @@ -8920,15 +9939,17 @@ let inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1; - }; + vlc = callPackage ../applications/video/vlc { }; + + vmpk = callPackage ../applications/audio/vmpk { }; vnstat = callPackage ../applications/networking/vnstat { }; vorbisTools = callPackage ../applications/audio/vorbis-tools { }; - vue = callPackage ../applications/misc/vue {}; + vue = callPackage ../applications/misc/vue { + jre = icedtea7_jre; + }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -8936,24 +9957,19 @@ let graphicsSupport = false; }; - weechat = callPackage ../applications/networking/irc/weechat { - # weechat crashes on /exit when using gnutls 3.1.x. gnutls 3.2.x works. - gnutls = gnutls32; - }; + weechat = callPackage ../applications/networking/irc/weechat { }; - weston = callPackage ../applications/window-managers/weston { - cairo = cairo.override { - glSupport = true; - }; - }; + weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); + + weston = callPackage ../applications/window-managers/weston { }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { - erlang = erlangR14B04; - esdl = esdl.override { erlang = erlangR14B04; }; + erlang = erlangR14; + esdl = esdl.override { erlang = erlangR14; }; }; wmname = callPackage ../applications/misc/wmname { }; @@ -8985,10 +10001,10 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" - , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: + , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: let cfg = stdenv.lib.attrByPath [ browserName ] {} config; - enableAdobeFlash = cfg.enableAdobeFlash or true; + enableAdobeFlash = cfg.enableAdobeFlash or false; enableGnash = cfg.enableGnash or false; in import ../applications/networking/browsers/firefox/wrapper.nix { @@ -9004,11 +10020,10 @@ let ++ 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 + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell ); - libs = - if cfg.enableQuakeLive or false - then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] - else [ ]; + libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) + (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); gtk_modules = [ libcanberra ]; }; @@ -9028,7 +10043,9 @@ let xbindkeys = callPackage ../tools/X11/xbindkeys { }; - xbmc = callPackage ../applications/video/xbmc { }; + xbmc = callPackage ../applications/video/xbmc { + ffmpeg = ffmpeg_1; + }; xca = callPackage ../applications/misc/xca { }; @@ -9048,11 +10065,15 @@ let xdaliclock = callPackage ../tools/misc/xdaliclock {}; + xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; + xdg_utils = callPackage ../tools/X11/xdg-utils { }; xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { }; + xen = callPackage ../applications/virtualization/xen { + stdenv = overrideGCC stdenv gcc45; + }; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; @@ -9097,6 +10118,8 @@ let xterm = callPackage ../applications/misc/xterm { }; + finalterm = callPackage ../applications/misc/finalterm { }; + xtrace = callPackage ../tools/X11/xtrace { }; xlaunch = callPackage ../tools/X11/xlaunch { }; @@ -9105,6 +10128,8 @@ let xmove = callPackage ../applications/misc/xmove { }; + xmp = callPackage ../applications/audio/xmp { }; + xnee = callPackage ../tools/X11/xnee { # Work around "missing separator" error. stdenv = overrideInStdenv stdenv [ gnumake381 ]; @@ -9116,22 +10141,41 @@ let yate = callPackage ../applications/misc/yate { }; + inherit (gnome3) yelp; + qgis = callPackage ../applications/misc/qgis {}; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + + ykpers = callPackage ../applications/misc/ykpers {}; + yoshimi = callPackage ../applications/audio/yoshimi { fltk = fltk13; }; zathuraCollection = recurseIntoAttrs (let callPackage = newScope pkgs.zathuraCollection; in - import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; }); + import ../applications/misc/zathura { + inherit callPackage pkgs fetchurl; + useMupdf = config.zathura.useMupdf or false; + }); zathura = zathuraCollection.zathuraWrapper; - girara = callPackage ../applications/misc/girara { }; + zed = callPackage ../applications/editors/zed { }; + + zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; + + girara = callPackage ../applications/misc/girara { + gtk = gtk3; + }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zotero = callPackage ../applications/office/zotero { + xulrunner = xulrunner_30; + }; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; @@ -9148,6 +10192,8 @@ let libsigcxx = libsigcxx12; }; + astromenace = callPackage ../games/astromenace { }; + atanks = callPackage ../games/atanks {}; ballAndPaddle = callPackage ../games/ball-and-paddle { @@ -9162,9 +10208,7 @@ let blackshadeselite = callPackage ../games/blackshadeselite { }; - blobby = callPackage ../games/blobby { - boost = boost149; - }; + blobby = callPackage ../games/blobby { }; bsdgames = callPackage ../games/bsdgames { }; @@ -9174,6 +10218,8 @@ let castle_combat = callPackage ../games/castle-combat { }; + chessdb = callPackage ../games/chessdb { }; + construoBase = lowPrio (callPackage ../games/construo { mesa = null; freeglut = null; @@ -9185,6 +10231,9 @@ let crack_attack = callPackage ../games/crack-attack { }; + crafty = callPackage ../games/crafty { }; + craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); + crrcsim = callPackage ../games/crrcsim {}; dhewm3 = callPackage ../games/dhewm3 {}; @@ -9197,26 +10246,33 @@ let }; }; + dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix { + SDL_image = pkgsi686Linux.SDL_image.override { + libpng = pkgsi686Linux.libpng12; + }; + }; + dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { copyDataDirectory = true; }); + dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override { + copyDataDirectory = true; + }); + dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; d2x_rebirth = callPackage ../games/d2x-rebirth { }; - eduke32 = callPackage ../games/eduke32 { - stdenv = overrideGCC stdenv gcc47; - }; + eboard = callPackage ../games/eboard { }; + + eduke32 = callPackage ../games/eduke32 { }; egoboo = callPackage ../games/egoboo { }; - exult = callPackage ../games/exult { - stdenv = overrideGCC stdenv gcc42; - libpng = libpng12; - }; + exult = callPackage ../games/exult { }; flightgear = callPackage ../games/flightgear { }; @@ -9259,6 +10315,8 @@ let icbm3d = callPackage ../games/icbm3d { }; + ingen = callPackage ../applications/audio/ingen { }; + instead = callPackage ../games/instead { lua = lua5; }; @@ -9277,18 +10335,28 @@ let micropolis = callPackage ../games/micropolis { }; + mnemosyne = callPackage ../games/mnemosyne { + inherit (pythonPackages) matplotlib cherrypy sqlite3; + }; + naev = callPackage ../games/naev { }; + nexuiz = callPackage ../games/nexuiz { }; + njam = callPackage ../games/njam { }; oilrush = callPackage ../games/oilrush { }; + openra = callPackage ../games/openra { }; + openttd = callPackage ../games/openttd { zlib = zlibStatic; }; opentyrian = callPackage ../games/opentyrian { }; + openxcom = callPackage ../games/openxcom { }; + pingus = callPackage ../games/pingus {}; pioneers = callPackage ../games/pioneers { }; @@ -9312,8 +10380,8 @@ let racer = callPackage ../games/racer { }; - residualvm = callPackage ../games/residualvm { - openglSupport = mesaSupported; + residualvm = callPackage ../games/residualvm { + openglSupport = mesaSupported; }; rigsofrods = callPackage ../games/rigsofrods { @@ -9376,6 +10444,10 @@ let tennix = callPackage ../games/tennix { }; + tibia = callPackage ../games/tibia { }; + + tintin = callPackage ../games/tintin { }; + tpm = callPackage ../games/thePenguinMachine { }; tremulous = callPackage ../games/tremulous { }; @@ -9395,11 +10467,14 @@ let trigger = callPackage ../games/trigger { }; + typespeed = callPackage ../games/typespeed { }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastardx = callPackage ../games/ultrastardx { + ffmpeg = ffmpeg_0_6; lua = lua5; }; @@ -9426,7 +10501,7 @@ let warzone2100 = callPackage ../games/warzone2100 { }; widelands = callPackage ../games/widelands { - libpng = libpng12; + lua = lua5_1; }; worldofgoo_demo = callPackage ../games/worldofgoo { @@ -9456,9 +10531,29 @@ let keen4 = callPackage ../games/keen4 { }; + zeroad = callPackage ../games/0ad { }; ### DESKTOP ENVIRONMENTS + cinnamon = recurseIntoAttrs rec { + callPackage = newScope pkgs.cinnamon; + inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity; + + muffin = callPackage ../desktops/cinnamon/muffin.nix { } ; + + cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ }; + + cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ }; + + cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ; + + cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; + + cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + + cjs = callPackage ../desktops/cinnamon/cjs.nix { }; + }; + enlightenment = callPackage ../desktops/enlightenment { }; e17 = recurseIntoAttrs ( @@ -9466,6 +10561,11 @@ let import ../desktops/e17 { inherit callPackage pkgs; } ); + e18 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e18; in + import ../desktops/e18 { inherit callPackage pkgs; } + ); + gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; @@ -9474,34 +10574,30 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { + gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 { callPackage = pkgs.newScope pkgs.gnome3; self = pkgs.gnome3; }); + gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 { + callPackage = pkgs.newScope pkgs.gnome3_12; + }); + gnome = recurseIntoAttrs gnome2; hsetroot = callPackage ../tools/X11/hsetroot { }; - kde4 = recurseIntoAttrs pkgs.kde410; + kakasi = callPackage ../tools/text/kakasi { }; - kde410 = kdePackagesFor (pkgs.kde410 // { - boost = boost149; - eigen = eigen2; - libotr = libotr_3_2; - libusb = libusb1; - ffmpeg = ffmpeg_1; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.10; + kde4 = recurseIntoAttrs pkgs.kde412; - kde411 = kdePackagesFor (pkgs.kde411 // { - boost = boost149; + kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 ); + + kde412 = kdePackagesFor (pkgs.kde412 // { eigen = eigen2; - libotr = libotr_3_2; libusb = libusb1; - ffmpeg = ffmpeg_1; libcanberra = libcanberra_kde; - }) ../desktops/kde-4.11; + }) ../desktops/kde-4.12; kdePackagesFor = self: dir: let callPackageOrig = callPackage; in @@ -9529,6 +10625,8 @@ let calligra = callPackage ../applications/office/calligra { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; + digikam = if builtins.compareVersions "4.9" kde4.release == 1 then callPackage ../applications/graphics/digikam/2.nix { } else @@ -9542,9 +10640,13 @@ let kbibtex = callPackage ../applications/office/kbibtex { }; + kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - kdenlive = callPackage ../applications/video/kdenlive { }; + kdeconnect = callPackage ../applications/misc/kdeconnect { }; + + kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; kdesvn = callPackage ../applications/version-management/kdesvn { }; @@ -9584,24 +10686,34 @@ let liblikeback = callPackage ../development/libraries/liblikeback { }; + libmm-qt = callPackage ../development/libraries/libmm-qt { }; + + libnm-qt = callPackage ../development/libraries/libnm-qt { }; + networkmanagement = callPackage ../tools/networking/networkmanagement { }; partitionManager = callPackage ../tools/misc/partition-manager { }; + plasma-nm = callPackage ../tools/networking/plasma-nm { }; + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; psi = callPackage ../applications/networking/instant-messengers/psi { }; - quassel = callPackage ../applications/networking/irc/quassel { }; + qtcurve = callPackage ../misc/themes/qtcurve { }; + + quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; }; - quasselDaemon = appendToName "daemon" (self.quassel.override { + quasselDaemon = (self.quassel.override { monolithic = false; daemon = true; + tag = "-daemon"; }); - quasselClient = appendToName "client" (self.quassel.override { + quasselClient = (self.quassel.override { monolithic = false; client = true; + tag = "-client"; }); rekonq = callPackage ../applications/networking/browsers/rekonq { }; @@ -9637,7 +10749,7 @@ let gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; - gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; + gnome_themes_standard = gnome3.gnome_themes_standard; mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { }; @@ -9649,25 +10761,6 @@ let ### SCIENCE - celestia = callPackage ../applications/science/astronomy/celestia { - lua = lua5_1; - inherit (xlibs) libXmu; - inherit (pkgs.gnome) gtkglext; - }; - - xplanet = callPackage ../applications/science/astronomy/xplanet { }; - - gravit = callPackage ../applications/science/astronomy/gravit { }; - - spyder = callPackage ../applications/science/spyder { - inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended - inherit (pythonPackages) ipython pep8; # optional - inherit pylint; - }; - - stellarium = callPackage ../applications/science/astronomy/stellarium { }; - - ### SCIENCE/GEOMETRY drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { @@ -9687,7 +10780,6 @@ let arb = callPackage ../applications/science/biology/arb { lesstif = lesstif93; - stdenv = overrideGCC stdenv gcc42; }; archimedes = callPackage ../applications/science/electronics/archimedes { }; @@ -9715,6 +10807,8 @@ let ### SCIENCE/MATH + arpack = callPackage ../development/libraries/science/math/arpack { }; + atlas = callPackage ../development/libraries/science/math/atlas { # The build process measures CPU capabilities and optimizes the # library to perform best on that particular machine. That is a @@ -9735,10 +10829,14 @@ let liblapack = callPackage ../development/libraries/science/math/liblapack { }; + liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; + openblas = callPackage ../development/libraries/science/math/openblas { }; mathematica = callPackage ../applications/science/math/mathematica { }; + sage = callPackage ../applications/science/math/sage { }; + ### SCIENCE/MOLECULAR-DYNAMICS gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { @@ -9756,11 +10854,20 @@ let ### SCIENCE/LOGIC + abc-verifier = callPackage ../applications/science/logic/abc {}; + + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; + coq = callPackage ../applications/science/logic/coq { inherit (ocamlPackages) findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; }; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { inherit (ocamlPackages) findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; @@ -9798,6 +10905,8 @@ let logisim = callPackage ../applications/science/logic/logisim {}; + ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; + matita = callPackage ../applications/science/logic/matita { ocaml = ocaml_3_11_2; inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http @@ -9818,6 +10927,11 @@ let picosat = callPackage ../applications/science/logic/picosat {}; + prooftree = callPackage ../applications/science/logic/prooftree { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + prover9 = callPackage ../applications/science/logic/prover9 { }; satallax = callPackage ../applications/science/logic/satallax {}; @@ -9830,6 +10944,25 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + twelf = callPackage ../applications/science/logic/twelf { + smlnj = if stdenv.isDarwin + then smlnjBootstrap + else smlnj; + }; + + verifast = callPackage ../applications/science/logic/verifast {}; + + why3 = callPackage ../applications/science/logic/why3 {}; + + yices = callPackage ../applications/science/logic/yices {}; + + z3 = callPackage ../applications/science/logic/z3 {}; + + boolector = boolector15; + boolector15 = callPackage ../applications/science/logic/boolector {}; + boolector16 = lowPrio (callPackage ../applications/science/logic/boolector { + useV16 = true; + }); ### SCIENCE / ELECTRONICS @@ -9854,7 +10987,11 @@ let ecm = callPackage ../applications/science/math/ecm { }; - eukleides = callPackage ../applications/science/math/eukleides { }; + eukleides = callPackage ../applications/science/math/eukleides { + texinfo = texinfo4; + }; + + fricas = callPackage ../applications/science/math/fricas { }; gap = callPackage ../applications/science/math/gap { }; @@ -9868,11 +11005,6 @@ let inherit (gnome) libglade gtksourceview; }; - R = callPackage ../applications/science/math/R { - inherit (xlibs) libX11 libXt; - texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - }; - singular = callPackage ../applications/science/math/singular {}; scilab = callPackage ../applications/science/math/scilab { @@ -9887,6 +11019,8 @@ let weka = callPackage ../applications/science/math/weka { }; + yad = callPackage ../tools/misc/yad { }; + yacas = callPackage ../applications/science/math/yacas { }; speedcrunch = callPackage ../applications/science/math/speedcrunch { @@ -9899,14 +11033,37 @@ let boinc = callPackage ../applications/science/misc/boinc { }; + celestia = callPackage ../applications/science/astronomy/celestia { + lua = lua5_1; + inherit (xlibs) libXmu; + inherit (pkgs.gnome) gtkglext; + }; + + fityk = callPackage ../applications/science/misc/fityk { }; + + gravit = callPackage ../applications/science/astronomy/gravit { }; + golly = callPackage ../applications/science/misc/golly { }; + megam = callPackage ../applications/science/misc/megam { }; + + root = callPackage ../applications/science/misc/root { }; + simgrid = callPackage ../applications/science/misc/simgrid { }; + spyder = callPackage ../applications/science/spyder { + inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended + inherit (pythonPackages) ipython pep8; # optional + inherit pylint; + }; + + stellarium = callPackage ../applications/science/astronomy/stellarium { }; + tulip = callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; + xplanet = callPackage ../applications/science/astronomy/xplanet { }; ### MISC @@ -9916,9 +11073,9 @@ let auctex = callPackage ../tools/typesetting/tex/auctex { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + beep = callPackage ../misc/beep { }; + + cups = callPackage ../misc/cups { libusb = libusb1; }; cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; @@ -9950,6 +11107,8 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + fceux = callPackage ../misc/emulators/fceux { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; @@ -9960,11 +11119,13 @@ let gajim = callPackage ../applications/networking/instant-messengers/gajim { }; + gammu = callPackage ../applications/misc/gammu { }; + gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { x11Support = false; - cupsSupport = config.ghostscript.cups or true; + cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); gnuFork = config.ghostscript.gnu or false; }; @@ -9980,10 +11141,12 @@ let hplip = callPackage ../misc/drivers/hplip { }; + hplipWithPlugin = hplip.override { withPlugin = true; }; + # using the new configuration style proposal which is unstable - jack1d = callPackage ../misc/jackaudio/jack1.nix { }; + jack1 = callPackage ../misc/jackaudio/jack1.nix { }; - jackaudio = callPackage ../misc/jackaudio { }; + jack2 = callPackage ../misc/jackaudio { }; keynav = callPackage ../tools/X11/keynav { }; @@ -10011,16 +11174,15 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = nixStable; - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ nixops = callPackage ../tools/package-management/nixops { }; + nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; + nix-repl = callPackage ../tools/package-management/nix-repl { }; nut = callPackage ../applications/misc/nut { }; @@ -10056,6 +11218,8 @@ let inherit (pythonPackages) pexpect paramiko; }; + robomongo = callPackage ../applications/misc/robomongo { }; + opkg = callPackage ../tools/package-management/opkg { }; pgadmin = callPackage ../applications/misc/pgadmin { }; @@ -10074,6 +11238,8 @@ let polytable = callPackage ../tools/typesetting/tex/polytable { }; + PPSSPP = callPackage ../misc/emulators/ppsspp { }; + uae = callPackage ../misc/emulators/uae { }; putty = callPackage ../applications/networking/remote/putty { }; @@ -10088,33 +11254,44 @@ let inherit fetchurl stdenv; inherit cups ghostscript glibc patchelf; gcc = import ../development/compilers/gcc/4.4 { - inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gettext which; + inherit stdenv fetchurl gmp mpfr noSysDirs gettext which; + texinfo = texinfo4; profiledCompiler = true; }; }; saneBackends = callPackage ../applications/graphics/sane/backends.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; + snapscanFirmware = config.sane.snapscanFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; libusb = libusb1; }; saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; + snapscanFirmware = config.sane.snapscanFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; }; + mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; + saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; + seafile-shared = callPackage ../misc/seafile-shared { }; + slock = callPackage ../misc/screensavers/slock { }; sourceAndTags = import ../misc/source-and-tags { inherit pkgs stdenv unzip lib ctags; - hasktags = haskellPackages.myhasktags; + hasktags = haskellPackages.hasktags; }; splix = callPackage ../misc/cups/drivers/splix { }; + streamripper = callPackage ../applications/audio/streamripper { }; + + sqsh = callPackage ../development/tools/sqsh { }; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; @@ -10122,20 +11299,21 @@ let texFunctions = import ../tools/typesetting/tex/nix pkgs; texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { - inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby + inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo - libjpeg bison python fontconfig flex poppler graphite2 makeWrapper; + libjpeg bison python fontconfig flex poppler libpaper graphite2 + makeWrapper; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - inherit icu graphite2; + withIcu = true; withGraphite2 = true; }; }; texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo texLiveModerntimeline ]; }); @@ -10193,30 +11371,44 @@ let vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; + giflib = giflib_4_1; }; viewnior = callPackage ../applications/graphics/viewnior { }; - vimPlugins = callPackage ../misc/vim-plugins { }; + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { - inherit (gnome) libsoup; - webkit = webkit_gtk2; + webkit = webkitgtk2; }; vimprobable2Wrapper = wrapFirefox { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2"; }; + vimb = callPackage ../applications/networking/browsers/vimb { + webkit = webkitgtk2; + }; + + vimbWrapper = wrapFirefox { + browser = vimb; + browserName = "vimb"; + desktopName = "Vimb"; + }; + VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # Wine cannot be built in 64-bit; use a 32-bit build instead. - wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { }; - wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix { }); + wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { + bison = bison2; + }; + + wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix { + bison = bison2; + }); + 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. winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; }; @@ -10225,6 +11417,8 @@ let x2x = callPackage ../tools/X11/x2x { }; + xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xosd = callPackage ../misc/xosd { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { @@ -10234,6 +11428,8 @@ let yafc = callPackage ../applications/networking/yafc { }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; @@ -10257,9 +11453,9 @@ let LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib export LD_LIBRARY_PATH ''; - }; + }; - patoline = PatolineEnv ocamlPackages_4_00_1; + patoline = PatolineEnv ocamlPackages_4_00_1; znc = callPackage ../applications/networking/znc { }; @@ -10267,9 +11463,9 @@ let callPackage ../applications/networking/znc/modules.nix { } ); - zsnes = callPackage_i686 ../misc/emulators/zsnes { - libpng = libpng12; - }; + zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + + snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; misc = import ../misc/misc.nix { inherit pkgs stdenv; }; @@ -10281,4 +11477,12 @@ let mg = callPackage ../applications/editors/mg { }; -}; in pkgs + + # Attributes for backward compatibility. + adobeReader = adobe-reader; + asciidocFull = asciidoc-full; # added 2014-06-22 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 + + +}; in self; in pkgs |