diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5046 |
1 files changed, 3832 insertions, 1214 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e0c0834a22..094b3deb7d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15,8 +15,7 @@ , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for # files in standard system directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-darwin" - && system != "x86_64-freebsd" && system != "i686-freebsd" + noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. @@ -73,6 +72,7 @@ let platforms = (import ./platforms.nix); in if system == "armv6l-linux" then platforms.raspberrypi + else if system == "armv7l-linux" then platforms.beaglebone else if system == "armv5tel-linux" then platforms.sheevaplug else if system == "mips64el-linux" then platforms.fuloong2f_n32 else if system == "x86_64-linux" then platforms.pc64 @@ -85,7 +85,7 @@ let # Helper functions that are exported through `pkgs'. helperFunctions = stdenvAdapters // - (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); + (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); stdenvAdapters = import ../stdenv/adapters.nix pkgs; @@ -167,7 +167,7 @@ let 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 + # old modular X libraries project (called `xlibs') but now it's just # the set of packages in the modular X.org tree (which also includes # non-library components like the server, drivers, fonts, etc.). xlibs = xorg // {xlibs = xlibsWrapper;}; @@ -231,8 +231,6 @@ let else defaultStdenv; - stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple; - forceNativeDrv = drv : if crossSystem == null then drv else (drv // { crossDrv = drv.nativeDrv; }); @@ -241,7 +239,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc48_multi + overrideCC stdenv gcc48_multi else stdenv); @@ -253,18 +251,33 @@ let theAttrSet = arg; }; + autonix = callPackage ../build-support/autonix {}; + autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake libtool; }; } + { substitutions = { inherit autoconf automake libtool gettext; }; } ../build-support/setup-hooks/autoreconf.sh; buildEnv = import ../build-support/buildenv { inherit (pkgs) runCommand perl; }; - buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { - inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; - inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; - inherit less buildEnv; + buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix { + nixpkgs = pkgs; + nixpkgs_i686 = pkgsi686Linux; + }; + + chrootFHSEnv = callPackage ../build-support/build-fhs-chrootenv { }; + userFHSEnv = callPackage ../build-support/build-fhs-userenv { + ruby = ruby_2_1_3; + }; + + buildFHSChrootEnv = args: chrootFHSEnv { + env = buildFHSEnv args; + }; + + buildFHSUserEnv = args: userFHSEnv { + env = buildFHSEnv (removeAttrs args [ "runScript" ]); + runScript = args.runScript; }; dotnetenv = import ../build-support/dotnetenv { @@ -278,6 +291,16 @@ let vs = vs90wrapper; }; + fetchadc = import ../build-support/fetchadc { + inherit curl stdenv; + adc_user = if config ? adc_user + then config.adc_user + else throw "You need an adc_user attribute in your config to download files from Apple Developer Connection"; + adc_pass = if config ? adc_pass + then config.adc_pass + else throw "You need an adc_pass attribute in your config to download files from Apple Developer Connection"; + }; + fetchbower = import ../build-support/fetchbower { inherit stdenv git; inherit (nodePackages) fetch-bower; @@ -296,7 +319,8 @@ let }; fetchgit = import ../build-support/fetchgit { - inherit stdenv git cacert; + inherit stdenv cacert; + git = gitMinimal; }; fetchgitPrivate = import ../build-support/fetchgit/private.nix { @@ -305,6 +329,10 @@ let fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; + fetchgitLocal = import ../build-support/fetchgitlocal { + inherit runCommand git nix; + }; + fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); packer = callPackage ../development/tools/packer { }; @@ -332,9 +360,6 @@ let inherit curl stdenv; }; - # A wrapper around fetchurl that generates miror://gnome URLs automatically - 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, # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It @@ -344,12 +369,18 @@ let fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; }; - fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip { - name = "${repo}-${rev}-src"; + fetchFromGitHub = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name; url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; }; + fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name; + url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; + inherit sha256; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -366,9 +397,9 @@ let inherit lib; }; - makeInitrd = {contents, compressor ? "gzip -9"}: + makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: import ../build-support/kernel/make-initrd.nix { - inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor; + inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor prepend; }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; @@ -386,6 +417,10 @@ let inherit stdenv; }; + substituteAllFiles = import ../build-support/substitute-files/substitute-all-files.nix { + inherit stdenv; + }; + replaceDependency = import ../build-support/replace-dependency.nix { inherit runCommand nix lib; }; @@ -418,9 +453,18 @@ let { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; + # intended to be used like nix-build -E 'with <nixpkgs> {}; enableDebugging fooPackage' + enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; + + findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; + ### TOOLS + "3dfsb" = callPackage ../applications/misc/3dfsb { + glibc = glibc.override { debugSymbols = true; }; + }; + abduco = callPackage ../tools/misc/abduco { }; acct = callPackage ../tools/system/acct { }; @@ -433,21 +477,30 @@ let adom = callPackage ../games/adom { }; + advancecomp = callPackage ../tools/compression/advancecomp {}; + 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 { }; + afl = callPackage ../tools/security/afl { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; + aiccu = callPackage ../tools/networking/aiccu { }; + + aide = callPackage ../tools/security/aide { }; + aircrackng = callPackage ../tools/networking/aircrack-ng { }; + airfield = callPackage ../tools/networking/airfield { }; + analog = callPackage ../tools/admin/analog {}; apktool = callPackage ../development/tools/apktool { @@ -456,32 +509,42 @@ let apt-offline = callPackage ../tools/misc/apt-offline { }; + apulse = callPackage ../misc/apulse { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; arcanist = callPackage ../development/tools/misc/arcanist {}; - arduino_core = callPackage ../development/arduino/arduino-core { + arduino = arduino-core.override { withGui = true; }; + + arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; jre = jdk; + withGui = false; }; + apitrace = callPackage ../applications/graphics/apitrace {}; + 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 xz; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra texLiveCMSuper ]; }; }; + atomicparsley = callPackage ../tools/video/atomicparsley { }; + + attic = callPackage ../tools/backup/attic { }; + + avfs = callPackage ../tools/filesystems/avfs { }; + awscli = callPackage ../tools/admin/awscli { }; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; @@ -511,6 +574,8 @@ let grc = callPackage ../tools/misc/grc { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + otool = callPackage ../os-specific/darwin/otool { }; pass = callPackage ../tools/security/pass { @@ -528,7 +593,7 @@ let pkgs_i686 = pkgsi686Linux; }; - inherit (androidenv) androidsdk_4_1; + inherit (androidenv) androidsdk_4_4 androidndk; aria2 = callPackage ../tools/networking/aria2 { }; aria = aria2; @@ -567,28 +632,60 @@ let barcode = callPackage ../tools/graphics/barcode {}; + bashmount = callPackage ../tools/filesystems/bashmount {}; + bc = callPackage ../tools/misc/bc { }; bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - bfr = callPackage ../tools/misc/bfr { }; + bfr = callPackage ../tools/misc/bfr { + perl = perl516; # Docs fail to build with newer versions + }; + + bibtool = callPackage ../tools/misc/bibtool { }; bindfs = callPackage ../tools/filesystems/bindfs { }; + binwalk = callPackage ../tools/misc/binwalk { + python = pythonFull; + wrapPython = pythonPackages.wrapPython; + curses = pythonPackages.curses; + }; + + binwalk-full = callPackage ../tools/misc/binwalk { + python = pythonFull; + wrapPython = pythonPackages.wrapPython; + curses = pythonPackages.curses; + visualizationSupport = true; + pyqtgraph = pythonPackages.pyqtgraph; + }; + bitbucket-cli = pythonPackages.bitbucket-cli; + blink = callPackage ../applications/networking/instant-messengers/blink { }; + + blitz = callPackage ../development/libraries/blitz { }; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; - bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; }; + bochs = callPackage ../applications/virtualization/bochs { }; boomerang = callPackage ../development/tools/boomerang { }; + boost-build = callPackage ../development/tools/boost-build { }; + + boot = callPackage ../development/tools/build-managers/boot { }; + bootchart = callPackage ../tools/system/bootchart { }; + boxfs = callPackage ../tools/filesystems/boxfs { }; + + brasero = callPackage ../tools/cd-dvd/brasero { }; + bro = callPackage ../applications/networking/ids/bro { }; bsod = callPackage ../misc/emulators/bsod { }; @@ -603,10 +700,35 @@ let catdoc = callPackage ../tools/text/catdoc { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + + cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + + ceres-solver = callPackage ../development/libraries/ceres-solver { + google-gflags = null; # only required for examples/tests + }; + + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + + image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + ccnet = callPackage ../tools/networking/ccnet { }; - consul = callPackage ../servers/consul { }; - consul_ui = callPackage ../servers/consul/ui.nix { }; + cloud-init = callPackage ../tools/virtualization/cloud-init { }; + + consul = callPackage ../servers/consul { + # inherit ruby; + }; + + consul_ui = consul.ui; + + consul-alerts = callPackage ../servers/consul/alerts.nix { }; + + consul-template = callPackage ../servers/consul/template.nix { }; + + corosync = callPackage ../servers/corosync { }; + + cherrytree = callPackage ../applications/misc/cherrytree { }; chntpw = callPackage ../tools/security/chntpw { }; @@ -614,40 +736,98 @@ let flex = flex_2_5_35; }; - crawl = callPackage ../games/crawl { lua = lua5; }; + cpulimit = callPackage ../tools/misc/cpulimit { }; + + crawlTiles = callPackage ../games/crawl { }; + + crawl = callPackage ../games/crawl { + tileMode = false; + }; cv = callPackage ../tools/misc/cv { }; + contacts = callPackage ../tools/misc/contacts { }; + + datamash = callPackage ../tools/misc/datamash { }; + + ddate = callPackage ../tools/misc/ddate { }; + direnv = callPackage ../tools/misc/direnv { }; + discount = callPackage ../tools/text/discount { }; + ditaa = callPackage ../tools/graphics/ditaa { }; dlx = callPackage ../misc/emulators/dlx { }; + dtrx = callPackage ../tools/compression/dtrx { }; + + duperemove = callPackage ../tools/filesystems/duperemove { + linuxHeaders = linuxHeaders_3_14; + }; + eggdrop = callPackage ../tools/networking/eggdrop { }; enca = callPackage ../tools/text/enca { }; - fasd = callPackage ../tools/misc/fasd { - inherit (haskellPackages) pandoc; - }; + ent = callPackage ../tools/misc/ent { }; + + fasd = callPackage ../tools/misc/fasd { }; fop = callPackage ../tools/typesetting/fop { }; + filter_audio = callPackage ../development/libraries/filter_audio { }; + + gist = callPackage ../tools/text/gist { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; + mp3fs = callPackage ../tools/filesystems/mp3fs { }; + mpdcron = callPackage ../tools/audio/mpdcron { }; syslogng = callPackage ../tools/system/syslog-ng { }; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; - rsyslog = callPackage ../tools/system/rsyslog { }; + rsyslog = callPackage ../tools/system/rsyslog { + libgcrypt = libgcrypt_1_6; + czmq = null; # Currently Broken + hadoop = null; # Currently Broken + }; + + rsyslog-light = callPackage ../tools/system/rsyslog { + krb5 = null; + systemd = null; + jemalloc = null; + mysql = null; + postgresql = null; + libdbi = null; + net_snmp = null; + libuuid = null; + curl = null; + gnutls = null; + libgcrypt = null; + liblognorm = null; + openssl = null; + librelp = null; + libgt = null; + liblogging = null; + libnet = null; + hadoop = null; + rdkafka = null; + libmongo-client = null; + czmq = null; + rabbitmq-c = null; + hiredis = null; + }; mcrypt = callPackage ../tools/misc/mcrypt { }; + mstflint = callPackage ../tools/misc/mstflint { }; + mcelog = callPackage ../os-specific/linux/mcelog { }; apparix = callPackage ../tools/misc/apparix { }; @@ -666,10 +846,16 @@ let autossh = callPackage ../tools/networking/autossh { }; + asynk = callPackage ../tools/networking/asynk { }; + bacula = callPackage ../tools/backup/bacula { }; + bareos = callPackage ../tools/backup/bareos { }; + beanstalkd = callPackage ../servers/beanstalkd { }; + beets = callPackage ../tools/audio/beets { }; + bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { @@ -685,10 +871,6 @@ let inherit (strategoPackages016) strategoxt sdf; }; - bittorrent = callPackage ../tools/networking/p2p/bittorrent { - gui = true; - }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; blueman = callPackage ../tools/bluetooth/blueman { @@ -711,10 +893,11 @@ let bup = callPackage ../tools/backup/bup { inherit (pythonPackages) pyxattr pylibacl setuptools fuse; - inherit (haskellPackages) pandoc; par2Support = (config.bup.par2Support or false); }; + byzanz = callPackage ../applications/video/byzanz {}; + ori = callPackage ../tools/backup/ori { }; atool = callPackage ../tools/archivers/atool { }; @@ -729,10 +912,14 @@ let can-utils = callPackage ../os-specific/linux/can-utils { }; + caudec = callPackage ../applications/audio/caudec { }; + ccid = callPackage ../tools/security/ccid { }; ccrypt = callPackage ../tools/security/ccrypt { }; + ccze = callPackage ../tools/misc/ccze { }; + cdecl = callPackage ../development/tools/cdecl { }; cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; @@ -753,6 +940,8 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; + chocolateDoom = callPackage ../games/chocolate-doom { }; + chrony = callPackage ../tools/networking/chrony { }; chunkfs = callPackage ../tools/filesystems/chunkfs { }; @@ -763,10 +952,14 @@ let cksfv = callPackage ../tools/networking/cksfv { }; - clementine = callPackage ../applications/audio/clementine { }; + clementine = callPackage ../applications/audio/clementine { + boost = boost156; + }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; + cmst = callPackage ../tools/networking/cmst { }; + colord = callPackage ../tools/misc/colord { }; colord-gtk = callPackage ../tools/misc/colord-gtk { }; @@ -805,10 +998,20 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + ibus = callPackage ../tools/inputmethods/ibus { }; + + ibus-qt = callPackage ../tools/inputmethods/ibus-qt { }; + + ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; + checkbashism = callPackage ../development/tools/misc/checkbashisms { }; + clamav = callPackage ../tools/security/clamav { }; + clex = callPackage ../tools/misc/clex { }; + cloc = callPackage ../tools/misc/cloc { inherit (perlPackages) perl AlgorithmDiff RegexpCommon; }; @@ -819,7 +1022,7 @@ let convmv = callPackage ../tools/misc/convmv { }; - cool-old-term = callPackage ../applications/misc/cool-old-term { }; + cool-retro-term = callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { @@ -841,6 +1044,10 @@ let python = python26; }; + cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { + python = python26; + }; + cudatoolkit = cudatoolkit5; curl = callPackage ../tools/networking/curl rec { @@ -855,24 +1062,32 @@ let sslSupport = zlibSupport; }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + cunit = callPackage ../tools/misc/cunit { }; curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; cutter = callPackage ../tools/networking/cutter { }; - dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { }; + dadadodo = callPackage ../tools/text/dadadodo { }; + + daemonize = callPackage ../tools/system/daemonize { }; daq = callPackage ../applications/networking/ids/daq { }; dar = callPackage ../tools/archivers/dar { }; + darkstat = callPackage ../tools/networking/darkstat { }; + davfs2 = callPackage ../tools/filesystems/davfs2 { }; dbench = callPackage ../development/tools/misc/dbench { }; dcraw = callPackage ../tools/graphics/dcraw { }; + dcfldd = callPackage ../tools/system/dcfldd { }; + debian_devscripts = callPackage ../tools/misc/debian-devscripts { inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry; }; @@ -881,6 +1096,10 @@ let detox = callPackage ../tools/misc/detox { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; + + ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -893,14 +1112,20 @@ let despotify = callPackage ../development/libraries/despotify { }; + dfc = callPackage ../tools/system/dfc { }; + dev86 = callPackage ../development/compilers/dev86 { }; + dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; + dnsmasq = callPackage ../tools/networking/dnsmasq { }; dnstop = callPackage ../tools/networking/dnstop { }; dhcp = callPackage ../tools/networking/dhcp { }; + dhcpdump = callPackage ../tools/networking/dhcpdump { }; + dhcpcd = callPackage ../tools/networking/dhcpcd { }; di = callPackage ../tools/system/di { }; @@ -909,6 +1134,11 @@ let diffutils = callPackage ../tools/text/diffutils { }; + dir2opus = callPackage ../tools/audio/dir2opus { + inherit (pythonPackages) mutagen python wrapPython; + inherit opusTools; + }; + wgetpaste = callPackage ../tools/text/wgetpaste { }; dirmngr = callPackage ../tools/security/dirmngr { }; @@ -927,16 +1157,27 @@ let inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; }; + dog = callPackage ../tools/system/dog { }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; + dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; + dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { }; + + doomseeker = callPackage ../applications/misc/doomseeker { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; + dub = callPackage ../development/tools/build-managers/dub { }; + + duff = callPackage ../tools/filesystems/duff { }; + duo-unix = callPackage ../tools/security/duo-unix { }; duplicity = callPackage ../tools/backup/duplicity { @@ -946,6 +1187,8 @@ let duply = callPackage ../tools/backup/duply { }; + dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { }; + dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { }; dvgrab = callPackage ../tools/video/dvgrab { }; @@ -967,6 +1210,10 @@ let edk2 = callPackage ../development/compilers/edk2 { }; + eid-mw = callPackage ../tools/security/eid-mw { }; + + eid-viewer = callPackage ../tools/security/eid-viewer { }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { }; @@ -993,18 +1240,22 @@ let ethtool = callPackage ../tools/misc/ethtool { }; + eternity = callPackage ../games/eternity-engine { }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; + euca2ools = callPackage ../tools/virtualization/euca2ools { }; evtest = callPackage ../applications/misc/evtest { }; - exempi = callPackage ../development/libraries/exempi { }; + exempi = callPackage ../development/libraries/exempi { boost = boost155; }; execline = callPackage ../tools/misc/execline { }; exercism = callPackage ../development/tools/exercism { }; + exfat-utils = callPackage ../tools/filesystems/exfat-utils { }; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -1027,12 +1278,26 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; + fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { }; + + fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; + + fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix { + plugins = [ ]; + }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; + flannel = callPackage ../tools/networking/flannel { }; + + flashbench = callPackage ../os-specific/linux/flashbench { }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { }; @@ -1055,10 +1320,14 @@ let flpsed = callPackage ../applications/editors/flpsed { }; + fluentd = callPackage ../tools/misc/fluentd { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; libbsd = callPackage ../development/libraries/libbsd { }; + libbladeRF = callPackage ../development/libraries/libbladeRF { }; + lprof = callPackage ../tools/graphics/lprof { }; fdk_aac = callPackage ../development/libraries/fdk-aac { }; @@ -1066,9 +1335,8 @@ let flvtool2 = callPackage ../tools/video/flvtool2 { }; fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); - - fontforgeX = callPackage ../tools/misc/fontforge { - withX11 = true; + fontforge-gtk = callPackage ../tools/misc/fontforge { + withGTK = true; }; forktty = callPackage ../os-specific/linux/forktty {}; @@ -1085,21 +1353,27 @@ let fprot = callPackage ../tools/security/fprot { }; + fprintd = callPackage ../tools/security/fprintd { }; + + fprint_demo = callPackage ../tools/security/fprint_demo { }; + freeipmi = callPackage ../tools/system/freeipmi {}; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_1_8; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; + frescobaldi = callPackage ../misc/frescobaldi {}; + + frostwire = callPackage ../applications/networking/p2p/frostwire { }; + ftgl = callPackage ../development/libraries/ftgl { }; ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { }; - fuppes = callPackage ../tools/networking/fuppes { - ffmpeg = ffmpeg_0_6_90; - }; + ftop = callPackage ../os-specific/linux/ftop { }; + + fuppes = callPackage ../tools/networking/fuppes { }; fsfs = callPackage ../tools/filesystems/fsfs { }; @@ -1117,6 +1391,10 @@ let gtk = gtk3; }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; + + garmintools = callPackage ../development/libraries/garmintools {}; + gawk = callPackage ../tools/text/gawk { }; gawkInteractive = appendToName "interactive" @@ -1138,8 +1416,18 @@ let gftp = callPackage ../tools/networking/gftp { }; + ggobi = callPackage ../tools/graphics/ggobi { }; + gifsicle = callPackage ../tools/graphics/gifsicle { }; + gitlab = callPackage ../applications/version-management/gitlab { + ruby = ruby_2_1_3; + }; + + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { + ruby = ruby_2_1_3; + }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -1148,38 +1436,44 @@ let gmvault = callPackage ../tools/networking/gmvault { }; + gnaural = callPackage ../applications/audio/gnaural { }; + gnokii = builderDefsPackage (import ../tools/misc/gnokii) { inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite libical gtk glib; inherit (xorg) libXpm; }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; - gnugrep = callPackage ../tools/text/gnugrep { - libiconv = libiconvOrNull; - }; + gnugrep = callPackage ../tools/text/gnugrep { }; gnulib = callPackage ../development/tools/gnulib { }; gnupatch = callPackage ../tools/text/gnupatch { }; - gnupg1orig = callPackage ../tools/security/gnupg1 { }; + gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; - gnupg1compat = callPackage ../tools/security/gnupg1compat { }; + gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; # use config.packageOverrides if you prefer original gnupg1 gnupg1 = gnupg1compat; - gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; }; + gnupg20 = callPackage ../tools/security/gnupg/20.nix { + libgcrypt = libgcrypt_1_6; + }; - gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix { - libassuan = libassuan2_1; - }); + gnupg21 = callPackage ../tools/security/gnupg/21.nix { + libgcrypt = libgcrypt_1_6; + }; - gnuplot = callPackage ../tools/graphics/gnuplot { }; + gnupg = gnupg20; + + gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -1194,9 +1488,13 @@ let goaccess = callPackage ../tools/misc/goaccess { }; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; - gource = callPackage ../applications/version-management/gource {}; + gource = callPackage ../applications/version-management/gource { }; + + gparted = callPackage ../tools/misc/gparted { }; gpodder = callPackage ../applications/audio/gpodder { }; @@ -1206,14 +1504,29 @@ let grafx2 = callPackage ../applications/graphics/grafx2 {}; + grails = callPackage ../development/web/grails { jdk = null; }; + graphviz = callPackage ../tools/graphics/graphviz { }; + graphviz-nox = callPackage ../tools/graphics/graphviz { + xlibs = null; + libdevil = libdevil-nox; + }; + /* Readded by Michael Raskin. There are programs in the wild * that do want 2.0 but not 2.22. Please give a day's notice for - * objections before removal. + * objections before removal. The feature is integer coordinates */ graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { }; + /* Readded by Michael Raskin. There are programs in the wild + * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for + * objections before removal. The feature is libgraph. + */ + graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; + + grin = callPackage ../tools/text/grin { }; + grive = callPackage ../tools/filesystems/grive { json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable }; @@ -1224,13 +1537,29 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 + }; + + trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { + buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2 = grub2_full; - grub2_efi = grub2.override { efiSupport = true; }; + grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; + + grub2_efi = grub2_full.override { + efiSupport = true; + }; - grub2_zfs = grub2.override { zfsSupport = true; }; + grub2_light = grub2_full.override { + zfsSupport = false; + }; + + gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { + inherit (gnome) libglademm; + }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; @@ -1239,6 +1568,7 @@ let gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; + gmock = callPackage ../development/libraries/gmock {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; @@ -1261,7 +1591,7 @@ let gupnptools = callPackage ../tools/networking/gupnp-tools {}; gvpe = builderDefsPackage ../tools/networking/gvpe { - inherit openssl gmp nettools iproute; + inherit openssl gmp nettools iproute zlib; }; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -1274,12 +1604,18 @@ let partimage = callPackage ../tools/backup/partimage { }; + pgf_graphics = callPackage ../tools/graphics/pgf { }; + pigz = callPackage ../tools/compression/pigz { }; + pxz = callPackage ../tools/compression/pxz { }; + haproxy = callPackage ../tools/networking/haproxy { }; haveged = callPackage ../tools/security/haveged { }; + hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; + hardlink = callPackage ../tools/system/hardlink { }; hashcat = callPackage ../tools/security/hashcat { }; @@ -1306,20 +1642,23 @@ let lua = lua5; }; + honcho = callPackage ../tools/system/honcho { }; + host = callPackage ../tools/networking/host { }; hping = callPackage ../tools/networking/hping { }; httpie = callPackage ../tools/networking/httpie { }; + httping = callPackage ../tools/networking/httping {}; + httpfs2 = callPackage ../tools/filesystems/httpfs { }; - # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl', - # which no longer exists. - # - # hydra = callPackage ../development/tools/misc/hydra { - # nix = nixUnstable; - # }; + httptunnel = callPackage ../tools/networking/httptunnel { }; + + i2p = callPackage ../tools/networking/i2p {}; + + i2pd = callPackage ../tools/networking/i2pd {}; iasl = callPackage ../development/compilers/iasl { }; @@ -1333,6 +1672,19 @@ let iftop = callPackage ../tools/networking/iftop { }; + ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; + + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { + inherit (pythonPackages) ipython; + inherit (haskellPackages) ihaskell ghc; + }; + + ihaskell-with-packages = callPackage ../development/tools/haskell/ihaskell/ng-wrapper.nix { + inherit (pythonPackages) ipython; + inherit (haskellngPackages) ihaskell ghcWithPackages; + packages = self: config.ihaskell.packages or []; + }; + imapproxy = callPackage ../tools/networking/imapproxy { }; imapsync = callPackage ../tools/networking/imapsync { @@ -1347,7 +1699,9 @@ let iodine = callPackage ../tools/networking/iodine { }; - iperf = callPackage ../tools/networking/iperf { }; + iperf2 = callPackage ../tools/networking/iperf/2.nix { }; + iperf3 = callPackage ../tools/networking/iperf/3.nix { }; + iperf = iperf3; ipmitool = callPackage ../tools/system/ipmitool { static = false; @@ -1355,6 +1709,10 @@ let ipmiutil = callPackage ../tools/system/ipmiutil {}; + ipv6calc = callPackage ../tools/networking/ipv6calc {}; + + ipxe = callPackage ../tools/misc/ipxe { }; + ised = callPackage ../tools/misc/ised {}; isl = callPackage ../development/libraries/isl { }; @@ -1366,10 +1724,6 @@ let jdiskreport = callPackage ../tools/misc/jdiskreport { }; - jfsrec = callPackage ../tools/filesystems/jfsrec { - boost = boost144; - }; - jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -1380,62 +1734,93 @@ let jnettop = callPackage ../tools/networking/jnettop { }; + john = callPackage ../tools/security/john { }; + jq = callPackage ../development/tools/jq {}; jscoverage = callPackage ../development/tools/misc/jscoverage { }; jwhois = callPackage ../tools/networking/jwhois { }; + k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; + kazam = callPackage ../applications/video/kazam { }; kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; kexectools = callPackage ../os-specific/linux/kexectools { }; + #keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; + keychain = callPackage ../tools/misc/keychain { }; + kibana = callPackage ../development/tools/misc/kibana { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; + kpcli = callPackage ../tools/security/kpcli { }; + + kst = callPackage ../tools/graphics/kst { }; + + leocad = callPackage ../applications/graphics/leocad { }; + less = callPackage ../tools/misc/less { }; + liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; + lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; logstash = callPackage ../tools/misc/logstash { }; + logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; + logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; + lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; + kippo = callPackage ../servers/kippo { }; klavaro = callPackage ../games/klavaro {}; kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + makebootfat = callPackage ../tools/misc/makebootfat { }; + minidlna = callPackage ../tools/networking/minidlna { - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; }; mmv = callPackage ../tools/misc/mmv { }; + morituri = callPackage ../applications/audio/morituri { }; + most = callPackage ../tools/misc/most { }; multitail = callPackage ../tools/misc/multitail { }; netperf = callPackage ../applications/networking/netperf { }; + netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + ninka = callPackage ../development/tools/misc/ninka { }; - nodejs = callPackage ../development/web/nodejs {}; + nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; + nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; + nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { }; - nodePackages = recurseIntoAttrs (import ./node-packages.nix { - inherit pkgs stdenv nodejs fetchurl fetchgit; - neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; - self = pkgs.nodePackages; - }); + nodePackages = callPackage ./node-packages.nix { self = nodePackages; }; + + iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; }; + iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; }; + + iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { }; + leafpad = callPackage ../applications/editors/leafpad { }; + lftp = callPackage ../tools/networking/lftp { }; libconfig = callPackage ../development/libraries/libconfig { }; @@ -1446,22 +1831,46 @@ let libevdev = callPackage ../development/libraries/libevdev { }; + libevhtp = callPackage ../development/libraries/libevhtp { }; + liboauth = callPackage ../development/libraries/liboauth { }; + libtermkey = callPackage ../development/libraries/libtermkey { }; + + libtidy = callPackage ../development/libraries/libtidy { }; + libtirpc = callPackage ../development/libraries/ti-rpc { }; libshout = callPackage ../development/libraries/libshout { }; + libqb = callPackage ../development/libraries/libqb { }; + libqmi = callPackage ../development/libraries/libqmi { }; libmbim = callPackage ../development/libraries/libmbim { }; + libmongo-client = callPackage ../development/libraries/libmongo-client { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; + + libiberty = callPackage ../development/libraries/libiberty { }; + + libibverbs = callPackage ../development/libraries/libibverbs { }; + + libxcomp = callPackage ../development/libraries/libxcomp { }; + + librdmacm = callPackage ../development/libraries/librdmacm { }; + + limesurvey = callPackage ../servers/limesurvey { }; + logcheck = callPackage ../tools/system/logcheck { inherit (perlPackages) mimeConstruct; }; + logkeys = callPackage ../tools/security/logkeys { }; + logrotate = callPackage ../tools/system/logrotate { }; logstalgia = callPackage ../tools/graphics/logstalgia {}; @@ -1484,10 +1893,18 @@ let xz = callPackage ../tools/compression/xz { }; + lz4 = callPackage ../tools/compression/lz4 { }; + lzop = callPackage ../tools/compression/lzop { }; + macchanger = callPackage ../os-specific/linux/macchanger { }; + + mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; + maildrop = callPackage ../tools/networking/maildrop { }; + mailsend = callPackage ../tools/networking/mailsend { }; + mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; mailutils = callPackage ../tools/networking/mailutils { @@ -1502,11 +1919,17 @@ let man_db = callPackage ../tools/misc/man-db { }; + mawk = callPackage ../tools/text/mawk { }; + + mbox = callPackage ../tools/security/mbox { }; + memtest86 = callPackage ../tools/misc/memtest86 { }; memtest86plus = callPackage ../tools/misc/memtest86+ { }; - meo = callPackage ../tools/security/meo { }; + meo = callPackage ../tools/security/meo { + boost = boost155; + }; mc = callPackage ../tools/misc/mc { }; @@ -1522,6 +1945,8 @@ let inherit (gnome) scrollkeeper; }; + mdp = callPackage ../applications/misc/mdp { }; + mednafen = callPackage ../misc/emulators/mednafen { }; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; @@ -1532,7 +1957,12 @@ let mfcuk = callPackage ../tools/security/mfcuk { }; - minecraft = callPackage ../games/minecraft { }; + mfoc = callPackage ../tools/security/mfoc { }; + + minecraft = callPackage ../games/minecraft { + pulseaudioSupport = config.pulseaudio or true; + pulseaudio = pulseaudio.override { ossWrapper = true; }; + }; minecraft-server = callPackage ../games/minecraft-server { }; @@ -1552,6 +1982,8 @@ let mkpasswd = callPackage ../tools/security/mkpasswd { }; + mkrand = callPackage ../tools/security/mkrand { }; + mktemp = callPackage ../tools/security/mktemp { }; mktorrent = callPackage ../tools/misc/mktorrent { }; @@ -1560,8 +1992,12 @@ let monit = callPackage ../tools/system/monit { }; + moreutils = callPackage ../tools/misc/moreutils { + inherit (perlPackages) IPCRun TimeDate TimeDuration; + docbook-xsl = docbook_xsl; + }; + mosh = callPackage ../tools/networking/mosh { - boost = boostHeaders; inherit (perlPackages) IOTty; }; @@ -1569,6 +2005,8 @@ let mr = callPackage ../applications/version-management/mr { }; + mrtg = callPackage ../tools/misc/mrtg { }; + mscgen = callPackage ../tools/graphics/mscgen { }; msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) { @@ -1611,6 +2049,8 @@ let ndjbdns = callPackage ../tools/networking/ndjbdns { }; + nestopia = callPackage ../misc/emulators/nestopia { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; @@ -1647,6 +2087,8 @@ let networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; + networkmanager_l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; @@ -1657,22 +2099,38 @@ let newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; - ngrep = callPackage ../tools/networking/ngrep { }; + ngrep = callPackage ../tools/networking/ngrep { + inherit gnumake3; + }; ngrok = callPackage ../tools/misc/ngrok { }; + noip = callPackage ../tools/networking/noip { }; + mpack = callPackage ../tools/networking/mpack { }; pa_applet = callPackage ../tools/audio/pa-applet { }; + pasystray = callPackage ../tools/audio/pasystray { + inherit (gnome3) gnome_icon_theme; + }; + pnmixer = callPackage ../tools/audio/pnmixer { }; + pwsafe = callPackage ../applications/misc/pwsafe { + inherit (xlibs) libXt libXtst libXi xextproto; + wxGTK = wxGTK30; + }; + nifskope = callPackage ../tools/graphics/nifskope { }; - nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; + nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nilfs_utils = nilfs-utils; nitrogen = callPackage ../tools/X11/nitrogen {}; + nkf = callPackage ../tools/text/nkf {}; + nlopt = callPackage ../development/libraries/nlopt {}; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; @@ -1688,9 +2146,10 @@ let notbit = callPackage ../applications/networking/notbit { }; + notify-osd = callPackage ../applications/misc/notify-osd { }; + nox = callPackage ../tools/package-management/nox { pythonPackages = python3Packages; - nix = nixUnstable; }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; @@ -1704,7 +2163,9 @@ let ntopng = callPackage ../tools/networking/ntopng { }; - ntp = callPackage ../tools/networking/ntp { }; + ntp = callPackage ../tools/networking/ntp { + libcap = if stdenv.isLinux then libcap else null; + }; numdiff = callPackage ../tools/text/numdiff { }; @@ -1714,6 +2175,8 @@ let nylon = callPackage ../tools/networking/nylon { }; + nxproxy = callPackage ../tools/admin/nxproxy { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; @@ -1722,18 +2185,30 @@ let obexd = callPackage ../tools/bluetooth/obexd { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; + obexfs = callPackage ../tools/bluetooth/obexfs { }; obexftp = callPackage ../tools/bluetooth/obexftp { }; + objconv = callPackage ../development/tools/misc/objconv {}; + obnam = callPackage ../tools/backup/obnam { }; odt2txt = callPackage ../tools/text/odt2txt { }; + odamex = callPackage ../games/odamex { }; + offlineimap = callPackage ../tools/networking/offlineimap { inherit (pythonPackages) sqlite3; }; + openarena = callPackage ../games/openarena { }; + + opencryptoki = callPackage ../tools/security/opencryptoki { }; + + onscripter-en = callPackage ../games/onscripter-en { }; + opendbx = callPackage ../development/libraries/opendbx { }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -1746,10 +2221,17 @@ let openjade = callPackage ../tools/text/sgml/openjade { }; + openntpd = callPackage ../tools/networking/openntpd { }; + + openntpd_nixos = openntpd.override { + privsepUser = "ntp"; + privsepPath = "/var/empty"; + }; + openobex = callPackage ../tools/bluetooth/openobex { }; openopc = callPackage ../tools/misc/openopc { - pythonFull = python27Full.override { + pythonFull = python27.buildEnv.override { extraLibs = [ python27Packages.pyro3 ]; }; }; @@ -1776,10 +2258,16 @@ let spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; + opentracker = callPackage ../applications/networking/p2p/opentracker { }; + openvpn = callPackage ../tools/networking/openvpn { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; + + openvswitch = callPackage ../os-specific/linux/openvswitch { }; + optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; }; @@ -1788,15 +2276,35 @@ let ossec = callPackage ../tools/security/ossec {}; + ostree = callPackage ../tools/misc/ostree { }; + otpw = callPackage ../os-specific/linux/otpw { }; + owncloud = callPackage ../servers/owncloud { }; + + owncloudclient = callPackage ../applications/networking/owncloud-client { }; + + p2pvc = callPackage ../applications/video/p2pvc {}; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; + pandoc = haskell-ng.lib.overrideCabal haskellngPackages.pandoc (drv: { + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; + buildTools = drv.buildTools or [] ++ [haskellngPackages.hsb2hs]; + enableSharedExecutables = false; + enableSharedLibraries = false; + isLibrary = false; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share"; + }); + panomatic = callPackage ../tools/graphics/panomatic { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { + automake = automake112x; # fails with 14 + }; parallel = callPackage ../tools/misc/parallel { }; @@ -1809,7 +2317,6 @@ let 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 { }; @@ -1844,8 +2351,12 @@ let pcsclite = callPackage ../tools/security/pcsclite { }; + pcsctools = callPackage ../tools/security/pcsctools { }; + pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; + pdfjam = callPackage ../tools/typesetting/pdfjam { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; @@ -1854,6 +2365,10 @@ let briss = callPackage ../tools/graphics/briss { }; + brickd = callPackage ../servers/brickd { + libusb = libusb1; + }; + bully = callPackage ../tools/networking/bully { }; pdnsd = callPackage ../tools/networking/pdnsd { }; @@ -1871,7 +2386,10 @@ let philter = callPackage ../tools/networking/philter { }; - pinentry = callPackage ../tools/security/pinentry { }; + pinentry = callPackage ../tools/security/pinentry { + libcap = if stdenv.isDarwin then null else libcap; + qt4 = null; + }; pius = callPackage ../tools/security/pius { }; @@ -1889,6 +2407,8 @@ let plowshare = callPackage ../tools/misc/plowshare { }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; + pngcrush = callPackage ../tools/graphics/pngcrush { }; pngnq = callPackage ../tools/graphics/pngnq { }; @@ -1909,7 +2429,9 @@ let ponysay = callPackage ../tools/misc/ponysay { }; - povray = callPackage ../tools/graphics/povray { }; + povray = callPackage ../tools/graphics/povray { + automake = automake113x; # fails with 14 + }; ppl = callPackage ../development/libraries/ppl { }; @@ -1919,8 +2441,14 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; + + profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; + projectm = callPackage ../applications/audio/projectm { }; + proot = callPackage ../tools/system/proot { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; @@ -1929,6 +2457,8 @@ let pastebinit = callPackage ../tools/misc/pastebinit { }; + polygraph = callPackage ../tools/networking/polygraph { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -1955,12 +2485,32 @@ let inherit python libsexy pkgconfig libxml2 pygtk pango gtk glib; }; + pytrainer = callPackage ../applications/misc/pytrainer { }; + openmpi = callPackage ../development/libraries/openmpi { }; + qarte = callPackage ../applications/video/qarte { + sip = pythonPackages.sip_4_16; + }; + + ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + + qastools = callPackage ../tools/audio/qastools { + qt = qt4; + }; + qhull = callPackage ../development/libraries/qhull { }; qjoypad = callPackage ../tools/misc/qjoypad { }; + qpdf = callPackage ../development/libraries/qpdf { }; + + qprint = callPackage ../tools/text/qprint { }; + + qscintilla = callPackage ../development/libraries/qscintilla { + qt = qt4; + }; + qshowdiff = callPackage ../tools/text/qshowdiff { }; quilt = callPackage ../development/tools/quilt { }; @@ -1969,8 +2519,12 @@ let ranger = callPackage ../applications/misc/ranger { }; + rawdog = callPackage ../applications/networking/feedreaders/rawdog { }; + privateer = callPackage ../games/privateer { }; + redmine = callPackage ../applications/version-management/redmine { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; reaverwps = callPackage ../tools/networking/reaver-wps {}; @@ -1999,7 +2553,11 @@ let reptyr = callPackage ../os-specific/linux/reptyr {}; - rdiff_backup = callPackage ../tools/backup/rdiff-backup { }; + rescuetime = callPackage ../applications/misc/rescuetime { }; + + rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; + + rdfind = callPackage ../tools/filesystems/rdfind { }; rdmd = callPackage ../development/compilers/rdmd { }; @@ -2011,15 +2569,23 @@ let rkflashtool = callPackage ../tools/misc/rkflashtool { }; - rmlint = callPackage ../tools/misc/rmlint {}; + rmlint = callPackage ../tools/misc/rmlint { + inherit (pythonPackages) sphinx; + }; rng_tools = callPackage ../tools/security/rng-tools { }; rsnapshot = callPackage ../tools/backup/rsnapshot { + perl = perl516; # fails to create docs: POD document had syntax errors # For the `logger' command, we can use either `utillinux' or # GNU Inetutils. The latter is more portable. logger = inetutils; }; + rsnapshotGit = lowPrio (callPackage ../tools/backup/rsnapshot/git.nix { + # For the `logger' command, we can use either `utillinux' or + # GNU Inetutils. The latter is more portable. + logger = inetutils; + }); rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -2031,10 +2597,14 @@ let rpm = callPackage ../tools/package-management/rpm { }; + rpmextract = callPackage ../tools/archivers/rpmextract { }; + rrdtool = callPackage ../tools/misc/rrdtool { }; rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; + rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { }; + rubber = callPackage ../tools/typesetting/rubber { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -2043,26 +2613,40 @@ let s3backer = callPackage ../tools/filesystems/s3backer { }; - s3cmd = callPackage ../tools/networking/s3cmd { }; + s3fs = callPackage ../tools/filesystems/s3fs { }; - s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); + s3cmd = callPackage ../tools/networking/s3cmd { }; s3sync = callPackage ../tools/networking/s3sync { - ruby = ruby18; + ruby = ruby_1_8; }; + s6Dns = callPackage ../tools/networking/s6-dns { }; + + s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { }; + + s6Networking = callPackage ../tools/networking/s6-networking { }; + + s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; + sablotron = callPackage ../tools/text/xml/sablotron { }; safecopy = callPackage ../tools/system/safecopy { }; + safe-rm = callPackage ../tools/system/safe-rm { }; + salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; samplicator = callPackage ../tools/networking/samplicator { }; screen = callPackage ../tools/misc/screen { }; + screen-message = callPackage ../tools/X11/screen-message { }; + scrot = callPackage ../tools/graphics/scrot { }; + scrolls = callPackage ../games/scrolls { }; + scrypt = callPackage ../tools/security/scrypt { }; sdcv = callPackage ../applications/misc/sdcv { }; @@ -2085,12 +2669,12 @@ let shotwell = callPackage ../applications/graphics/shotwell { }; - shebangfix = callPackage ../tools/misc/shebangfix { }; - shellinabox = callPackage ../servers/shellinabox { }; siege = callPackage ../tools/networking/siege {}; + sigil = callPackage ../applications/editors/sigil { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; @@ -2117,13 +2701,10 @@ let snort = callPackage ../applications/networking/ids/snort { }; - snx = callPackage_i686 ../tools/networking/snx { - inherit (pkgsi686Linux) pam gcc33; - inherit (pkgsi686Linux.xlibs) libX11; - }; - solr = callPackage ../servers/search/solr { }; + solvespace = callPackage ../applications/graphics/solvespace { }; + sparsehash = callPackage ../development/libraries/sparsehash { }; spiped = callPackage ../tools/networking/spiped { }; @@ -2132,13 +2713,17 @@ let sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { }; + sqliteman = callPackage ../applications/misc/sqliteman { }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; }; + stdman = callPackage ../data/documentation/stdman { }; + storebrowse = callPackage ../tools/system/storebrowse { }; - fusesmb = callPackage ../tools/filesystems/fusesmb { }; + fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; sl = callPackage ../tools/misc/sl { }; @@ -2146,10 +2731,7 @@ let 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 = boost149; - }; + sourceHighlight = callPackage ../tools/text/source-highlight { }; spaceFM = callPackage ../applications/misc/spacefm { }; @@ -2159,6 +2741,8 @@ let sshuttle = callPackage ../tools/security/sshuttle { }; + sstp = callPackage ../tools/networking/sstp {}; + sudo = callPackage ../tools/security/sudo { }; suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; @@ -2167,12 +2751,18 @@ let ssdeep = callPackage ../tools/security/ssdeep { }; + sshpass = callPackage ../tools/networking/sshpass { }; + ssmtp = callPackage ../tools/networking/ssmtp { tlsSupport = true; }; ssss = callPackage ../tools/security/ssss { }; + stress = callPackage ../tools/system/stress { }; + + stress-ng = callPackage ../tools/system/stress-ng { }; + storeBackup = callPackage ../tools/backup/store-backup { }; stow = callPackage ../tools/misc/stow { }; @@ -2181,6 +2771,8 @@ let stunnel = callPackage ../tools/networking/stunnel { }; + strongswan = callPackage ../tools/networking/strongswan { }; + su = shadow.su; surfraw = callPackage ../tools/networking/surfraw { }; @@ -2191,6 +2783,10 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; + svtplay-dl = callPackage ../tools/misc/svtplay-dl { + inherit (pythonPackages) nose mock; + }; + sysbench = callPackage ../development/tools/misc/sysbench {}; system_config_printer = callPackage ../tools/misc/system-config-printer { @@ -2203,6 +2799,10 @@ let privoxy = callPackage ../tools/networking/privoxy { }; + swaks = callPackage ../tools/networking/swaks { }; + + t = callPackage ../tools/misc/t { }; + t1utils = callPackage ../tools/misc/t1utils { }; tarsnap = callPackage ../tools/backup/tarsnap { }; @@ -2211,17 +2811,22 @@ let tboot = callPackage ../tools/security/tboot { }; + tcl2048 = callPackage ../games/tcl2048 { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; tcpflow = callPackage ../tools/networking/tcpflow { }; - teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { }; + teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { }; - # Work In Progress: it doesn't start unless running a daemon as root teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); + teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { }); + telnet = callPackage ../tools/networking/telnet { }; + tessel = callPackage ../applications/misc/tessel { }; + texmacs = callPackage ../applications/editors/texmacs { tex = texLive; /* tetex is also an option */ extraFonts = true; @@ -2232,21 +2837,39 @@ let texstudio = callPackage ../applications/editors/texstudio { }; - tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; }; + thc-hydra = callPackage ../tools/security/thc-hydra { }; + + tiled = callPackage ../applications/editors/tiled { qt = qt4; }; tinc = callPackage ../tools/networking/tinc { }; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tlsdate = callPackage ../tools/networking/tlsdate { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmux = callPackage ../tools/misc/tmux { }; + tmuxinator = callPackage ../tools/misc/tmuxinator { }; + + tmin = callPackage ../tools/security/tmin { }; + + tmsu = callPackage ../tools/filesystems/tmsu { }; + tor = callPackage ../tools/security/tor { }; + tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; + torbutton = callPackage ../tools/security/torbutton { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { + stdenv = overrideCC stdenv gcc49; + }; + + touchegg = callPackage ../tools/inputmethods/touchegg { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; @@ -2254,18 +2877,28 @@ let tpm-tools = callPackage ../tools/security/tpm-tools { }; + traceroute = callPackage ../tools/networking/traceroute { }; + + trash-cli = callPackage ../tools/misc/trash-cli { }; + trickle = callPackage ../tools/networking/trickle {}; trousers = callPackage ../tools/security/trousers { }; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; + ttfautohint = callPackage ../tools/misc/ttfautohint { }; + + tty-clock = callPackage ../tools/misc/tty-clock { }; + ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; txt2man = callPackage ../tools/misc/txt2man { }; + u9fs = callPackage ../servers/u9fs { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -2276,6 +2909,8 @@ let ufraw = callPackage ../applications/graphics/ufraw { }; + umlet = callPackage ../tools/misc/umlet { }; + unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; @@ -2288,6 +2923,10 @@ let usbmuxd = callPackage ../tools/misc/usbmuxd {}; + uwsgi = callPackage ../servers/uwsgi { + plugins = []; + }; + vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; volatility = callPackage ../tools/security/volatility { }; @@ -2342,12 +2981,18 @@ let welkin = callPackage ../tools/graphics/welkin {}; + xl2tpd = callPackage ../tools/networking/xl2tpd { }; + testdisk = callPackage ../tools/misc/testdisk { }; - htmlTidy = callPackage ../tools/text/html-tidy { }; + html2text = callPackage ../tools/text/html2text { }; + + html-tidy = callPackage ../tools/text/html-tidy { }; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; + rcm = callPackage ../tools/misc/rcm {}; + tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc { @@ -2379,6 +3024,8 @@ let tm = callPackage ../tools/system/tm { }; + tradcpp = callPackage ../development/tools/tradcpp { }; + trang = callPackage ../tools/text/xml/trang { }; tre = callPackage ../development/libraries/tre { }; @@ -2395,10 +3042,14 @@ let ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; + udunits = callPackage ../development/libraries/udunits { }; + uim = callPackage ../tools/inputmethods/uim { inherit (pkgs.kde4) kdelibs; }; + uhub = callPackage ../servers/uhub { }; + unclutter = callPackage ../tools/misc/unclutter { }; unbound = callPackage ../tools/networking/unbound { }; @@ -2407,10 +3058,14 @@ let unrar = callPackage ../tools/archivers/unrar { }; + xar = callPackage ../tools/compression/xar { }; + xarchive = callPackage ../tools/archivers/xarchive { }; xarchiver = callPackage ../tools/archivers/xarchiver { }; + xbrightness = callPackage ../tools/X11/xbrightness { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; unarj = callPackage ../tools/archivers/unarj { }; @@ -2423,9 +3078,9 @@ let uptimed = callPackage ../tools/system/uptimed { }; - varnish = callPackage ../servers/varnish { }; + urlwatch = callPackage ../tools/networking/urlwatch { }; - varnish2 = callPackage ../servers/varnish/2.1.nix { }; + varnish = callPackage ../servers/varnish { }; venus = callPackage ../tools/misc/venus { python = python27; @@ -2433,6 +3088,10 @@ let vlan = callPackage ../tools/networking/vlan { }; + vmtouch = callPackage ../tools/misc/vmtouch { }; + + volumeicon = callPackage ../tools/audio/volumeicon { }; + wakelan = callPackage ../tools/networking/wakelan { }; wavemon = callPackage ../tools/networking/wavemon { }; @@ -2462,12 +3121,23 @@ let wicd = callPackage ../tools/networking/wicd { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; + wipe = callPackage ../tools/security/wipe { }; + + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { + overrideDerivation = lib.overrideDerivation; + inherit (xlibs) libX11 libXext libXrender; + }; + + wml = callPackage ../development/web/wml { }; + + wrk = callPackage ../tools/networking/wrk { }; wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; + wyrd = callPackage ../tools/misc/wyrd { }; + x86info = callPackage ../os-specific/linux/x86info { }; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; @@ -2513,15 +3183,19 @@ let xdummy = callPackage ../tools/misc/xdummy { }; + xflux = callPackage ../tools/misc/xflux { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - xmlroff = callPackage ../tools/typesetting/xmlroff { - inherit (gnome) libgnomeprint; - }; + xml2 = callPackage ../tools/text/xml/xml2 { }; + + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; - xmlto = callPackage ../tools/typesetting/xmlto { }; + xmlto = callPackage ../tools/typesetting/xmlto { + w3m = w3m.override { graphicsSupport = false; }; + }; xmltv = callPackage ../tools/misc/xmltv { }; @@ -2541,7 +3215,11 @@ let xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - youtubeDL = callPackage ../tools/misc/youtube-dl { }; + xvkbd = callPackage ../tools/X11/xvkbd { + inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep; + }; + + youtube-dl = callPackage ../tools/misc/youtube-dl { }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { @@ -2551,9 +3229,11 @@ let zdelta = callPackage ../tools/compression/zdelta { }; - zfstools = callPackage ../tools/filesystems/zfstools { - zfs = linuxPackages.zfs; - }; + zerotierone = callPackage ../tools/networking/zerotierone { }; + + zerofree = callPackage ../tools/filesystems/zerofree { }; + + zfstools = callPackage ../tools/filesystems/zfstools { }; zile = callPackage ../applications/editors/zile { }; @@ -2564,6 +3244,8 @@ let zsync = callPackage ../tools/compression/zsync { }; + zxing = callPackage ../tools/graphics/zxing {}; + ### SHELLS @@ -2583,10 +3265,14 @@ let python = python27Full; }; + mksh = callPackage ../shells/mksh { }; + tcsh = callPackage ../shells/tcsh { }; rush = callPackage ../shells/rush { }; + xonsh = callPackage ../shells/xonsh { }; + zsh = callPackage ../shells/zsh { }; @@ -2614,41 +3300,52 @@ let bigloo = callPackage ../development/compilers/bigloo { }; - chicken = callPackage ../development/compilers/chicken { }; + fetchegg = callPackage ../build-support/fetchegg { }; - ccl = builderDefsPackage ../development/compilers/ccl {}; + eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { }; - clang = wrapClang llvmPackages.clang; + chicken = callPackage ../development/compilers/chicken { + bootstrap-chicken = chicken.override { bootstrap-chicken = null; }; + }; - clang_34 = wrapClang llvmPackages_34.clang; - clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); + egg2nix = callPackage ../development/tools/egg2nix { + chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; + }; + + ccl = callPackage ../development/compilers/ccl { }; + + clang = llvmPackages.clang; + + clang_36 = llvmPackages.clang; + clang_35 = wrapCC llvmPackages_35.clang; + clang_34 = wrapCC llvmPackages_34.clang; + clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); - clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { + clang-analyzer = 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; + inherit stdenv llvm; }; clangSelf = clangWrapSelf llvmPackagesSelf.clang; - clangWrapSelf = build: (import ../build-support/clang-wrapper) { - clang = build; + clangWrapSelf = build: (import ../build-support/cc-wrapper) { + cc = build; stdenv = clangStdenv; libc = glibc; binutils = binutils; - shell = bash; - inherit libcxx coreutils zlib; + inherit coreutils zlib; + extraPackages = [ libcxx ]; 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); + clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang-unwrapped); clean = callPackage ../development/compilers/clean { }; @@ -2658,20 +3355,11 @@ let 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; - }; + cryptol = haskellngPackages.cryptol; cython = pythonPackages.cython; cython3 = python3Packages.cython; - dylan = callPackage ../development/compilers/gwydion-dylan { - dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; - }; - ecl = callPackage ../development/compilers/ecl { }; eql = callPackage ../development/compilers/eql {}; @@ -2679,17 +3367,15 @@ let adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { }; fpc = callPackage ../development/compilers/fpc { }; - fpc_2_4_0 = callPackage ../development/compilers/fpc/2.4.0.nix { }; gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc48; + gcc = gcc48; + gcc_multi = gcc48_multi; - gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 { - inherit fetchurl stdenv noSysDirs; - }); + gccApple = throw "gccApple is no longer supported"; - gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 { + gcc34 = wrapCC (import ../development/compilers/gcc/3.4 { inherit fetchurl stdenv noSysDirs; }); @@ -2751,15 +3437,15 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) { + gcc44 = lowPrio (wrapCC (makeOverridable (import ../development/compilers/gcc/4.4) { inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */ gettext which noSysDirs; texinfo = texinfo4; profiledCompiler = true; })); - gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 { - inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl + gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { + inherit fetchurl stdenv gmp mpfr libmpc libelf zlib perl gettext which noSysDirs; texinfo = texinfo4; @@ -2781,7 +3467,7 @@ let else null; })); - gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { + gcc46 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; ppl = null; @@ -2803,7 +3489,7 @@ let texinfo = texinfo413; })); - gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { + gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion @@ -2822,14 +3508,14 @@ let gcc48_multi = if system == "x86_64-linux" then lowPrio ( - wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); + wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.cc.override { + stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc); profiledCompiler = false; enableMultilib = true; })) else throw "Multilib gcc not supported on ‘${system}’"; - gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { + gcc48_debug = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { stripped = false; inherit noSysDirs; @@ -2838,7 +3524,7 @@ let binutilsCross = null; })); - gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 { + gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion @@ -2855,19 +3541,9 @@ let else null; })); - gccApple = - assert stdenv.isDarwin; - wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) { - inherit fetchurl noSysDirs; - profiledCompiler = true; - # Since it fails to build with GCC 4.6, build it with the "native" - # Apple-GCC. - stdenv = allStdenvs.stdenvNative; - }); - gfortran = gfortran48; - gfortran48 = wrapGCC (gcc48.gcc.override { + gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; langFortran = true; langCC = false; @@ -2877,7 +3553,7 @@ let gcj = gcj48; - gcj48 = wrapGCC (gcc48.gcc.override { + gcj48 = wrapCC (gcc48.cc.override { name = "gcj"; langJava = true; langFortran = false; @@ -2891,9 +3567,9 @@ let libXrandr xproto renderproto xextproto inputproto randrproto; }); - gnat = gnat45; + gnat = gnat45; # failed to make 4.6 or 4.8 build - gnat45 = wrapGCC (gcc45.gcc.override { + gnat45 = wrapCC (gcc45.cc.override { name = "gnat"; langCC = false; langC = true; @@ -2906,33 +3582,32 @@ let ppl = null; }); - gnat46 = wrapGCC (gcc46.gcc.override { - name = "gnat"; - langCC = false; - langC = true; - langAda = true; - profiledCompiler = false; - gnatboot = gnat45; - # We can't use the ppl stuff, because we would have - # libstdc++ problems. - ppl = null; - cloog = null; - }); - - gnatboot = wrapGCC (import ../development/compilers/gnatboot { + gnatboot = wrapGCC-old (import ../development/compilers/gnatboot { inherit fetchurl stdenv; }); + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { + emacsSupport = config.emacsSupport or false; + }; + gccgo = gccgo48; - gccgo48 = wrapGCC (gcc48.gcc.override { + gccgo48 = wrapCC (gcc48.cc.override { name = "gccgo"; langCC = true; #required for go. langC = true; langGo = true; }); - ghdl = wrapGCC (import ../development/compilers/gcc/4.3 { + gccgo49 = wrapCC (gcc49.cc.override { + name = "gccgo49"; + langCC = true; #required for go. + langC = true; + langGo = true; + profiledCompiler = false; + }); + + ghdl = wrapCC (import ../development/compilers/gcc/4.3 { inherit stdenv fetchurl gmp mpfr noSysDirs gnat; texinfo = texinfo4; name = "ghdl"; @@ -2964,6 +3639,12 @@ let regexCompat HsSyck random; }; + uhc = callPackage ../development/compilers/uhc/default.nix ({ + stdenv = clangStdenv; + ghcWithPackages = haskellngPackages.ghcWithPackages; + inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib; + }); + gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; @@ -2974,13 +3655,20 @@ let releaseType = "update"; sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; }; - gcc-arm-embedded = gcc-arm-embedded-4_8; + gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + version = "4.9-2014q4-20141203"; + releaseType = "major"; + sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f"; + }; + gcc-arm-embedded = gcc-arm-embedded-4_9; + + gforth = callPackage ../development/compilers/gforth {}; # Haskell and GHC # Import Haskell infrastructure. - haskell = let pkgs_ = pkgs // { gmp = gmp.override { withStatic = true; }; }; + haskell = let pkgs_ = pkgs // { /* add necessary overrides here */ }; callPackage = newScope pkgs_; newScope = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra); in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; }; @@ -3001,30 +3689,32 @@ let 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; + haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling; + haskellPackages_ghc784_profiling = recurseIntoAttrs haskell.packages_ghc784.profiling; + haskellPackages_ghc784 = recurseIntoAttrs haskell.packages_ghc784.highPrio; + haskellPackages = haskellPackages_ghc784; - haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); + haskell-ng = callPackage ./haskell-ng.nix { }; + haskellngPackages = haskell-ng.packages.ghc784.override { + overrides = config.haskellPackageOverrides or (self: super: {}); + provideOldAttributeNames = config.provideOldHaskellAttributeNames or false; + }; haxe = callPackage ../development/compilers/haxe { }; + hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; hhvm = callPackage ../development/compilers/hhvm { }; hiphopvm = hhvm; /* Compatibility alias */ - falcon = builderDefsPackage (import ../development/interpreters/falcon) { - inherit cmake; - }; + hop = callPackage ../development/compilers/hop { }; + + falcon = callPackage ../development/interpreters/falcon { }; fsharp = callPackage ../development/compilers/fsharp {}; @@ -3040,7 +3730,11 @@ let go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; - go = go_1_3; + go_1_4 = callPackage ../development/compilers/go/1.4.nix { inherit (darwin) Security; }; + + go = go_1_4; + + go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; gox = callPackage ../development/compilers/go/gox.nix { }; @@ -3050,7 +3744,7 @@ let icedtea7_jdk = callPackage ../development/compilers/icedtea rec { jdk = openjdk; - jdkPath = "${openjdk}/lib/openjdk"; + giflib = giflib_5_0; } // { outputs = [ "out" ]; }; icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs @@ -3058,9 +3752,14 @@ let pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; }; icedtea7_web = callPackage ../development/compilers/icedtea-web { - jdk = "${icedtea7_jdk}/lib/icedtea"; + jdk = icedtea7_jdk; + xulrunner = firefox; }; + icedtea_jdk = icedtea7_jdk; + icedtea_jre = icedtea7_jre; + icedtea_web = icedtea7_web; + ikarus = callPackage ../development/compilers/ikarus { }; hugs = callPackage ../development/compilers/hugs { }; @@ -3077,28 +3776,39 @@ let jdk = openjdkBootstrap; }) // { outputs = [ "out" ]; }; + openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { } // { outputs = [ "out" ]; }; + # 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.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgs.openjre - else pkgs.oraclejre; + jdk = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + then pkgs.icedtea_jdk + else if stdenv.isDarwin + then pkgs.openjdk # TODO: Use icedtea for darwin + else pkgs.oraclejdk; + + jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + then pkgs.icedtea_jre + else if stdenv.isDarwin + then pkgs.openjre # TODO: Use icedtea for darwin + else pkgs.oraclejre; oraclejdk = pkgs.jdkdistro true false; oraclejdk7 = pkgs.oraclejdk7distro true false; + oraclejdk7psu = pkgs.oraclejdk7psu_distro true false; + oraclejdk8 = pkgs.oraclejdk8distro true false; oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); + oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false); + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); jrePlugin = lowPrio (pkgs.jdkdistro false true); @@ -3117,6 +3827,11 @@ let (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); + oraclejdk7psu_distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk7psu-linux.nix { inherit installjdk; }); + oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) @@ -3124,29 +3839,25 @@ let jikes = callPackage ../development/compilers/jikes { }; - 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 { + julia02 = callPackage ../development/compilers/julia/0.2.nix { liblapack = liblapack.override {shared = true;}; llvm = llvm_33; + openblas = openblas_0_2_2; + suitesparse = suitesparse_4_2; }; - julia030 = let + + julia03 = let liblapack = liblapack_3_5_0.override {shared = true;}; - in callPackage ../development/compilers/julia/0.3.0.nix { + in callPackage ../development/compilers/julia/0.3.nix { inherit liblapack; - suitesparse = suitesparse.override { + suitesparse = suitesparse_4_2.override { inherit liblapack; }; - openblas = openblas_0_2_10; - llvm = llvm_34; + llvm = llvm_33; }; - julia = julia021; + julia = julia03; - lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { - inherit makeWrapper gtk glib pango atk gdk_pixbuf; - inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -3154,18 +3865,14 @@ let llvm = llvmPackages.llvm; + llvm_36 = llvmPackages_36.llvm; + llvm_35 = llvmPackages_35.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; - }; + llvm_v = path: callPackage path { }; - llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // { - # until someone solves build problems with _34 - llvm = llvm_33; - clang = clang_33; - }; + llvmPackages = llvmPackages_36; llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit stdenv newScope fetchurl; @@ -3173,6 +3880,15 @@ let }); llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; + llvmPackages_35 = import ../development/compilers/llvm/3.5 { + inherit pkgs stdenv newScope fetchurl isl; + }; + + llvmPackages_36 = import ../development/compilers/llvm/3.6 { + inherit pkgs stdenv newScope fetchurl isl wrapCC; + inherit (stdenvAdapters) overrideCC; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -3181,8 +3897,12 @@ let mercury = callPackage ../development/compilers/mercury { }; + microscheme = callPackage ../development/compilers/microscheme { }; + mitscheme = callPackage ../development/compilers/mit-scheme { }; + mkcl = callPackage ../development/compilers/mkcl {}; + mlton = callPackage ../development/compilers/mlton { }; mono = callPackage ../development/compilers/mono { @@ -3191,7 +3911,10 @@ let monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; - mozart = callPackage ../development/compilers/mozart { }; + mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; + mozart = mozart-binary; + + nim = callPackage ../development/compilers/nim { }; neko = callPackage ../development/compilers/neko { }; @@ -3213,22 +3936,49 @@ let ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; + ocaml_4_02_1 = callPackage ../development/compilers/ocaml/4.02.1.nix { }; + orc = callPackage ../development/compilers/orc { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; - mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec { + mkOcamlPackages = ocaml: self: + let + callPackage = newScope self; + ocaml_version = (builtins.parseDrvName ocaml.name).version; + in rec { inherit ocaml; + acgtk = callPackage ../applications/science/logic/acgtk { }; + + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + + base64 = callPackage ../development/ocaml-modules/base64 { }; + + bolt = callPackage ../development/ocaml-modules/bolt { }; + camlidl = callPackage ../development/tools/ocaml/camlidl { }; - camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; + camlp4 = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/tools/ocaml/camlp4 { } + else null; - camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix { - transitional = true; - }; + camlp5_old_strict = + if lib.versionOlder "4.00" ocaml_version + then camlp5_6_strict + else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; + + camlp5_old_transitional = + if lib.versionOlder "4.00" ocaml_version + then camlp5_6_transitional + else callPackage ../development/tools/ocaml/camlp5/5.15.nix { + transitional = true; + }; camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; @@ -3240,32 +3990,84 @@ let camlp5_transitional = camlp5_6_transitional; + camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; + + calendar = callPackage ../development/ocaml-modules/calendar { }; + camlzip = callPackage ../development/ocaml-modules/camlzip { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; - camlimages = callPackage ../development/ocaml-modules/camlimages { + camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { libpng = libpng12; giflib = giflib_4_1; }; + camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { + giflib = giflib_4_1; + }; + camlimages = camlimages_4_1; biniou = callPackage ../development/ocaml-modules/biniou { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; + + cil = callPackage ../development/ocaml-modules/cil { }; + + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + + config-file = callPackage ../development/ocaml-modules/config-file { }; + + cpdf = callPackage ../development/ocaml-modules/cpdf { }; + cppo = callPackage ../development/tools/ocaml/cppo { }; cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + cstruct = callPackage ../development/ocaml-modules/cstruct { + lwt = ocaml_lwt; + sexplib = ocaml_sexplib; + }; + csv = callPackage ../development/ocaml-modules/csv { }; deriving = callPackage ../development/tools/ocaml/deriving { }; + dolog = callPackage ../development/ocaml-modules/dolog { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; + eff = callPackage ../development/interpreters/eff { }; + + eliom = callPackage ../development/ocaml-modules/eliom { }; + + enumerate = callPackage ../development/ocaml-modules/enumerate { + type_conv = ocaml_typeconv; + }; + + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; + + erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { + lwt = ocaml_lwt; + sexplib = ocaml_sexplib; + }; + + fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; + + fileutils = callPackage ../development/ocaml-modules/fileutils { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; + fix = callPackage ../development/ocaml-modules/fix { }; + + functory = callPackage ../development/ocaml-modules/functory { }; + + io-page = callPackage ../development/ocaml-modules/io-page { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; @@ -3274,22 +4076,54 @@ let patoline = callPackage ../tools/typesetting/patoline { }; + gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; + + gg = callPackage ../development/ocaml-modules/gg { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + gtktop = callPackage ../development/ocaml-modules/gtktop { }; + + hex = callPackage ../development/ocaml-modules/hex { }; + + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; + + jsonm = callPackage ../development/ocaml-modules/jsonm { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; + lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { + inherit (gnome) libgnomecanvas libglade gtksourceview; + }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (gnome) libgnomecanvas libglade gtksourceview; }; + lablgtk-extras = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/ocaml-modules/lablgtk-extras { } + else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; + lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { gtkmathview = callPackage ../development/libraries/gtkmathview { }; }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; + lambdaTerm = + if lib.versionOlder "4.01" ocaml_version + then callPackage ../development/ocaml-modules/lambda-term { } + else lambdaTerm-1_6; + + macaque = callPackage ../development/ocaml-modules/macaque { }; + + magick = callPackage ../development/ocaml-modules/magick { }; + menhir = callPackage ../development/ocaml-modules/menhir { }; merlin = callPackage ../development/tools/ocaml/merlin { }; + mezzo = callPackage ../development/compilers/mezzo { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; @@ -3302,12 +4136,16 @@ let ocaml_expat = callPackage ../development/ocaml-modules/expat { }; + ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocaml_http = callPackage ../development/ocaml-modules/http { }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { }; + ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; @@ -3318,11 +4156,18 @@ let ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; + ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { }; + ocaml_pcre = callPackage ../development/ocaml-modules/pcre { inherit pcre; }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; + ocaml_react = callPackage ../development/ocaml-modules/react { }; + reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; + + ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; @@ -3330,74 +4175,159 @@ let ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; + ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + + ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; + + ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; + + ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; + + ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + + ojquery = callPackage ../development/ocaml-modules/ojquery { }; + + otfm = callPackage ../development/ocaml-modules/otfm { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; + ulex = callPackage ../development/ocaml-modules/ulex { }; ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { camlp5 = camlp5_transitional; }; - ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { }; - - ocaml_typeconv_3_0_5 = callPackage ../development/ocaml-modules/typeconv/3.0.5.nix { }; + typeconv_108_08_00 = callPackage ../development/ocaml-modules/typeconv/108.08.00.nix { }; + ocaml_typeconv = + if lib.versionOlder "4.00" ocaml_version + then callPackage ../development/ocaml-modules/typeconv { } + else if lib.versionOlder "3.12" ocaml_version + then typeconv_108_08_00 + else null; - ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { }; + sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { + typeconv = typeconv_108_08_00; + }; + ocaml_sexplib = + if lib.versionOlder "4.00" ocaml_version + then callPackage ../development/ocaml-modules/sexplib { } + else if lib.versionOlder "3.12" ocaml_version + then sexplib_108_08_00 + else null; ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib { minimal = false; }; + ocurl = callPackage ../development/ocaml-modules/ocurl { }; + + pprint = callPackage ../development/ocaml-modules/pprint { }; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; - 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; + qtest = callPackage ../development/ocaml-modules/qtest { + oasis = ocaml_oasis; + }; + + re = callPackage ../development/ocaml-modules/re { }; + + safepass = callPackage ../development/ocaml-modules/safepass { }; + + sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + + stringext = callPackage ../development/ocaml-modules/stringext { }; + + twt = callPackage ../development/ocaml-modules/twt { }; + + utop = callPackage ../development/tools/ocaml/utop { }; sawja = callPackage ../development/ocaml-modules/sawja { }; uucd = callPackage ../development/ocaml-modules/uucd { }; + uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; + + uri = callPackage ../development/ocaml-modules/uri { + sexplib = ocaml_sexplib; + }; + + uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; + + vg = callPackage ../development/ocaml-modules/vg { }; + xmlm = callPackage ../development/ocaml-modules/xmlm { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; + + zed = callPackage ../development/ocaml-modules/zed { }; + + ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { + oasis = ocaml_oasis; + }; + }; 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_3_10_0 = (mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0) + // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; + ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) + // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; + ocamlPackages_3_12_1 = (mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1) + // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; 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; + ocamlPackages_4_02_1 = mkOcamlPackages ocaml_4_02_1 pkgs.ocamlPackages_4_02_1; + ocamlPackages_latest = ocamlPackages_4_02_1; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; + ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; + opa = callPackage ../development/compilers/opa { + ocamlPackages = ocamlPackages_4_00_1; + }; + + opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; + opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { + inherit (ocamlPackages_4_01_0) ocaml; + }; + opam = callPackage ../development/tools/ocaml/opam { }; + + ocamlnat = newScope pkgs.ocamlPackages_3_12_1 ../development/ocaml-modules/ocamlnat { }; qcmm = callPackage ../development/compilers/qcmm { lua = lua4; ocaml = ocaml_3_08_0; }; - roadsend = callPackage ../development/compilers/roadsend { }; - - rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustcAlpha = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {}; + rustcAlpha2 = callPackage ../development/compilers/rustc/1.0.0-alpha2.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - - rust = rustc; + rustc = rustcAlpha2; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { clisp = clisp; }; + # For StumpWM + sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix { + clisp = clisp; + }; + # For ACL2 + sbcl_1_2_0 = callPackage ../development/compilers/sbcl/1.2.0.nix { + clisp = clisp; + }; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; @@ -3409,6 +4339,8 @@ let smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; @@ -3431,12 +4363,18 @@ let tbb = callPackage ../development/libraries/tbb { }; + teyjus = callPackage ../development/compilers/teyjus { + omake = omake_rc1; + }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { }; vala = callPackage ../development/compilers/vala/default.nix { }; + vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { }; + visualcpp = callPackage ../development/compilers/visual-c++ { }; vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; @@ -3445,31 +4383,26 @@ let win32hello = callPackage ../development/compilers/visual-c++/test { }; - wrapGCCWith = 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; + wrapCCWith = ccWrapper: libc: baseCC: ccWrapper { + nativeTools = stdenv.cc.nativeTools or false; + nativeLibc = stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; + cc = baseCC; + libc = libc; inherit stdenv binutils coreutils zlib; }; - wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper { - nativeTools = stdenv.gcc.nativeTools or false; - nativeLibc = stdenv.gcc.nativeLibc or false; - nativePrefix = stdenv.gcc.nativePrefix or ""; - clang = baseClang; + wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) glibc; + # legacy version, used for gnat bootstrapping + wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) { + nativeTools = stdenv.cc.nativeTools or false; + nativeLibc = stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; + gcc = baseGCC; libc = glibc; - shell = bash; - binutils = stdenv.gcc.binutils; - inherit stdenv coreutils zlib; + inherit stdenv binutils coreutils zlib; }; - wrapClang = wrapClangWith (makeOverridable (import ../build-support/clang-wrapper)) glibc; - - wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc; - wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -3480,6 +4413,27 @@ let inherit stdenv gcc binutils libc shell name cross; }); + /* Alternative GCC wrapper that uses the standard -I include flag instead of + * -isystem. The -isystem flag can change the search order specified by prior + * -I flags. For KDE 5 packages, we don't want to interfere with the include + * search path order specified by the build system. Some packages depend on + * Qt 4 and Qt 5 simultaneously; because the two Qt versions provide headers + * with the same filenames, we must respect the search order specified by the + * build system so that the Qt 4 components find the Qt 4 headers and the Qt 5 + * components find the Qt 5 headers. + */ + wrapGCCStdInc = glibc: baseGCC: (import ../build-support/cc-wrapper) { + nativeTools = stdenv.cc.nativeTools or false; + nativeLibc = stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; + cc = baseGCC; + libc = glibc; + inherit stdenv binutils coreutils zlib; + setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh; + }; + + gccStdInc = wrapGCCStdInc glibc gcc.cc; + # prolog yap = callPackage ../development/compilers/yap { }; @@ -3489,15 +4443,18 @@ let ### DEVELOPMENT / INTERPRETERS acl2 = builderDefsPackage ../development/interpreters/acl2 { - inherit sbcl; + sbcl = sbcl_1_2_0; }; angelscript = callPackage ../development/interpreters/angelscript {}; + chibi = callPackage ../development/interpreters/chibi { }; + clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good - # for sbcl bootstrap + # for sbcl bootstrap. + # SBCL page recommends 2.33.2, though. Not sure when was it last tested clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix { libsigsegv = libsigsegv_25; }; @@ -3509,8 +4466,15 @@ let erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; + erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; + erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; + erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; + erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; erlang = erlangR17; + erlang_odbc = erlangR17_odbc; + erlang_javac = erlangR17_javac; + erlang_odbc_javac = erlangR17_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; @@ -3530,6 +4494,8 @@ let j = callPackage ../development/interpreters/j {}; + jimtcl = callPackage ../development/interpreters/jimtcl {}; + jmeter = callPackage ../applications/networking/jmeter {}; davmail = callPackage ../applications/networking/davmail {}; @@ -3538,10 +4504,14 @@ let kona = callPackage ../development/interpreters/kona {}; - love = callPackage ../development/interpreters/love {lua=lua5;}; + lolcode = callPackage ../development/interpreters/lolcode { }; + + love = callPackage ../development/interpreters/love {lua=lua5_1;}; love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; + ### LUA MODULES + 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 { }; @@ -3549,19 +4519,28 @@ let lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix { compat = true; }; - lua5 = lua5_1; + lua5 = lua5_2_compat; lua = lua5; - lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {}; + lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); + lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); + + luaPackages = lua52Packages; + + lua5_1_sockets = lua51Packages.luasocket; + 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 {}; + lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; + + luajit = callPackage ../development/interpreters/luajit {}; + + luarocks = luaPackages.luarocks; - luarocks = callPackage ../development/tools/misc/luarocks { - lua = lua5; + toluapp = callPackage ../development/tools/toluapp { + lua = lua5_1; # doesn't work with any other :( }; - luajit = callPackage ../development/interpreters/luajit {}; + ### END OF LUA lush2 = callPackage ../development/interpreters/lush {}; @@ -3572,9 +4551,16 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; - automake = automake114x; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf2_5; + }; + + mesos-dns = callPackage ../servers/dns/mesos-dns { }; + + mujs = callPackage ../development/interpreters/mujs { }; + + nix-exec = callPackage ../development/interpreters/nix-exec { + git = gitMinimal; }; octave = callPackage ../development/interpreters/octave { @@ -3585,8 +4571,7 @@ let hdf5 = null; glpk = null; suitesparse = null; - openjdk = null; - gnuplot = null; + jdk = null; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { fltk = fltk13; @@ -3598,15 +4583,13 @@ let ocropus = callPackage ../applications/misc/ocropus { }; - perl514 = callPackage ../development/interpreters/perl/5.14 { }; + perl516 = callPackage ../development/interpreters/perl/5.16 { }; - perl516 = callPackage ../development/interpreters/perl/5.16 { + perl520 = callPackage ../development/interpreters/perl/5.20 { fetchurl = fetchurlBoot; }; - perl520 = callPackage ../development/interpreters/perl/5.20 { }; - - perl = if system != "i686-cygwin" then perl516 else sysPerl; + perl = if system != "i686-cygwin" then perl520 else sysPerl; php = php54; @@ -3614,19 +4597,17 @@ let inherit php pkgs; }); - 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; - }; - }; - }; + php55Packages = recurseIntoAttrs (import ./php-packages.nix { + inherit pkgs; + php = php55; + }); php54 = callPackage ../development/interpreters/php/5.4.nix { }; + php55 = callPackage ../development/interpreters/php/5.5.nix { }; + + php56 = callPackage ../development/interpreters/php/5.6.nix { }; + picolisp = callPackage ../development/interpreters/picolisp {}; pltScheme = racket; # just to be sure @@ -3634,8 +4615,9 @@ let polyml = callPackage ../development/compilers/polyml { }; pure = callPackage ../development/interpreters/pure { - llvm = llvm_33 ; + llvm = llvm_35; }; + pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; python = python2; python2 = python27; @@ -3646,46 +4628,53 @@ let python2Packages = python27Packages; python3Packages = python34Packages; + python26 = callPackage ../development/interpreters/python/2.6 { + db = db47; + self = python26; + }; + python27 = callPackage ../development/interpreters/python/2.7 { + self = python27; + }; + python32 = callPackage ../development/interpreters/python/3.2 { + self = python32; + }; + python33 = callPackage ../development/interpreters/python/3.3 { + self = python33; + }; + python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { + self = python34; + }); + pypy = callPackage ../development/interpreters/pypy { + self = pypy; + }; + 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.3 { }; - - python26Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = []; - postBuild = ""; - python = python26; - inherit (python26Packages) recursivePthLoader; + python26Full = python26.override { + includeModules = true; + self = python26Full; }; - python27Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = []; - postBuild = ""; - python = python27; - inherit (python27Packages) recursivePthLoader; + python27Full = python27.override { + includeModules = true; + self = python27Full; }; + python2nix = callPackage ../tools/package-management/python2nix { }; + pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs { inherit stdenv fetchurl lib; }); - pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { }; - pypi2nix = python27Packages.pypi2nix; + svg2tikz = python27Packages.svg2tikz; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - qi = callPackage ../development/compilers/qi { }; - racket = callPackage ../development/interpreters/racket { }; rakudo = callPackage ../development/interpreters/rakudo { }; @@ -3698,17 +4687,33 @@ let wrapPython = pythonPackages.wrapPython; }; - ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { }; - ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { }; - ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { }); - - ruby = ruby19; - - rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { }); + bundix = callPackage ../development/interpreters/ruby/bundix { + ruby = ruby_2_1_3; + }; + bundler = callPackage ../development/interpreters/ruby/bundler.nix { }; + bundler_HEAD = import ../development/interpreters/ruby/bundler-head.nix { + inherit buildRubyGem coreutils fetchgit; + }; + defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { }; + buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { }; + bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; - rake = rubyLibs.rake; + ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { }; + ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { }; + ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { }); + ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { }); + ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }); + ruby_2_1_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { }); + ruby_2_1_3 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { }); + ruby_2_2_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { }); - rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { }; + # Ruby aliases + ruby = ruby_1_9; + ruby_1_8 = ruby_1_8_7; + ruby_1_9 = ruby_1_9_3; + ruby_2_0 = ruby_2_0_0; + ruby_2_1 = ruby_2_1_3; + ruby_2_2 = ruby_2_2_0; rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) { inherit ruby makeWrapper; @@ -3747,8 +4752,6 @@ let inherit (pythonPackages) pysqlite; }; - xulrunner_30 = firefox30Pkgs.xulrunner; - ### DEVELOPMENT / MISC @@ -3773,10 +4776,7 @@ let samples = true; }; - avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc { - gcc = gcc46; - stdenv = overrideGCC stdenv gcc46; - }; + avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {}; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -3801,9 +4801,14 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; + + guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; pharo-vm = callPackage_i686 ../development/pharo/vm { }; + pharo-launcher = callPackage ../development/pharo/launcher { }; srecord = callPackage ../development/tools/misc/srecord { }; @@ -3812,9 +4817,12 @@ let inherit fetchurl stdenv cabextract; }); + xidel = callPackage ../tools/text/xidel { }; ### DEVELOPMENT / TOOLS + augeas = callPackage ../tools/system/augeas { }; + ansible = callPackage ../tools/system/ansible { }; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; @@ -3825,17 +4833,28 @@ let apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; + apacheKafka = callPackage ../servers/apache-kafka { }; + astyle = callPackage ../development/tools/misc/astyle { }; + atom-shell = callPackage ../development/tools/atom-shell { + gconf = pkgs.gnome.GConf; + }; + + autobuild = callPackage ../development/tools/misc/autobuild { }; autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; + autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = automake112x; + automake = automake115x; + + automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -3845,6 +4864,8 @@ let automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; + automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; + automoc4 = callPackage ../development/tools/misc/automoc4 { }; avrdude = callPackage ../development/tools/misc/avrdude { }; @@ -3855,9 +4876,13 @@ let bam = callPackage ../development/tools/build-managers/bam {}; - binutils = callPackage ../development/tools/misc/binutils { - inherit noSysDirs; - }; + bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; }; + + binutils = if stdenv.isDarwin + then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} + else callPackage ../development/tools/misc/binutils { + inherit noSysDirs; + }; binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs; @@ -3865,7 +4890,7 @@ let }); binutilsCross = - if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools + if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools_cross else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { inherit stdenv fetchurl zlib bison; noSysDirs = true; @@ -3885,12 +4910,14 @@ let dateutil = pythonPackages.dateutil_1_5; }; - buildbotSlave = callPackage ../development/tools/build-managers/buildbot-slave { + buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { inherit (pythonPackages) twisted; }; byacc = callPackage ../development/tools/parsing/byacc { }; + cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { }; + casperjs = callPackage ../development/tools/casperjs { }; cbrowser = callPackage ../development/tools/misc/cbrowser { }; @@ -3912,19 +4939,27 @@ let # }; # ccacheWrapper = makeOverridable ({ extraConfig ? "" }: - wrapGCC (ccache.links extraConfig)) {}; - ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper); + wrapCC (ccache.links extraConfig)) {}; + ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper); cccc = callPackage ../development/tools/analysis/cccc { }; cgdb = callPackage ../development/tools/misc/cgdb { }; + chefdk = callPackage ../development/tools/chefdk { + ruby = ruby_2_0_0; + }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; + chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + coan = callPackage ../development/tools/analysis/coan { }; + complexity = callPackage ../development/tools/misc/complexity { }; ctags = callPackage ../development/tools/misc/ctags { }; @@ -3933,9 +4968,12 @@ let inherit pkgs ctags writeScriptBin; }; - cmake = callPackage ../development/tools/build-managers/cmake { }; + ctodo = callPackage ../applications/misc/ctodo { }; - cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; + cmake = callPackage ../development/tools/build-managers/cmake { + wantPS = stdenv.isDarwin; + ps = if stdenv.isDarwin then darwin.ps else null; + }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -3959,8 +4997,8 @@ let csslint = callPackage ../development/web/csslint { }; - libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; - libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; + libcxx = llvmPackages.libcxx; + libcxxabi = llvmPackages.libcxxabi; libsigrok = callPackage ../development/tools/libsigrok { }; @@ -3992,13 +5030,15 @@ let # }; # distccWrapper = makeOverridable ({ extraConfig ? "" }: - wrapGCC (distcc.links extraConfig)) {}; - distccStdenv = lowPrio (overrideGCC stdenv distccWrapper); + wrapCC (distcc.links extraConfig)) {}; + distccStdenv = lowPrio (overrideCC stdenv distccWrapper); - distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix { - gccRaw = gcc.gcc; - binutils = binutils; - }; + distccMasquerade = if stdenv.isDarwin + then null + else callPackage ../development/tools/misc/distcc/masq.nix { + gccRaw = gcc.cc; + binutils = binutils; + }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { inherit python pil makeWrapper; @@ -4020,8 +5060,16 @@ let emma = callPackage ../development/tools/analysis/emma { }; + eztrace = callPackage ../development/tools/profiling/EZTrace { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; + flow = callPackage ../development/tools/analysis/flow { }; + + fswatch = callPackage ../development/tools/misc/fswatch { }; + + frame = callPackage ../development/libraries/frame { }; + pmd = callPackage ../development/tools/analysis/pmd { }; jdepend = callPackage ../development/tools/analysis/jdepend { }; @@ -4034,6 +5082,8 @@ let m4 = gnum4; + geis = callPackage ../development/libraries/geis { }; + global = callPackage ../development/tools/misc/global { }; gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; @@ -4043,8 +5093,10 @@ let 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; + gnumake3 = gnumake382; + gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; + gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; + gnumake = gnumake41; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -4052,6 +5104,8 @@ let gperf = callPackage ../development/tools/misc/gperf { }; + grail = callPackage ../development/libraries/grail { }; + gtk_doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; @@ -4066,12 +5120,14 @@ let hyenae = callPackage ../tools/networking/hyenae { }; - ibus = callPackage ../development/libraries/ibus { }; + icmake = callPackage ../development/tools/build-managers/icmake { }; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { inherit (perlPackages) XMLSimple; }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { }; + indent = callPackage ../development/tools/misc/indent { }; ino = callPackage ../development/arduino/ino { }; @@ -4112,10 +5168,18 @@ let lttv = callPackage ../development/tools/misc/lttv { }; + maven = maven3; + maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + mk = callPackage ../development/tools/build-managers/mk { }; neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); + fontsConf = makeFontsConf { + fontDirectories = [ + xorg.fontbhttf + ]; + }; }; ninja = callPackage ../development/tools/build-managers/ninja { }; @@ -4124,7 +5188,13 @@ let pythonPackages = python3Packages; }; - node_webkit = callPackage ../development/tools/node-webkit { + node_webkit = node_webkit_0_9; + + node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix { + gconf = pkgs.gnome.GConf; + }; + + node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix { gconf = pkgs.gnome.GConf; }; @@ -4143,11 +5213,7 @@ let peg = callPackage ../development/tools/parsing/peg { }; - phantomjs = callPackage ../development/tools/phantomjs { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + phantomjs = callPackage ../development/tools/phantomjs { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -4168,7 +5234,10 @@ let premake = premake4; - pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; + racerRust = callPackage ../development/tools/rust/racer { + rustc = rustcMaster; + cargo = cargoSnapshot; + }; radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; @@ -4178,15 +5247,30 @@ let rubyBindings = config.radare.rubyBindings or false; luaBindings = config.radare.luaBindings or false; }; + radare2 = callPackage ../development/tools/analysis/radare2 { + inherit (gnome) vte; + lua = lua5; + useX11 = config.radare.useX11 or false; + pythonBindings = config.radare.pythonBindings or false; + rubyBindings = config.radare.rubyBindings or false; + luaBindings = config.radare.luaBindings or false; + }; + ragel = callPackage ../development/tools/parsing/ragel { }; + hammer = callPackage ../development/tools/parsing/hammer { }; + re2c = callPackage ../development/tools/parsing/re2c { }; remake = callPackage ../development/tools/build-managers/remake { }; + rr = callPackage ../development/tools/analysis/rr { }; + saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; + # couldn't find the source yet seleniumRCBin = callPackage ../development/tools/selenium/remote-control { jre = jdk; @@ -4194,16 +5278,23 @@ let selenium-server-standalone = callPackage ../development/tools/selenium/server { }; + selendroid = callPackage ../development/tools/selenium/selendroid { }; + scons = callPackage ../development/tools/build-managers/scons { }; - simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; + sbt = callPackage ../development/tools/build-managers/sbt { }; + simpleBuildTool = sbt; sigrok-cli = callPackage ../development/tools/sigrok-cli { }; + simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; + slimerjs = callPackage ../development/tools/slimerjs {}; sloccount = callPackage ../development/tools/misc/sloccount { }; + sloc = nodePackages.sloc; + smatch = callPackage ../development/tools/analysis/smatch { buildllvmsparse = false; buildc2xml = false; @@ -4213,7 +5304,7 @@ let sparse = callPackage ../development/tools/analysis/sparse { }; - speedtest_cli = callPackage ../tools/networking/speedtest-cli { }; + speedtest-cli = callPackage ../tools/networking/speedtest-cli { }; spin = callPackage ../development/tools/analysis/spin { }; @@ -4221,6 +5312,8 @@ let flex = flex_2_5_35; }; + sselp = callPackage ../tools/X11/sselp{ }; + stm32flash = callPackage ../development/tools/misc/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -4258,26 +5351,22 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby2; + ruby = ruby_2_0_0; }; gdb = callPackage ../development/tools/misc/gdb { + guile = null; hurd = gnu.hurdCross; inherit (gnu) mig; }; + gdbGuile = lowPrio (gdb.override { inherit guile; }); + gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { target = crossSystem; }); - valgrind = callPackage ../development/tools/analysis/valgrind { - stdenv = - # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for - # `__private_extern'.) - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + valgrind = callPackage ../development/tools/analysis/valgrind { }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -4295,6 +5384,10 @@ let yodl = callPackage ../development/tools/misc/yodl { }; + winpdb = callPackage ../development/tools/winpdb { }; + + grabserial = callPackage ../development/tools/grabserial { }; + ### DEVELOPMENT / LIBRARIES @@ -4312,7 +5405,7 @@ let adns = callPackage ../development/libraries/adns { }; - afflib = callPackage ../development/libraries/afflib {}; + afflib = callPackage ../development/libraries/afflib { }; agg = callPackage ../development/libraries/agg { }; @@ -4325,12 +5418,16 @@ let amrwb = callPackage ../development/libraries/amrwb { }; + appstream = callPackage ../development/libraries/appstream { }; + apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { bdbSupport = true; }; + assimp = callPackage ../development/libraries/assimp { }; + asio = callPackage ../development/libraries/asio { }; aspell = callPackage ../development/libraries/aspell { }; @@ -4359,24 +5456,22 @@ let audiofile = callPackage ../development/libraries/audiofile { }; - axis = callPackage ../development/libraries/axis { }; - - babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { }; - babl = callPackage ../development/libraries/babl { }; beecrypt = callPackage ../development/libraries/beecrypt { }; + belle-sip = callPackage ../development/libraries/belle-sip { }; + boehmgc = callPackage ../development/libraries/boehm-gc { }; boolstuff = callPackage ../development/libraries/boolstuff { }; - boost144 = callPackage ../development/libraries/boost/1.44.nix { }; - boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost155 = callPackage ../development/libraries/boost/1.55.nix { }; - boost = boost155; + boost156 = callPackage ../development/libraries/boost/1.56.nix { }; + boost157 = callPackage ../development/libraries/boost/1.57.nix { }; + boost = boost157; - boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { }; + boost_process = callPackage ../development/libraries/boost-process { }; botan = callPackage ../development/libraries/botan { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; @@ -4396,9 +5491,16 @@ let capnproto = callPackage ../development/libraries/capnproto { }; + ccnx = callPackage ../development/libraries/ccnx { }; + + ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + + cimg = callPackage ../development/libraries/cimg { }; + scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; + ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; celt = callPackage ../development/libraries/celt {}; @@ -4420,8 +5522,6 @@ let chromaprint = callPackage ../development/libraries/chromaprint { }; - cil = callPackage ../development/libraries/cil { }; - cilaterm = callPackage ../development/libraries/cil-aterm { stdenv = overrideInStdenv stdenv [gnumake380]; }; @@ -4440,8 +5540,6 @@ let cln = callPackage ../development/libraries/cln { }; - clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; - clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; clucene_core_1 = callPackage ../development/libraries/clucene-core { }; @@ -4479,10 +5577,6 @@ let cppunit = callPackage ../development/libraries/cppunit { }; - cppnetlib = callPackage ../development/libraries/cppnetlib { - boost = boostHeaders; - }; - cracklib = callPackage ../development/libraries/cracklib { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -4506,7 +5600,9 @@ let 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 { }; + dbus_python = callPackage ../development/python-modules/dbus { + isPyPy = python.executable == "pypy"; + }; # Should we deprecate these? Currently there are many references. dbus_tools = pkgs.dbus.tools; @@ -4515,6 +5611,8 @@ let dhex = callPackage ../applications/editors/dhex { }; + double_conversion = callPackage ../development/libraries/double-conversion { }; + dclib = callPackage ../development/libraries/dclib { }; dillo = callPackage ../applications/networking/browsers/dillo { @@ -4523,11 +5621,13 @@ let directfb = callPackage ../development/libraries/directfb { }; + dlib = callPackage ../development/libraries/dlib { }; + dotconf = callPackage ../development/libraries/dotconf { }; dssi = callPackage ../development/libraries/dssi {}; - dragonegg = llvmPackages.dragonegg; + dragonegg = llvmPackages_35.dragonegg; dxflib = callPackage ../development/libraries/dxflib {}; @@ -4551,11 +5651,7 @@ let expat = callPackage ../development/libraries/expat { }; - extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) { - inherit mesa tcl freeglut SDL SDL_mixer pkgconfig - gettext intltool; - inherit (xlibs) libX11 xproto libXi inputproto - libXmu libXext xextproto libXt libSM libICE; + extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; @@ -4577,36 +5673,43 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { - vpxSupport = !stdenv.isMips; - }; - - 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_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; + ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { }; + ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; + ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; + # Aliases + ffmpeg_0 = ffmpeg_0_11; + ffmpeg_1 = ffmpeg_1_2; + ffmpeg_2 = ffmpeg_2_6; + ffmpeg = ffmpeg_2; - ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { - vpxSupport = !stdenv.isMips; + ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { + # The following need to be fixed on Darwin + frei0r = if stdenv.isDarwin then null else frei0r; + game-music-emu = if stdenv.isDarwin then null else game-music-emu; + gsm = if stdenv.isDarwin then null else gsm; + jack2 = if stdenv.isDarwin then null else jack2; + libmodplug = if stdenv.isDarwin then null else libmodplug; + libssh = if stdenv.isDarwin then null else libssh; + libvpx = if stdenv.isDarwin then null else libvpx; + openal = if stdenv.isDarwin then null else openal; + openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1; + pulseaudio = if stdenv.isDarwin then null else pulseaudio; + samba = if stdenv.isDarwin then null else samba; + vid-stab = if stdenv.isDarwin then null else vid-stab; + x265 = if stdenv.isDarwin then null else x265; + xavs = if stdenv.isDarwin then null else xavs; }; - ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; - - ffmpeg = ffmpeg_2; - ffms = callPackage ../development/libraries/ffms { }; fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias + fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + flann = callPackage ../development/libraries/flann { }; flite = callPackage ../development/libraries/flite { }; @@ -4623,11 +5726,18 @@ let cfitsio = callPackage ../development/libraries/cfitsio { }; + fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { }; + fontconfig = callPackage ../development/libraries/fontconfig { }; + fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; + + folly = callPackage ../development/libraries/folly { }; + makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: import ../development/libraries/fontconfig/make-fonts-conf.nix { inherit runCommand libxslt fontconfig fontDirectories; + inherit (xorg) fontbhttf; }; freealut = callPackage ../development/libraries/freealut { }; @@ -4658,14 +5768,9 @@ let gdbm = callPackage ../development/libraries/gdbm { }; - gegl = callPackage ../development/libraries/gegl { - # avocodec avformat librsvg - }; + gecode = callPackage ../development/libraries/gecode { }; - gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix { - # avocodec avformat librsvg - libpng = libpng12; - }; + gegl = callPackage ../development/libraries/gegl { }; geoclue = callPackage ../development/libraries/geoclue {}; @@ -4677,15 +5782,20 @@ let geos = callPackage ../development/libraries/geos { }; - gettext = gettext_0_18; + getdata = callPackage ../development/libraries/getdata { }; + + gettext = gettext_0_19; gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { }; - gettext_0_18 = callPackage ../development/libraries/gettext { }; + gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { }; + gettext_0_19 = callPackage ../development/libraries/gettext { }; gd = callPackage ../development/libraries/gd { }; gdal = callPackage ../development/libraries/gdal { }; + gdcm = callPackage ../development/libraries/gdcm { }; + ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; giblib = callPackage ../development/libraries/giblib { }; @@ -4698,7 +5808,7 @@ let glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc = callPackage ../development/libraries/glibc/2.19 { + glibc = callPackage ../development/libraries/glibc { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; @@ -4706,13 +5816,13 @@ let gccCross = null; }; - glibc_memusage = callPackage ../development/libraries/glibc/2.19 { + glibc_memusage = callPackage ../development/libraries/glibc { kernelHeaders = linuxHeaders; installLocales = false; withGd = true; }; - glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19) + glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc) (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; in { inherit stdenv fetchurl; @@ -4735,21 +5845,18 @@ let libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; - eglibc = callPackage ../development/libraries/eglibc { - kernelHeaders = linuxHeaders; - installLocales = config.glibc.locales or false; - }; + # Only supported on Linux + glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; - glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { }; + glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; - glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { }; - - glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix { + glibc_multi = callPackage ../development/libraries/glibc/multi.nix { inherit glibc; glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc; }; glm = callPackage ../development/libraries/glm { }; + glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; glog = callPackage ../development/libraries/glog { }; @@ -4758,25 +5865,21 @@ let glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; + inherit (ocamlPackages) lablgl findlib ocaml_mysql mlgmp; libpng = libpng12; giflib = giflib_4_1; + camlimages = ocamlPackages.camlimages_4_0; }; gmime = callPackage ../development/libraries/gmime { }; gmm = callPackage ../development/libraries/gmm { }; + gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions + gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; 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 { }; - - gmp51 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr/default.nix { }; @@ -4789,7 +5892,7 @@ let gperftools = callPackage ../development/libraries/gperftools { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; }); + callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; }); }); gst_all = { @@ -4829,21 +5932,27 @@ let qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; + qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;}; + gnet = callPackage ../development/libraries/gnet { }; gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = gnutls32; + gnutls = gnutls33; - gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { + gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { guileBindings = config.gnutls.guile or false; + nettle = nettle27; }; - gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { + gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { guileBindings = config.gnutls.guile or false; + nettle = nettle27; }; - gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); + gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; }); + + gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; @@ -4899,12 +6008,11 @@ let pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { - # workaround signal 10 in gdk_pixbuf tests - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + + gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; + + granite = callPackage ../development/libraries/granite { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; @@ -4918,30 +6026,21 @@ let gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; - gtksharp1 = callPackage ../development/libraries/gtk-sharp-1 { - inherit (gnome) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; - - gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 { + gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf gnomepanel; }; - gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp { - inherit (gnome) gtksourceview; - gtksharp = gtksharp2; - }; - gtkspell = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; + gtkspellmm = callPackage ../development/libraries/gtkspellmm { }; + gts = callPackage ../development/libraries/gts { }; gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; @@ -4951,26 +6050,52 @@ let hamlib = callPackage ../development/libraries/hamlib { }; # TODO : Add MIT Kerberos and let admin choose. - kerberos = heimdal; + # TODO : Fix kerberos on Darwin + kerberos = if stdenv.isDarwin then null else heimdal; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { + openldap = openldap.override { + cyrus_sasl = cyrus_sasl.override { kerberos = null; }; + }; + cyrus_sasl = cyrus_sasl.override { kerberos = null; }; + }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; + harfbuzz-icu = callPackage ../development/libraries/harfbuzz { + withIcu = true; + withGraphite2 = true; + }; hawknl = callPackage ../development/libraries/hawknl { }; herqq = callPackage ../development/libraries/herqq { }; + hidapi = callPackage ../development/libraries/hidapi { + libusb = libusb1; + }; + + hiredis = callPackage ../development/libraries/hiredis { }; + + hivex = callPackage ../development/libraries/hivex { + inherit (perlPackages) IOStringy; + }; + hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; hsqldb = callPackage ../development/libraries/java/hsqldb { }; + hstr = callPackage ../applications/misc/hstr { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; + hunspellDicts = recurseIntoAttrs (import ../development/libraries/hunspell/dictionaries.nix { + inherit stdenv fetchurl unzip; + }); + hwloc = callPackage ../development/libraries/hwloc { inherit (xlibs) libX11; }; @@ -4995,6 +6120,8 @@ let imlib2 = callPackage ../development/libraries/imlib2 { }; + ijs = callPackage ../development/libraries/ijs { }; + incrtcl = callPackage ../development/libraries/incrtcl { }; indilib = callPackage ../development/libraries/indilib { }; @@ -5021,10 +6148,16 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jbigkit = callPackage ../development/libraries/jbigkit { }; + + jemalloc = callPackage ../development/libraries/jemalloc { }; + jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; jetty_util = callPackage ../development/libraries/java/jetty-util { }; + jshon = callPackage ../development/tools/parsing/jshon { }; + json_glib = callPackage ../development/libraries/json-glib { }; json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable @@ -5043,10 +6176,21 @@ let keybinder3 = callPackage ../development/libraries/keybinder3 { automake = automake111x; - lua = lua5_1; }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; + kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { }); + kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { }); + kf5_latest = kf59; + kf5_stable = kf57; + + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { + openldap = openldap.override { + cyrus_sasl = cyrus_sasl.override { kerberos = null; }; + }; + inherit (darwin) bootstrap_cmds; + }; + + LASzip = callPackage ../development/libraries/LASzip { }; lcms = lcms1; @@ -5054,7 +6198,13 @@ let lcms2 = callPackage ../development/libraries/lcms2 { }; - lensfun = callPackage ../development/libraries/lensfun { }; + ldb = callPackage ../development/libraries/ldb { + python = python2; + }; + + lensfun = callPackage ../development/libraries/lensfun { + inherit gnumake3; + }; lesstif = callPackage ../development/libraries/lesstif { }; @@ -5068,10 +6218,6 @@ let libpng = libpng12; }; - lgi = callPackage ../development/libraries/lgi { - lua = lua5_1; - }; - lib3ds = callPackage ../development/libraries/lib3ds { }; libaacs = callPackage ../development/libraries/libaacs { }; @@ -5082,21 +6228,27 @@ let usePulseAudio = config.pulseaudio or true; }; + libantlr3c = callPackage ../development/libraries/libantlr3c {}; + libarchive = callPackage ../development/libraries/libarchive { }; + libasr = callPackage ../development/libraries/libasr { }; + libass = callPackage ../development/libraries/libass { }; libassuan1 = callPackage ../development/libraries/libassuan1 { }; libassuan = callPackage ../development/libraries/libassuan { }; - libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; + libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { + automake = automake112x; # fails with 13 and 14 + }; libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; - libav = libav_10; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_9 libav_10; + inherit (libav_all) libav_0_8 libav_9 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -5114,6 +6266,8 @@ let then libcanberra.override { gtk = null; } else libcanberra; + libcec = callPackage ../development/libraries/libcec { }; + libcello = callPackage ../development/libraries/libcello {}; libcdaudio = callPackage ../development/libraries/libcdaudio { }; @@ -5129,10 +6283,16 @@ let inherit (gnome) libsoup; }; - libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {}; + libchardet = callPackage ../development/libraries/libchardet { }; + + libuchardet = callPackage ../development/libraries/libuchardet { }; libchop = callPackage ../development/libraries/libchop { }; + libclc = callPackage ../development/libraries/libclc { }; + + libcli = callPackage ../development/libraries/libcli { }; + libcm = callPackage ../development/libraries/libcm { }; inherit (gnome3) libcroco; @@ -5143,6 +6303,10 @@ let libctemplate = callPackage ../development/libraries/libctemplate { }; + libctemplate_2_2 = callPackage ../development/libraries/libctemplate/2.2.nix { }; + + libcouchbase = callPackage ../development/libraries/libcouchbase { }; + libcue = callPackage ../development/libraries/libcue { }; libdaemon = callPackage ../development/libraries/libdaemon { }; @@ -5159,6 +6323,7 @@ let }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; + libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { }; libdc1394 = callPackage ../development/libraries/libdc1394 { }; @@ -5166,6 +6331,11 @@ let libdevil = callPackage ../development/libraries/libdevil { }; + libdevil-nox = libdevil.override { + libX11 = null; + mesa = null; + }; + libdiscid = callPackage ../development/libraries/libdiscid { }; libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; @@ -5200,7 +6370,22 @@ let libelf = callPackage ../development/libraries/libelf { }; + libetpan = callPackage ../development/libraries/libetpan { }; + + libfaketime = callPackage ../development/libraries/libfaketime { }; + + libfakekey = callPackage ../development/libraries/libfakekey { + inherit (xlibs) libX11 libXi xextproto; + }; + libfm = callPackage ../development/libraries/libfm { }; + libfm-extra = callPackage ../development/libraries/libfm { + extraOnly = true; + }; + + libfprint = callPackage ../development/libraries/libfprint { }; + + libfpx = callPackage ../development/libraries/libfpx { }; libgadu = callPackage ../development/libraries/libgadu { }; @@ -5221,6 +6406,8 @@ let libgtop = callPackage ../development/libraries/libgtop {}; + libLAS = callPackage ../development/libraries/libLAS { }; + liblo = callPackage ../development/libraries/liblo { }; liblrdf = librdf; @@ -5228,9 +6415,10 @@ 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 { }; + libechonest = callPackage ../development/libraries/libechonest { }; + + libev = callPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; libevent = callPackage ../development/libraries/libevent { }; @@ -5261,6 +6449,8 @@ let libffi = callPackage ../development/libraries/libffi { }; + libfreefare = callPackage ../development/libraries/libfreefare { }; + libftdi = callPackage ../development/libraries/libftdi { }; libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; @@ -5277,14 +6467,24 @@ let libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; - libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { }; - libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; }; + libgsystem = callPackage ../development/libraries/libgsystem { }; + + libguestfs = callPackage ../development/libraries/libguestfs { + inherit (perlPackages) libintlperl GetoptLong SysVirt; + }; + libharu = callPackage ../development/libraries/libharu { }; + libHX = callPackage ../development/libraries/libHX { }; + + libibmad = callPackage ../development/libraries/libibmad { }; + + libibumad = callPackage ../development/libraries/libibumad { }; + libical = callPackage ../development/libraries/libical { }; libicns = callPackage ../development/libraries/libicns { }; @@ -5307,8 +6507,14 @@ let liblogging = callPackage ../development/libraries/liblogging { }; + liblognorm = callPackage ../development/libraries/liblognorm { }; + + libltc = callPackage ../development/libraries/libltc { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmodbus = callPackage ../development/libraries/libmodbus {}; @@ -5316,9 +6522,12 @@ let libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libnatspec = callPackage ../development/libraries/libnatspec { }; + libndp = callPackage ../development/libraries/libndp { }; + libnfc = callPackage ../development/libraries/libnfc { }; libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; @@ -5334,6 +6543,8 @@ let libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; + librelp = callPackage ../development/libraries/librelp { }; + libresample = callPackage ../development/libraries/libresample {}; librevenge = callPackage ../development/libraries/librevenge {}; @@ -5342,23 +6553,18 @@ let libsamplerate = callPackage ../development/libraries/libsamplerate { }; + libsieve = callPackage ../development/libraries/libsieve { }; + libspectre = callPackage ../development/libraries/libspectre { }; libgsf = callPackage ../development/libraries/libgsf { }; - libiconv = callPackage ../development/libraries/libiconv { }; - - libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv]; - - libiconvOrNull = - if gcc.libc or null != null || stdenv.isGlibc - then null - else libiconv; + # glibc provides libiconv so systems with glibc don't need to build libiconv + # separately, but we also provide libiconvReal, which will always be a + # standalone libiconv, just in case you want it + libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; - # 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; + libiconvReal = callPackage ../development/libraries/libiconv { }; # On non-GNU systems we need GNU Gettext for libintl. libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; @@ -5373,6 +6579,10 @@ let inherit (gnome) gtkdoc; }; + libinput = callPackage ../development/libraries/libinput { + graphviz = graphviz-nox; + }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; @@ -5385,10 +6595,14 @@ let libtool = libtool_1_5; }; + libjreen = callPackage ../development/libraries/libjreen { }; + libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; libkate = callPackage ../development/libraries/libkate { }; + libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + libksba = callPackage ../development/libraries/libksba { }; libmad = callPackage ../development/libraries/libmad { }; @@ -5405,12 +6619,7 @@ let libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; - libmikmod = callPackage ../development/libraries/libmikmod { - # resolve the "stray '@' in program" errors - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + libmikmod = callPackage ../development/libraries/libmikmod { }; libmilter = callPackage ../development/libraries/libmilter { }; @@ -5447,7 +6656,6 @@ let libmusicbrainz = libmusicbrainz3; libmwaw = callPackage ../development/libraries/libmwaw { }; - libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { }; libmx = callPackage ../development/libraries/libmx { }; @@ -5455,6 +6663,10 @@ let libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; + libnetfilter_cthelper = callPackage ../development/libraries/libnetfilter_cthelper { }; + + libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { }; + libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { }; libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; @@ -5479,6 +6691,8 @@ let liboil = callPackage ../development/libraries/liboil { }; + libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { }; + liboop = callPackage ../development/libraries/liboop { }; libopus = callPackage ../development/libraries/libopus { }; @@ -5489,6 +6703,8 @@ let libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libosmpbf = callPackage ../development/libraries/libosmpbf {}; + libotr = callPackage ../development/libraries/libotr { libgcrypt = libgcrypt_1_6; }; @@ -5503,6 +6719,8 @@ let libpipeline = callPackage ../development/libraries/libpipeline { }; + libpgf = callPackage ../development/libraries/libpgf { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; @@ -5510,21 +6728,23 @@ let libpaper = callPackage ../development/libraries/libpaper { }; + libpfm = callPackage ../development/libraries/libpfm { }; + libproxy = callPackage ../development/libraries/libproxy { stdenv = if stdenv.isDarwin - then overrideGCC stdenv gcc + then overrideCC stdenv gcc else stdenv; }; libpseudo = callPackage ../development/libraries/libpseudo { }; + libpst = callPackage ../development/libraries/libpst { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { - gtk2 = null; gtk3 = null; # neither gtk version by default - }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; @@ -5551,10 +6771,16 @@ let libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libstrophe = callPackage ../development/libraries/libstrophe { }; + libspatialindex = callPackage ../development/libraries/libspatialindex { }; libspatialite = callPackage ../development/libraries/libspatialite { }; + libstatgrab = callPackage ../development/libraries/libstatgrab { }; + + libsvm = callPackage ../development/libraries/libsvm { }; + libtar = callPackage ../development/libraries/libtar { }; libtasn1 = callPackage ../development/libraries/libtasn1 { }; @@ -5567,7 +6793,11 @@ let libtommath = callPackage ../development/libraries/libtommath { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { + libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; + + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + + libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { # fix "unrecognized option -arch" error stdenv = if stdenv.isDarwin then clangStdenv @@ -5586,35 +6816,45 @@ let libgeotiff = callPackage ../development/libraries/libgeotiff { }; + libu2f-host = callPackage ../development/libraries/libu2f-host { }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; - giflib = callPackage ../development/libraries/giflib { }; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; + giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; + giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { }; libunibreak = callPackage ../development/libraries/libunibreak { }; libunique = callPackage ../development/libraries/libunique/default.nix { }; + libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome) gtkdoc; }; liburcu = callPackage ../development/libraries/liburcu { }; libusb = callPackage ../development/libraries/libusb {}; - libusb1 = callPackage ../development/libraries/libusb1 { - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + libusb1 = callPackage ../development/libraries/libusb1 { }; + + libunwind = if stdenv.isDarwin + then callPackage ../development/libraries/libunwind/native.nix {} + else callPackage ../development/libraries/libunwind { }; - libunwind = callPackage ../development/libraries/libunwind { }; + libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; - libuvVersions = callPackage ../development/libraries/libuv { }; + libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { + automake = automake113x; # fails with 14 + }); libv4l = lowPrio (v4l_utils.override { - withQt4 = false; + alsaLib = null; + libX11 = null; + qt4 = null; + qt5 = null; }); libva = callPackage ../development/libraries/libva { }; @@ -5633,7 +6873,8 @@ let libviper = callPackage ../development/libraries/libviper { }; - libvpx = callPackage ../development/libraries/libvpx { }; + libvpx = if stdenv.isDarwin then libvpx-git else callPackage ../development/libraries/libvpx { }; + libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; @@ -5661,6 +6902,8 @@ let libxklavier = callPackage ../development/libraries/libxklavier { }; + libxls = callPackage ../development/libraries/libxls { }; + libxmi = callPackage ../development/libraries/libxmi { }; libxml2 = callPackage ../development/libraries/libxml2 { @@ -5684,18 +6927,18 @@ let libyaml = callPackage ../development/libraries/libyaml { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { }; - libyubikey = callPackage ../development/libraries/libyubikey {}; + libykneomgr = callPackage ../development/libraries/libykneomgr { }; + + libyubikey = callPackage ../development/libraries/libyubikey { }; + + libzen = callPackage ../development/libraries/libzen { }; 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 { }; @@ -5703,6 +6946,8 @@ let lirc = callPackage ../development/libraries/lirc { }; + liquidfun = callPackage ../development/libraries/liquidfun { }; + liquidwar = builderDefsPackage ../games/liquidwar { inherit (xlibs) xproto libX11 libXrender; inherit gmp mesa libjpeg @@ -5723,8 +6968,16 @@ let loudmouth = callPackage ../development/libraries/loudmouth { }; + luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; + + luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; + lzo = callPackage ../development/libraries/lzo { }; + matio = callPackage ../development/libraries/matio { }; + + mbedtls = callPackage ../development/libraries/mbedtls { }; + mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds = callPackage ../development/libraries/mdds { }; @@ -5742,6 +6995,8 @@ let # 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; + libva = libva.override { mesa = null; }; + llvmPackages = llvmPackages_36; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( @@ -5779,23 +7034,31 @@ let minmay = callPackage ../development/libraries/minmay { }; miro = callPackage ../applications/video/miro { - inherit (pythonPackages) pywebkitgtk pysqlite pycurl mutagen; + inherit (pythonPackages) pywebkitgtk pycurl mutagen; + avahi = avahi.override { + withLibdnssdCompat = true; + }; }; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; + mkvtoolnix-cli = mkvtoolnix.override { + withGUI = false; + wxGTK = null; + }; + 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 { }; + mosquitto = callPackage ../servers/mqtt/mosquitto { }; + mps = callPackage ../development/libraries/mps { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -5806,10 +7069,12 @@ let mp4v2 = callPackage ../development/libraries/mp4v2 { }; - mpc = callPackage ../development/libraries/mpc { }; + libmpc = callPackage ../development/libraries/libmpc { }; mpich2 = callPackage ../development/libraries/mpich2 { }; + mstpd = callPackage ../os-specific/linux/mstpd { }; + mtdev = callPackage ../development/libraries/mtdev { }; mtpfs = callPackage ../tools/filesystems/mtpfs { }; @@ -5845,6 +7110,7 @@ let inherit ncurses flex bison; }; + nettle27 = callPackage ../development/libraries/nettle/27.nix { }; nettle = callPackage ../development/libraries/nettle { }; newt = callPackage ../development/libraries/newt { }; @@ -5857,6 +7123,8 @@ let nss = lowPrio (callPackage ../development/libraries/nss { }); + nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; + nssTools = callPackage ../development/libraries/nss { includeTools = true; }; @@ -5880,6 +7148,8 @@ let openbabel = callPackage ../development/libraries/openbabel { }; + openbr = callPackage ../development/libraries/openbr { }; + opencascade = callPackage ../development/libraries/opencascade { }; opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { @@ -5889,6 +7159,8 @@ let opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencollada = callPackage ../development/libraries/opencollada { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -5900,7 +7172,7 @@ let }; # this ctl version is needed by openexr_viewers - openexr_ctl = callPackage ../development/libraries/openexr_ctl { }; + openexr_ctl = ctl; openexr = callPackage ../development/libraries/openexr { }; @@ -5916,7 +7188,10 @@ let opal = callPackage ../development/libraries/opal {}; - openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; + openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; + openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { }; + openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; + openjpeg = openjpeg_2_1; openscenegraph = callPackage ../development/libraries/openscenegraph { giflib = giflib_4_1; @@ -5937,9 +7212,7 @@ let }; }; - ortp = callPackage ../development/libraries/ortp { - srtp = srtp_linphone; - }; + ortp = callPackage ../development/libraries/ortp { }; p11_kit = callPackage ../development/libraries/p11-kit { }; @@ -5957,42 +7230,69 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - phonon = callPackage ../development/libraries/phonon { }; + phonon = callPackage ../development/libraries/phonon/qt4 {}; + + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {}; + + phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; + + phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { }; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; + phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; - phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { }; + phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; physfs = callPackage ../development/libraries/physfs { }; + pipelight = callPackage ../tools/misc/pipelight { }; + pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; plib = callPackage ../development/libraries/plib { }; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; - podofo = callPackage ../development/libraries/podofo { }; + podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + + poker-eval = callPackage ../development/libraries/poker-eval { }; + + polarssl = mbedtls; polkit = callPackage ../development/libraries/polkit { - spidermonkey = spidermonkey_185; + spidermonkey = spidermonkey_17; }; - polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { }; + polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { + inherit qt4; + }; + + polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { + withQt5 = true; + inherit qt5; + }; policykit = callPackage ../development/libraries/policykit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; - popplerQt4 = poppler.poppler_qt4; - popt = callPackage ../development/libraries/popt { }; + poppler_qt4 = poppler.override { + inherit qt4; + qt4Support = true; + suffix = "qt4"; + }; - portaudio = callPackage ../development/libraries/portaudio { - # resolves a variety of compile-time errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; + poppler_qt5 = poppler.override { + qt5Support = true; + inherit qt5; + suffix = "qt5"; }; + poppler_utils = poppler.override { suffix = "utils"; utils = true; }; + + popt = callPackage ../development/libraries/popt { }; + + portaudio = callPackage ../development/libraries/portaudio { }; + portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; portmidi = callPackage ../development/libraries/portmidi {}; @@ -6003,9 +7303,13 @@ let postgis = callPackage ../development/libraries/postgis { }; - protobuf = callPackage ../development/libraries/protobuf { }; + protobuf = protobuf2_6; + protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; + protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; - protobufc = callPackage ../development/libraries/protobufc { }; + protobufc = protobufc1_1; + protobufc1_1 = callPackage ../development/libraries/protobufc/1.1.nix { }; + protobufc1_0 = callPackage ../development/libraries/protobufc/1.0.nix { }; pth = callPackage ../development/libraries/pth { }; @@ -6013,16 +7317,20 @@ let re2 = callPackage ../development/libraries/re2 { }; - qca2 = callPackage ../development/libraries/qca2 {}; - - qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + qoauth = callPackage ../development/libraries/qoauth { }; + quazip = callPackage ../development/libraries/quazip { + qt = qt5; + }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; libpng = libpng12; @@ -6035,33 +7343,21 @@ let mesa = mesa_noglu; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; - - # resolve unrecognised flag '-fconstant-cfstrings' errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; - qt48Full = qt48.override { + qt48Full = appendToName "full" (qt48.override { 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 { + qt53 = callPackage ../development/libraries/qt-5/5.3 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; # GNOME dependencies are not used unless gtkStyle == true @@ -6069,30 +7365,29 @@ let 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(... - }; + qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {}); + + qt5 = qt54; - qt5Full = qt5.override { + qt5Full = appendToName "full" (qt53.override { buildDocs = true; buildExamples = true; buildTests = true; developerBuild = true; - }; + }); qt5SDK = qtcreator.override { sdkBuild = true; qtLib = qt5Full; + withDocumentation = false; # fails to setup some paths }; qtcreator = callPackage ../development/qtcreator { qtLib = qt48.override { developerBuild = true; }; }; + qtkeychain = callPackage ../development/libraries/qtkeychain { }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -6110,9 +7405,13 @@ let readline = readline6; readline6 = readline63; - readline62 = callPackage ../development/libraries/readline/readline6.nix { }; + readline5 = callPackage ../development/libraries/readline/5.x.nix { }; + + readline62 = callPackage ../development/libraries/readline/6.2.nix { }; + + readline63 = callPackage ../development/libraries/readline/6.3.nix { }; - readline63 = callPackage ../development/libraries/readline/readline6.3.nix { }; + readosm = callPackage ../development/libraries/readosm { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -6124,6 +7423,8 @@ let librdf = callPackage ../development/libraries/librdf { }; + libsmf = callPackage ../development/libraries/audio/libsmf { }; + lilv = callPackage ../development/libraries/audio/lilv { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; @@ -6154,7 +7455,7 @@ let openglSupport = mesaSupported; alsaSupport = (!stdenv.isDarwin); x11Support = true; - pulseaudioSupport = stdenv.isDarwin; # better go through ALSA + pulseaudioSupport = (!stdenv.isDarwin); # resolve the unrecognized -fpascal-strings option error stdenv = if stdenv.isDarwin @@ -6162,17 +7463,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 { - # provide an Objective-C compiler - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + SDL_image = callPackage ../development/libraries/SDL_image { }; SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; @@ -6180,12 +7473,14 @@ let SDL_sound = callPackage ../development/libraries/SDL_sound { }; + SDL_stretch= callPackage ../development/libraries/SDL_stretch { }; + SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { openglSupport = mesaSupported; - alsaSupport = true; - x11Support = true; + alsaSupport = (!stdenv.isDarwin); + x11Support = (!stdenv.isDarwin); pulseaudioSupport = false; # better go through ALSA }; @@ -6197,10 +7492,14 @@ let SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; + SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf {}; + sfsexp = callPackage ../development/libraries/sfsexp {}; + silgraphite = callPackage ../development/libraries/silgraphite {}; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; @@ -6225,6 +7524,8 @@ let snappy = callPackage ../development/libraries/snappy { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; + sodium = callPackage ../development/libraries/sodium {}; sofia_sip = callPackage ../development/libraries/sofia-sip { }; @@ -6235,8 +7536,12 @@ let sord = callPackage ../development/libraries/sord {}; + soundtouch = callPackage ../development/libraries/soundtouch {}; + spandsp = callPackage ../development/libraries/spandsp {}; + spatialite_tools = callPackage ../development/libraries/spatialite-tools { }; + speechd = callPackage ../development/libraries/speechd { }; speech_tools = callPackage ../development/libraries/speech-tools {}; @@ -6245,6 +7550,8 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + sphinxsearch = callPackage ../servers/search/sphinxsearch { }; + spice = callPackage ../development/libraries/spice { celt = celt_0_5_1; inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; @@ -6257,29 +7564,24 @@ let sratom = callPackage ../development/libraries/audio/sratom { }; - srtp = callPackage ../development/libraries/srtp {}; + srm = callPackage ../tools/security/srm { }; - srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; + srtp = callPackage ../development/libraries/srtp { + libpcap = if stdenv.isLinux then libpcap else null; + }; - sqlite = lowPrio (callPackage ../development/libraries/sqlite { - readline = null; - ncurses = null; - }); + stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; - sqliteInteractive = appendToName "interactive" (sqlite.override { - inherit readline ncurses; - }); + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); + + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; ncurses = null; }); - stfl = callPackage ../development/libraries/stfl { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + stfl = callPackage ../development/libraries/stfl { }; stlink = callPackage ../development/tools/misc/stlink { }; @@ -6295,10 +7597,10 @@ let suil = callPackage ../development/libraries/audio/suil { }; - suitesparse = callPackage ../development/libraries/suitesparse { }; - sutils = callPackage ../tools/misc/sutils { }; + svrcore = callPackage ../development/libraries/svrcore { }; + sword = callPackage ../development/libraries/sword { }; szip = callPackage ../development/libraries/szip { }; @@ -6309,7 +7611,9 @@ let taglib_extras = callPackage ../development/libraries/taglib-extras { }; - talloc = callPackage ../development/libraries/talloc { }; + talloc = callPackage ../development/libraries/talloc { + python = python2; + }; tclap = callPackage ../development/libraries/tclap {}; @@ -6319,7 +7623,13 @@ let tcltls = callPackage ../development/libraries/tcltls { }; - tdb = callPackage ../development/libraries/tdb { }; + ntdb = callPackage ../development/libraries/ntdb { + python = python2; + }; + + tdb = callPackage ../development/libraries/tdb { + python = python2; + }; tecla = callPackage ../development/libraries/tecla { }; @@ -6329,6 +7639,10 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; + tevent = callPackage ../development/libraries/tevent { + python = python2; + }; + thrift = callPackage ../development/libraries/thrift { }; tinyxml = tinyxml2; @@ -6339,11 +7653,18 @@ let tnt = callPackage ../development/libraries/tnt { }; + kyotocabinet = callPackage ../development/libraries/kyotocabinet { }; + tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; + tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; tremor = callPackage ../development/libraries/tremor { }; + uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; + + unibilium = callPackage ../development/libraries/unibilium { }; + unicap = callPackage ../development/libraries/unicap {}; tsocks = callPackage ../development/libraries/tsocks { }; @@ -6363,7 +7684,23 @@ let libusb = libusb1; }; - ucommon = callPackage ../development/libraries/ucommon { }; + uthash = callPackage ../development/libraries/uthash { }; + + ucommon = ucommon_openssl; + + ucommon_openssl = callPackage ../development/libraries/ucommon { + gnutls = null; + }; + + ucommon_gnutls = lowPrio (ucommon.override { + openssl = null; + zlib = null; + gnutls = gnutls; + }); + + v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { + inherit (pythonPackages) gyp; + }; v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; @@ -6377,6 +7714,8 @@ let vcdimager = callPackage ../development/libraries/vcdimager { }; + vid-stab = callPackage ../development/libraries/vid-stab { }; + vigra = callPackage ../development/libraries/vigra { inherit (pkgs.pythonPackages) numpy; }; @@ -6395,24 +7734,36 @@ let libpng = libpng12; }; - wayland = callPackage ../development/libraries/wayland { }; + wavpack = callPackage ../development/libraries/wavpack { }; + + wayland = callPackage ../development/libraries/wayland { + graphviz = graphviz-nox; + }; webkit = webkitgtk; webkitgtk = callPackage ../development/libraries/webkitgtk { - harfbuzz = harfbuzz.override { - withIcu = true; - }; + harfbuzz = harfbuzz-icu; + inherit (xorg) libpthreadstubs; + gst-plugins-base = gst_all_1.gst-plugins-base; + }; + + webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.6.nix { + harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk2 = webkitgtk.override { + webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false; }; + websocketpp = callPackage ../development/libraries/websocket++ { }; + wildmidi = callPackage ../development/libraries/wildmidi { }; + wiredtiger = callPackage ../development/libraries/wiredtiger { }; + wvstreams = callPackage ../development/libraries/wvstreams { }; wxGTK = wxGTK28; @@ -6425,27 +7776,21 @@ let wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/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; }; 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 { }; + x265 = callPackage ../development/libraries/x265 { }; + + x265-hg = callPackage ../development/libraries/x265/hg.nix { }; + xapian = callPackage ../development/libraries/xapian { }; xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python @@ -6456,17 +7801,18 @@ let xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix { # TODO perl php Java, tcl, C#, python }; + xavs = callPackage ../development/libraries/xavs { }; + Xaw3d = callPackage ../development/libraries/Xaw3d { }; xbase = callPackage ../development/libraries/xbase { }; - xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; + xcb-util-cursor = xorg.xcbutilcursor; + xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; xdo = callPackage ../tools/misc/xdo { }; - xineLib = callPackage ../development/libraries/xine-lib { - ffmpeg = ffmpeg_1; - }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -6484,12 +7830,24 @@ let xmlsec = callPackage ../development/libraries/xmlsec { }; + xlslib = callPackage ../development/libraries/xlslib { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; xylib = callPackage ../development/libraries/xylib { }; yajl = callPackage ../development/libraries/yajl { }; + yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; + + yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { + libusb = libusb1; + }; + + yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { + qt = qt4; + }; + zangband = builderDefsPackage (import ../games/zangband) { inherit ncurses flex bison autoconf automake m4 coreutils; }; @@ -6507,9 +7865,42 @@ 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 {}; + zeromq = zeromq4; + + cppzmq = callPackage ../development/libraries/cppzmq {}; + + czmq = callPackage ../development/libraries/czmq { }; zziplib = callPackage ../development/libraries/zziplib { }; + ### DEVELOPMENT / LIBRARIES / AGDA + + agda = callPackage ../build-support/agda { + glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; + extension = self : super : { }; + inherit (haskellngPackages) Agda; + inherit writeScriptBin; + }; + + agdaBase = callPackage ../development/libraries/agda/agda-base { }; + + agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; + + agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; + + AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib { + inherit (haskellngPackages) ghcWithPackages; + }; + + AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { }; + + bitvector = callPackage ../development/libraries/agda/bitvector { }; + + categories = callPackage ../development/libraries/agda/categories { }; + + pretty = callPackage ../development/libraries/agda/pretty { }; + + TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { }; ### DEVELOPMENT / LIBRARIES / JAVA @@ -6517,7 +7908,21 @@ let stdenv = overrideInStdenv stdenv [gnumake380]; }; - commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { }; + commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; + + commonsBsf = callPackage ../development/libraries/java/commons/bsf { }; + + commonsCompress = callPackage ../development/libraries/java/commons/compress { }; + + commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { }; + + commonsLang = callPackage ../development/libraries/java/commons/lang { }; + + commonsLogging = callPackage ../development/libraries/java/commons/logging { }; + + commonsIo = callPackage ../development/libraries/java/commons/io { }; + + commonsMath = callPackage ../development/libraries/java/commons/math { }; fastjar = callPackage ../development/tools/java/fastjar { }; @@ -6527,12 +7932,6 @@ let gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - jakartabcel = callPackage ../development/libraries/java/jakarta-bcel { - regexp = jakartaregexp; - }; - - jakartaregexp = callPackage ../development/libraries/java/jakarta-regexp { }; - javaCup = callPackage ../development/libraries/java/cup { }; javasvn = callPackage ../development/libraries/java/javasvn { }; @@ -6555,6 +7954,8 @@ let lucene = callPackage ../development/libraries/java/lucene { }; + lucenepp = callPackage ../development/libraries/lucene++ { }; + mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxon = callPackage ../development/libraries/java/saxon { }; @@ -6574,10 +7975,32 @@ let ### DEVELOPMENT / LIBRARIES / JAVASCRIPT - jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + jquery = callPackage ../development/libraries/javascript/jquery { }; + + jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { }; yuicompressor = callPackage ../development/tools/yuicompressor { }; + ### DEVELOPMENT / GO MODULES + + go13Packages = recurseIntoAttrs (callPackage ./go-packages.nix { + go = go_1_3; + buildGoPackage = import ../development/go-modules/generic { + go = go_1_3; + }; + overrides = (config.goPackageOverrides or (p: {})) pkgs; + }); + + go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix { + go = go_1_4; + buildGoPackage = import ../development/go-modules/generic { + go = go_1_4; + }; + overrides = (config.goPackageOverrides or (p: {})) pkgs; + }); + + goPackages = go14Packages; + ### DEVELOPMENT / LISP MODULES asdf = callPackage ../development/lisp-modules/asdf { @@ -6606,14 +8029,6 @@ let overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); - perl514Packages = import ./perl-packages.nix { - pkgs = pkgs // { - perl = perl514; - buildPerlPackage = import ../development/perl-modules/generic perl514; - }; - overrides = (config.perl514PackageOverrides or (p: {})) pkgs; - }; - perlXMLParser = perlPackages.XMLParser; ack = perlPackages.ack; @@ -6624,6 +8039,12 @@ let planetary_annihilation = callPackage ../games/planetaryannihilation { }; + sqitchPg = callPackage ../development/tools/misc/sqitch { + inherit stdenv perl makeWrapper; + name = "sqitch-pg"; + databaseModule = perlPackages.DBDPg; + sqitchModule = perlPackages.AppSqitch; + }; ### DEVELOPMENT / PYTHON MODULES @@ -6634,34 +8055,34 @@ let # 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; + python26Packages = callPackage ./python-packages.nix { python = python26; + self = python26Packages; }; - python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix { python = python27; + self = python27Packages; })); - python32Packages = import ./python-packages.nix { - inherit pkgs; + python32Packages = callPackage ./python-packages.nix { python = python32; + self = python32Packages; }; - python33Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + python33Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python33; + self = python33Packages; }); - python34Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python34; + self = python34Packages; }); - pypyPackages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; + pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix { python = pypy; + self = pypyPackages; }); foursuite = callPackage ../development/python-modules/4suite { }; @@ -6694,23 +8115,17 @@ let pygtk = pythonPackages.pygtk; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + pyGtkGlade = pythonPackages.pyGtkGlade; pylint = callPackage ../development/python-modules/pylint { }; - pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { - inherit python openssl; - }; + pyopenssl = pythonPackages.pyopenssl; rhpl = callPackage ../development/python-modules/rhpl { }; - sip = callPackage ../development/python-modules/sip { }; - - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; @@ -6748,24 +8163,27 @@ let }; 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 ]; + recommendedPackages = with rPackages; [ + boot class cluster codetools foreign KernSmooth lattice MASS + Matrix mgcv nlme nnet rpart spatial survival + ]; # Override this attribute to register additional libraries. packages = []; }; - rPackages = import ../development/r-modules/cran-packages.nix { - inherit pkgs; + rPackages = callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (p: {})) pkgs; }; ### SERVERS + "389-ds-base" = callPackage ../servers/ldap/389 { + kerberos = krb5; + }; + rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_2; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -6775,6 +8193,38 @@ let sslSupport = true; }); + apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { + inherit apacheHttpd; + + mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; + + mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + + mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; + + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + + mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + + php = pkgs.php.override { inherit apacheHttpd; }; + + subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; + }; + + apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; + apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2; + apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + + cadvisor = callPackage ../servers/monitoring/cadvisor { }; + + cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; + cassandra = cassandra_2_1; + + apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { + java = jdk; + }; + apcupsd = callPackage ../servers/apcupsd { }; sabnzbd = callPackage ../servers/sabnzbd { }; @@ -6783,6 +8233,9 @@ let bird = callPackage ../servers/bird { }; + bosun = callPackage ../servers/monitoring/bosun {}; + scollector = callPackage ../servers/monitoring/bosun/scollector.nix {}; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; python = python27; @@ -6808,7 +8261,7 @@ let dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; - diod = callPackage ../servers/diod { }; + diod = callPackage ../servers/diod { lua = lua5_1; }; dovecot = dovecot21; @@ -6824,10 +8277,17 @@ let erlang = erlangR16; }; + prosody = callPackage ../servers/xmpp/prosody { + lua5 = lua5_1; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; + }; + elasticmq = callPackage ../servers/elasticmq { }; etcdctl = callPackage ../development/tools/etcdctl { }; + exim = callPackage ../servers/mail/exim { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -6845,9 +8305,7 @@ let freeswitch = callPackage ../servers/sip/freeswitch { }; - ghostOne = callPackage ../servers/games/ghost-one { - boost = boost144.override { taggedLayout = true; }; - }; + ghostOne = callPackage ../servers/games/ghost-one { }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -6859,27 +8317,32 @@ let jetty61 = callPackage ../servers/http/jetty/6.1 { }; + jetty92 = callPackage ../servers/http/jetty/9.2.nix { }; + joseki = callPackage ../servers/http/joseki {}; + rdkafka = callPackage ../development/libraries/rdkafka { }; + leafnode = callPackage ../servers/news/leafnode { }; lighttpd = callPackage ../servers/http/lighttpd { }; - mailman = callPackage ../servers/mail/mailman { }; + mailman = callPackage ../servers/mail/mailman { + dnspython = pythonPackages.dns; + }; - mediatomb = callPackage ../servers/mediatomb { }; + mediatomb = callPackage ../servers/mediatomb { + spidermonkey = spidermonkey_185; + }; 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 { }; - - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - - mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + # Backwards compatibility. + mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; + mod_evasive = pkgs.apacheHttpdPackages.mod_evasive; + mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; + mod_python = pkgs.apacheHttpdPackages.mod_python; + mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; mpd = callPackage ../servers/mpd { aacSupport = config.mpd.aacSupport or true; @@ -6888,6 +8351,8 @@ let mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + mpdscribble = callPackage ../tools/misc/mpdscribble { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; @@ -6897,7 +8362,12 @@ let nginx = callPackage ../servers/http/nginx { rtmp = true; fullWebDAV = true; - syslog = true; + syslog = false; # the patch is not found + moreheaders = true; + }; + nginxUnstable = callPackage ../servers/http/nginx/unstable.nix { + fullWebDAV = true; + syslog = false; # the patch is not found moreheaders = true; }; @@ -6905,7 +8375,7 @@ let nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; - nsd = callPackage ../servers/dns/nsd { }; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); nsq = callPackage ../servers/nsq { }; @@ -6913,14 +8383,22 @@ let opensmtpd = callPackage ../servers/mail/opensmtpd { }; + osrm-backend = callPackage ../servers/osrm-backend { }; + + osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; }; + petidomo = callPackage ../servers/mail/petidomo { }; popa3d = callPackage ../servers/mail/popa3d { }; - postfix = callPackage ../servers/mail/postfix { }; + postfix28 = callPackage ../servers/mail/postfix { }; postfix211 = callPackage ../servers/mail/postfix/2.11.nix { }; + postfix = postfix211; + + pshs = callPackage ../servers/http/pshs { }; + pulseaudio = callPackage ../servers/pulseaudio { gconf = gnome.GConf; # The following are disabled in the default build, because if this @@ -6929,11 +8407,13 @@ let bluez = null; avahi = null; }; + pulseaudioFull = pulseaudio.override { bluez = bluez5; avahi = avahi; jackaudioSupport = true; x11Support = true; + useSystemd = stdenv.isLinux; }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -6948,12 +8428,18 @@ let mariadb = callPackage ../servers/sql/mariadb {}; - mongodb = callPackage ../servers/nosql/mongodb { }; + mongodb = callPackage ../servers/nosql/mongodb { + sasl = cyrus_sasl; + }; riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; influxdb = callPackage ../servers/nosql/influxdb { }; + influxdb-backup = callPackage ../servers/nosql/influxdb/backup.nix { }; + + hyperdex = callPackage ../servers/nosql/hyperdex { }; + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ @@ -6961,7 +8447,7 @@ let mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; - mysql = mysql51; + mysql = mariadb; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -6975,7 +8461,10 @@ let net_snmp = callPackage ../servers/monitoring/net-snmp { }; + newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; + riemann = callPackage ../servers/monitoring/riemann { }; + riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; oidentd = callPackage ../servers/identd/oidentd { }; @@ -6983,7 +8472,20 @@ let oracleXE = callPackage ../servers/sql/oracle-xe { }; - OVMF = callPackage ../applications/virtualization/OVMF { }; + OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; }; + OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; }; + #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; + + seabios = callPackage ../applications/virtualization/seabios { }; + + pgpool92 = pgpool.override { postgresql = postgresql92; }; + pgpool93 = pgpool.override { postgresql = postgresql93; }; + pgpool94 = pgpool.override { postgresql = postgresql94; }; + + pgpool = callPackage ../servers/sql/pgpool/default.nix { + pam = if stdenv.isLinux then pam else null; + libmemcached = null; # Detection is broken upstream + }; postgresql = postgresql92; @@ -6997,8 +8499,26 @@ let postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; + postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus-alertmanager = + callPackage ../servers/monitoring/prometheus/alertmanager { }; + prometheus-cli = + callPackage ../servers/monitoring/prometheus/cli { }; + prometheus-haproxy-exporter = + callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; + prometheus-mesos-exporter = + callPackage ../servers/monitoring/prometheus/mesos_exporter { }; + prometheus-node-exporter = + callPackage ../servers/monitoring/prometheus/node_exporter { }; + prometheus-pushgateway = + callPackage ../servers/monitoring/prometheus/pushgateway { }; + prometheus-statsd-bridge = + callPackage ../servers/monitoring/prometheus/statsd_bridge { }; + psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) { @@ -7016,14 +8536,21 @@ let radius = callPackage ../servers/radius { }; redis = callPackage ../servers/nosql/redis { }; + redis3 = callPackage ../servers/nosql/redis/3.0.nix { }; redstore = callPackage ../servers/http/redstore { }; restund = callPackage ../servers/restund {}; - rethinkdb = callPackage ../servers/nosql/rethinkdb { }; + rethinkdb = callPackage ../servers/nosql/rethinkdb { + boost = boost155; + }; + + rippled = callPackage ../servers/rippled { + boost = boost155; + }; - rippled = callPackage ../servers/rippled { }; + ripple-data-api = callPackage ../servers/rippled/data-api.nix { }; s6 = callPackage ../servers/s6 { }; @@ -7032,10 +8559,30 @@ let HTTPDate MailDKIM LWP IOSocketSSL; }; - samba = callPackage ../servers/samba { }; + samba3 = callPackage ../servers/samba/3.x.nix { }; + + samba4 = callPackage ../servers/samba/4.x.nix { + python = python2; + pythonPackages = python2Packages; + kerberos = heimdal; + libgcrypt = libgcrypt_1_6; + cups = if stdenv.isDarwin then null else cups; + pam = if stdenv.isDarwin then null else pam; + libaio = if stdenv.isDarwin then null else libaio; + ceph = if stdenv.isDarwin then null else ceph; + glusterfs = if stdenv.isDarwin then null else glusterfs; + dbus = if stdenv.isLinux then dbus else null; + libibverbs = if stdenv.isLinux then libibverbs else null; + librdmacm = if stdenv.isLinux then librdmacm else null; + systemd = if stdenv.isLinux then systemd else null; + }; - # A lightweight Samba, useful for non-Linux-based OSes. - samba_light = lowPrio (callPackage ../servers/samba { + samba = samba4; + + smbclient = samba; + + # A lightweight Samba 3, useful for non-Linux-based OSes. + samba3_light = lowPrio (samba3.override { pam = null; fam = null; cups = null; @@ -7045,12 +8592,50 @@ let libunwind = null; }); + samba4_light = lowPrio (samba4.override { + # source3/wscript optionals + kerberos = null; + zlib = null; + openldap = null; + cups = null; + pam = null; + avahi = null; + acl = null; + libaio = null; + fam = null; + ceph = null; + glusterfs = null; + + # buildtools/wafsamba/wscript optionals + libiconv = null; + gettext = null; + + # source4/lib/tls/wscript optionals + gnutls = null; + libgcrypt = null; + libgpgerror = null; + + # other optionals + ncurses = null; + libunwind = null; + dbus = null; + libibverbs = null; + librdmacm = null; + systemd = null; + }); + + samba_light = samba4_light; + serfdom = callPackage ../servers/serfdom { }; seyren = callPackage ../servers/monitoring/seyren { }; + sensu = callPackage ../servers/monitoring/sensu { }; + shishi = callPackage ../servers/shishi { }; + sipcmd = callPackage ../applications/networking/sipcmd { }; + sipwitch = callPackage ../servers/sip/sipwitch { }; spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; @@ -7062,16 +8647,26 @@ let }); squid = squids.squid31; # has ipv6 support + sslh = callPackage ../servers/sslh { }; + thttpd = callPackage ../servers/http/thttpd { }; storm = callPackage ../servers/computing/storm { }; + slurm-llnl = callPackage ../servers/computing/slurm { }; + tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; + tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { }; + + tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { }; + tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; + torque = callPackage ../servers/computing/torque { }; + axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; @@ -7090,25 +8685,28 @@ let zookeeper = callPackage ../servers/zookeeper { }; + zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; + xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol - dbus libuuid openssl gperf m4 + dbus libuuid openssl gperf m4 libevdev tradcpp libinput autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; + bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; 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 { }; xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { }; + xwayland = with xorg; callPackage ../servers/x11/xorg/xwayland.nix { }; + yaws = callPackage ../servers/http/yaws { }; zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix { @@ -7123,13 +8721,11 @@ let afuse = callPackage ../os-specific/linux/afuse { }; - amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { }; - autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; _915resolution = callPackage ../os-specific/linux/915resolution { }; - nfsUtils = callPackage ../os-specific/linux/nfs-utils { }; + nfs-utils = callPackage ../os-specific/linux/nfs-utils { }; acpi = callPackage ../os-specific/linux/acpi { }; @@ -7137,8 +8733,12 @@ let acpitool = callPackage ../os-specific/linux/acpitool { }; + alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; + alienfx = callPackage ../os-specific/linux/alienfx { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; + alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { @@ -7150,15 +8750,23 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; - microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { }; + microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; apparmor = callPackage ../os-specific/linux/apparmor { inherit (perlPackages) LocaleGettext TermReadKey RpcXML; bison = bison2; + perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; + apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { swig = swig2; }; + libapparmor = apparmor_2_9.libapparmor; + apparmor-pam = apparmor_2_9.apparmor-pam; + apparmor-parser = apparmor_2_9.apparmor-parser; + apparmor-profiles = apparmor_2_9.apparmor-profiles; + apparmor-utils = apparmor_2_9.apparmor-utils; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -7175,32 +8783,32 @@ let bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); + # Needed for LibreOffice + bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); + bluez = bluez4; inherit (pythonPackages) bedup; beret = callPackage ../games/beret { }; - bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; + bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; + cgmanager = callPackage ../os-specific/linux/cgmanager { }; + 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 { - 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; - }; + conky = callPackage ../os-specific/linux/conky ({ + lua = lua5_1; # conky can use 5.2, but toluapp can not + } // config.conky or {}); + + conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -7208,16 +8816,23 @@ let criu = callPackage ../os-specific/linux/criu { }; - cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { + libgcrypt = libgcrypt_1_6; + }; cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; - darwin = rec { - cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port { + darwin = let + cmdline = callPackage ../os-specific/darwin/command-line-tools {}; + apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; }; + in apple-source-releases // rec { + cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { cross = assert crossSystem != null; crossSystem; inherit maloader; xctoolchain = xcode.toolchain; - }); + }; + + cctools = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; maloader = callPackage ../os-specific/darwin/maloader { inherit opencflite; @@ -7226,6 +8841,18 @@ let opencflite = callPackage ../os-specific/darwin/opencflite {}; xcode = callPackage ../os-specific/darwin/xcode {}; + + osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; + osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { inherit osx_sdk; }; + + ps = callPackage ../os-specific/darwin/adv_cmds/ps.nix {}; + + security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; }; + + cmdline_sdk = cmdline.sdk; + cmdline_tools = cmdline.tools; + + libobjc = apple-source-releases.objc4; }; devicemapper = lvm2; @@ -7243,7 +8870,9 @@ let inherit (xlibs) xproto; }; - dmraid = callPackage ../os-specific/linux/dmraid { }; + dmraid = callPackage ../os-specific/linux/dmraid { + devicemapper = devicemapper.override {enable_dmeventd = true;}; + }; drbd = callPackage ../os-specific/linux/drbd { }; @@ -7274,18 +8903,26 @@ let then e2fsprogs else null; + light = callPackage ../os-specific/linux/light { }; + + lightum = callPackage ../os-specific/linux/lightum { }; + e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; ebtables = callPackage ../os-specific/linux/ebtables { }; eject = utillinux; + fatrace = callPackage ../os-specific/linux/fatrace { }; + ffado = callPackage ../os-specific/linux/ffado { }; fbterm = callPackage ../os-specific/linux/fbterm { }; firejail = callPackage ../os-specific/linux/firejail {}; + freefall = callPackage ../os-specific/linux/freefall { }; + fuse = callPackage ../os-specific/linux/fuse { }; fxload = callPackage ../os-specific/linux/fxload { }; @@ -7335,8 +8972,12 @@ let iptables = callPackage ../os-specific/linux/iptables { }; + ipset = callPackage ../os-specific/linux/ipset { }; + iw = callPackage ../os-specific/linux/iw { }; + jfbview = callPackage ../os-specific/linux/jfbview { }; + jujuutils = callPackage ../os-specific/linux/jujuutils { }; kbd = callPackage ../os-specific/linux/kbd { }; @@ -7354,25 +8995,24 @@ let libcgroup = callPackage ../os-specific/linux/libcgroup { }; libnl = callPackage ../os-specific/linux/libnl { }; - libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { }; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = linuxHeaders_3_7; + linuxHeaders = linuxHeaders_3_12; linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); - linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { + linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/3.12.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); - linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { }; + linuxHeaders_3_12 = callPackage ../os-specific/linux/kernel-headers/3.12.nix { }; linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { }; @@ -7388,30 +9028,27 @@ let linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = []; + kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; - linux_3_2_xen = lowPrio (linux_3_2.override { - extraConfig = '' - XEN_DOM0 y - ''; - }); - linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill ]; }; - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { + linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) { inherit fetchurl stdenv perl buildLinux; + kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; 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 = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -7420,7 +9057,8 @@ let 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 = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -7429,25 +9067,28 @@ let 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 = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; }; - linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) { + linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ 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) { + linux_3_19 = makeOverridable (import ../os-specific/linux/kernel/linux-3.19.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -7456,7 +9097,8 @@ let 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 = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -7503,7 +9145,7 @@ let for a specific kernel. This function can then be called for whatever kernel you're using. */ - linuxPackagesFor = kernel: self: let callPackage = newScope self; in { + linuxPackagesFor = kernel: self: let callPackage = newScope self; in rec { inherit kernel; acpi_call = callPackage ../os-specific/linux/acpi-call {}; @@ -7534,10 +9176,11 @@ let nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; + nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; + nvidia_x11_beta = callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -7561,10 +9204,20 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + prl-tools = callPackage ../os-specific/linux/prl-tools { }; + psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; - spl = callPackage ../os-specific/linux/spl { }; - spl_git = callPackage ../os-specific/linux/spl/git.nix { }; + seturgent = callPackage ../os-specific/linux/seturgent { }; + + spl = callPackage ../os-specific/linux/spl { + configFile = "kernel"; + inherit kernel; + }; + spl_git = callPackage ../os-specific/linux/spl/git.nix { + configFile = "kernel"; + inherit kernel; + }; sysdig = callPackage ../os-specific/linux/sysdig {}; @@ -7572,38 +9225,58 @@ let v86d = callPackage ../os-specific/linux/v86d { }; + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome) libIDL; enableExtensionPack = config.virtualbox.enableExtensionPack or false; + pulseSupport = config.pulseaudio or false; }; + virtualboxHardened = lowPrio (virtualbox.override { + enableHardening = true; + }); + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - zfs = callPackage ../os-specific/linux/zfs { }; - zfs_git = callPackage ../os-specific/linux/zfs/git.nix { }; + zfs = callPackage ../os-specific/linux/zfs { + configFile = "kernel"; + inherit kernel spl; + }; + zfs_git = callPackage ../os-specific/linux/zfs/git.nix { + configFile = "kernel"; + inherit kernel spl_git; + }; }; # The current default kernel / kernel modules. + linuxPackages = linuxPackages_3_18; 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; + linuxPackages_latest = pkgs.linuxPackages_3_19; + linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); - 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_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; + linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); 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); 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_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); + linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); + linuxPackages_custom = {version, src, configfile}: + let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; + allowImportFromDerivation=true;}) + linuxPackages_self); + in recurseIntoAttrs linuxPackages_self; + + # Build a kernel for Xen dom0 + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); # grsecurity flavors # Stable kernels @@ -7632,6 +9305,8 @@ let libraw1394 = callPackage ../development/libraries/libraw1394 { }; + libsass = callPackage ../development/libraries/libsass { }; + libsexy = callPackage ../development/libraries/libsexy { }; libsepol = callPackage ../os-specific/linux/libsepol { }; @@ -7697,6 +9372,12 @@ let gocode = callPackage ../development/tools/gocode { }; + gotags = callPackage ../development/tools/gotags { }; + + golint = callPackage ../development/tools/golint { goPackages = go13Packages; }; + + godep = callPackage ../development/tools/godep { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -7707,17 +9388,13 @@ let pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; - pam_console = callPackage ../os-specific/linux/pam_console { - libtool = libtool_1_5; - }; - pam_devperm = callPackage ../os-specific/linux/pam_devperm { }; pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; - pam_login = callPackage ../os-specific/linux/pam_login { }; + pam_mount = callPackage ../os-specific/linux/pam_mount { }; pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; @@ -7732,9 +9409,9 @@ let config = config.pcmciaUtils.config or null; }; - plymouth = callPackage ../os-specific/linux/plymouth { - automake = automake113x; - }; + perf-tools = callPackage ../os-specific/linux/perf-tools { }; + + plymouth = callPackage ../os-specific/linux/plymouth { }; pmount = callPackage ../os-specific/linux/pmount { }; @@ -7762,6 +9439,8 @@ let radeontools = callPackage ../os-specific/linux/radeontools { }; + radeontop = callPackage ../os-specific/linux/radeontop { }; + raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -7780,8 +9459,22 @@ let shadow = callPackage ../os-specific/linux/shadow { }; + sinit = callPackage ../os-specific/linux/sinit { + rcinit = "/etc/rc.d/rc.init"; + rcshutdown = "/etc/rc.d/rc.shutdown"; + }; + + smem = callPackage ../os-specific/linux/smem { }; + statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + spl = callPackage ../os-specific/linux/spl { + configFile = "user"; + }; + spl_git = callPackage ../os-specific/linux/spl/git.nix { + configFile = "user"; + }; + sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor @@ -7852,7 +9545,7 @@ let uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - inherit fetchurl stdenv libiconv; + inherit fetchurl stdenv libiconvReal; linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; cross = assert crossSystem != null; crossSystem; @@ -7861,6 +9554,7 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev = pkgs.systemd; # headers are not in the libudev output + eudev = callPackage ../os-specific/linux/eudev {}; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; @@ -7870,9 +9564,9 @@ let untie = callPackage ../os-specific/linux/untie { }; - upower = callPackage ../os-specific/linux/upower { }; + upower-old = callPackage ../os-specific/linux/upower { }; - upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { }; + upower = callPackage ../os-specific/linux/upower/0.99.nix { }; upstart = callPackage ../os-specific/linux/upstart { }; @@ -7880,17 +9574,17 @@ let usermount = callPackage ../os-specific/linux/usermount { }; - utillinux = lowPrio (callPackage ../os-specific/linux/util-linux { + utillinux = callPackage ../os-specific/linux/util-linux { ncurses = null; perl = null; - }); + }; - utillinuxCurses = utillinux.override { + utillinuxCurses = appendToName "curses" (utillinux.override { inherit ncurses perl; - }; + }); v4l_utils = callPackage ../os-specific/linux/v4l-utils { - withQt4 = true; + qt5 = null; }; windows = rec { @@ -7986,25 +9680,43 @@ let zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; + zfs = callPackage ../os-specific/linux/zfs { + configFile = "user"; + }; + zfs_git = callPackage ../os-specific/linux/zfs/git.nix { + configFile = "user"; + }; ### DATA - andagii = callPackage ../data/fonts/andagii {}; + andagii = callPackage ../data/fonts/andagii { }; - anonymousPro = callPackage ../data/fonts/anonymous-pro {}; + android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; + + anonymousPro = callPackage ../data/fonts/anonymous-pro { }; arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { }; + bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; cacert = callPackage ../data/misc/cacert { }; + caladea = callPackage ../data/fonts/caladea {}; + cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + carlito = callPackage ../data/fonts/carlito {}; + + comfortaa = callPackage ../data/fonts/comfortaa {}; + comic-neue = callPackage ../data/fonts/comic-neue { }; + comic-relief = callPackage ../data/fonts/comic-relief {}; + corefonts = callPackage ../data/fonts/corefonts { }; wrapFonts = paths : ((import ../data/fonts/fontWrap) { @@ -8016,10 +9728,14 @@ let cm_unicode = callPackage ../data/fonts/cm-unicode {}; + crimson = callPackage ../data/fonts/crimson {}; + dejavu_fonts = callPackage ../data/fonts/dejavu-fonts { inherit (perlPackages) FontTTF; }; + dina-font = callPackage ../data/fonts/dina { }; + docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; @@ -8048,6 +9764,8 @@ let eb-garamond = callPackage ../data/fonts/eb-garamond { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; + fira = callPackage ../data/fonts/fira { }; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -8056,10 +9774,14 @@ let gentium = callPackage ../data/fonts/gentium {}; + geolite-legacy = callPackage ../data/misc/geolite-legacy { }; + gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; inherit (gnome3) gsettings_desktop_schemas; + gyre-fonts = callPackage ../data/fonts/gyre {}; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; @@ -8072,7 +9794,11 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; + liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; + liberation_ttf = liberation_ttf_binary; libertine = builderDefsPackage (import ../data/fonts/libertine) { inherit fetchurl fontforge lib; @@ -8082,27 +9808,47 @@ let lmodern = callPackage ../data/fonts/lmodern { }; + lobster-two = callPackage ../data/fonts/lobster-two {}; + lohit-fonts = callPackage ../data/fonts/lohit-fonts { }; manpages = callPackage ../data/documentation/man-pages { }; + meslo-lg = callPackage ../data/fonts/meslo-lg {}; + miscfiles = callPackage ../data/misc/miscfiles { }; + media-player-info = callPackage ../data/misc/media-player-info {}; + mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; + mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { }; + nafees = callPackage ../data/fonts/nafees { }; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; + + numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; + open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; + opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + pecita = callPackage ../data/fonts/pecita {}; + poly = callPackage ../data/fonts/poly { }; posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; - pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { }; + proggyfonts = callPackage ../data/fonts/proggyfonts { }; + + pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { + perl = perl516; # syntax error at troffprepro line 49, near "do subst(" + }; shared_mime_info = callPackage ../data/misc/shared-mime-info { }; @@ -8110,28 +9856,37 @@ let stdmanpages = callPackage ../data/documentation/std-man-pages { }; + stix-otf = callPackage ../data/fonts/stix-otf { }; + symbola = callPackage ../data/fonts/symbola { }; iana_etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; + quattrocento = callPackage ../data/fonts/quattrocento {}; + + quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {}; + r3rs = callPackage ../data/documentation/rnrs/r3rs.nix { }; r4rs = callPackage ../data/documentation/rnrs/r4rs.nix { }; r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + hasklig = callPackage ../data/fonts/hasklig {}; + 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 {}; + sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; + source-han-sans-japanese = sourceHanSansPackages.japanese; + source-han-sans-korean = sourceHanSansPackages.korean; + source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; + source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; @@ -8167,6 +9922,8 @@ let xkeyboard_config = xorg.xkeyboardconfig; + zeal = callPackage ../data/documentation/zeal { }; + ### APPLICATIONS @@ -8203,8 +9960,19 @@ let aewan = callPackage ../applications/editors/aewan { }; + afterstep = callPackage ../applications/window-managers/afterstep { + inherit (xlibs) libX11 libXext libICE; + fltk = fltk13; + gtk = gtk2; + }; + alchemy = callPackage ../applications/graphics/alchemy { }; + alock = callPackage ../misc/screensavers/alock { }; + + alpine = callPackage ../applications/networking/mailreaders/alpine {}; + realpine = callPackage ../applications/networking/mailreaders/realpine {}; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; @@ -8217,6 +9985,8 @@ let inherit (gnome) libgnomecanvas libgnomecanvasmm; }); + ario = callPackage ../applications/audio/ario { }; + arora = callPackage ../applications/networking/browsers/arora { }; atom = callPackage ../applications/editors/atom { @@ -8235,6 +10005,11 @@ let milkytracker = callPackage ../applications/audio/milkytracker { }; + schismtracker = callPackage ../applications/audio/schismtracker { }; + + altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); + bitcoin = altcoins.bitcoin; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -8249,20 +10024,28 @@ let avrdudess = callPackage ../applications/misc/avrdudess { }; - avxsynth = callPackage ../applications/video/avxsynth { }; + avxsynth = callPackage ../applications/video/avxsynth { + libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope + }; awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { - lua = lua5; cairo = cairo.override { xcbSupport = true; }; + lua = lua5_1; }; awesome-3-5 = callPackage ../applications/window-managers/awesome { - lua = lua5_1; cairo = cairo.override { xcbSupport = true; }; + luaPackages = luaPackages.override { inherit lua; }; }; awesome = awesome-3-5; inherit (gnome3) baobab; + backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; + + backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; + + backintime = backintime-qt4; + bar = callPackage ../applications/window-managers/bar { }; baresip = callPackage ../applications/networking/instant-messengers/baresip { @@ -8271,6 +10054,10 @@ let batik = callPackage ../applications/graphics/batik { }; + batti = callPackage ../applications/misc/batti { }; + + cbatticon = callPackage ../applications/misc/cbatticon { }; + bazaar = callPackage ../applications/version-management/bazaar { }; bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { @@ -8284,22 +10071,16 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin {}; - bitcoind = callPackage ../applications/misc/bitcoin { gui = false; }; - - altcoins = recurseIntoAttrs ( - callPackage ../applications/misc/bitcoin/altcoins.nix {} - ); - - bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { - gnutls = gnutls; - libotr = libotr_3_2; - }; + bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; blender = callPackage ../applications/misc/blender { python = python34; }; + bluefish = callPackage ../applications/editors/bluefish { + gtk = gtk3; + }; + bristol = callPackage ../applications/audio/bristol { }; bspwm = callPackage ../applications/window-managers/bspwm { }; @@ -8316,6 +10097,10 @@ let camlistore = callPackage ../applications/misc/camlistore { }; + canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; + + canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { }; + 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 @@ -8326,6 +10111,8 @@ let }; funpidgin = carrier; + cava = callPackage ../applications/audio/cava { }; + cc1394 = callPackage ../applications/video/cc1394 { }; cddiscid = callPackage ../applications/audio/cd-discid { }; @@ -8346,36 +10133,49 @@ let chatzilla = callPackage ../applications/networking/irc/chatzilla { }; - chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium { channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; - enablePepperPDF = config.chromium.enablePepperPDF or false; - }); + enableWideVine = config.chromium.enableWideVine or false; + hiDPISupport = config.chromium.hiDPISupport or false; + }; + + chronos = callPackage ../applications/networking/cluster/chronos { }; chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chromiumDevWrapper = lowPrio (wrapChromium chromiumDev); - chromiumWrapper = wrapChromium chromium; + chuck = callPackage ../applications/audio/chuck { }; cinelerra = callPackage ../applications/video/cinelerra { }; + clawsMail = callPackage ../applications/networking/mailreaders/claws-mail { + enableNetworkManager = config.networking.networkmanager.enable or false; + }; + + clipgrab = callPackage ../applications/video/clipgrab { }; + clipit = callPackage ../applications/misc/clipit { }; + bomi = callPackage ../applications/video/bomi { + stdenv = overrideCC stdenv gcc49; + pulseSupport = config.pulseaudio or false; + }; + cmus = callPackage ../applications/audio/cmus { }; compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; - boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864 }; coriander = callPackage ../applications/video/coriander { inherit (gnome) libgnomeui GConf; }; + cortex = callPackage ../applications/misc/cortex { }; + csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { @@ -8406,22 +10206,23 @@ let imagemagick = imagemagick; }; + cutecom = callPackage ../tools/misc/cutecom { }; + cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + d4x = callPackage ../applications/misc/d4x { }; - darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs { - cabal = cabal.override { - extension = self : super : { - isLibrary = false; - configureFlags = "-f-library " + super.configureFlags or ""; - }; - }; - }; + darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: { + configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; + enableSharedExecutables = false; + isLibrary = false; + }); darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; @@ -8429,6 +10230,10 @@ let dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; + deadbeef = callPackage ../applications/audio/deadbeef { + pulseSupport = config.pulseaudio or true; + }; + dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; }; @@ -8448,19 +10253,25 @@ let enableXft = config.dmenu.enableXft or false; }; - dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { - inherit libpng libtiff libjpeg imagemagick librsvg - pkgconfig bzip2 zlib libtool freetype fontconfig - ghostscript jasper xz; - inherit (xlibs) libX11; + dmenu2 = callPackage ../applications/misc/dmenu2 { }; + + dmtx = dmtx-utils; + + dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { }; + docker = callPackage ../applications/virtualization/docker { + go = go_1_3; + }; doodle = callPackage ../applications/search/doodle { }; + drumgizmo = callPackage ../applications/audio/drumgizmo { inherit (xlibs) libX11; }; + dunst = callPackage ../applications/misc/dunst { }; + devede = callPackage ../applications/video/devede { }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -8483,6 +10294,8 @@ let ed = callPackage ../applications/editors/ed { }; + edbrowse = callPackage ../applications/editors/edbrowse { }; + ekho = callPackage ../applications/audio/ekho { }; electrum = callPackage ../applications/misc/electrum { }; @@ -8492,13 +10305,15 @@ let elvis = callPackage ../applications/editors/elvis { }; emacs = emacs24; + emacsPackages = emacs24Packages; + emacsPackagesNg = emacs24PackagesNg; + emacsMelpa = emacs24PackagesNg; # for backward compatibility emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features libXaw = xlibs.libXaw; Xaw3d = null; gconf = null; - librsvg = null; alsaLib = null; imagemagick = null; }; @@ -8507,11 +10322,15 @@ let withX = false; })); - emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix { + emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix { + stdenv = pkgs.clangStdenv; + }); + emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { stdenv = pkgs.clangStdenv; }); + emacs24Macport = self.emacs24Macport_24_4; - emacsPackages = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -8534,11 +10353,13 @@ let cua = callPackage ../applications/editors/emacs-modes/cua { }; + d = callPackage ../applications/editors/emacs-modes/d { }; + darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; - # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; + dash = callPackage ../applications/editors/emacs-modes/dash { }; - jabber = callPackage ../applications/editors/emacs-modes/jabber { }; + # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { }; @@ -8548,8 +10369,12 @@ let emms = callPackage ../applications/editors/emacs-modes/emms { }; + ensime = callPackage ../applications/editors/emacs-modes/ensime { }; + ess = callPackage ../applications/editors/emacs-modes/ess { }; + flycheck = callPackage ../applications/editors/emacs-modes/flycheck { }; + flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; gh = callPackage ../applications/editors/emacs-modes/gh { }; @@ -8558,31 +10383,30 @@ let gist = callPackage ../applications/editors/emacs-modes/gist { }; - idris = callPackage ../applications/editors/emacs-modes/idris { }; + gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; - jade = callPackage ../applications/editors/emacs-modes/jade { }; + haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; + haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { }); - jdee = callPackage ../applications/editors/emacs-modes/jdee { - # Requires Emacs 23, for `avl-tree'. - }; + hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; - js2 = callPackage ../applications/editors/emacs-modes/js2 { }; + hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; - stratego = callPackage ../applications/editors/emacs-modes/stratego { }; + htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; - haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; + icicles = callPackage ../applications/editors/emacs-modes/icicles { }; - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; + idris = callPackage ../applications/editors/emacs-modes/idris { }; - structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { - inherit (haskellPackages) cabal haskellSrcExts; - }; + jabber = callPackage ../applications/editors/emacs-modes/jabber { }; - tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; + jade = callPackage ../applications/editors/emacs-modes/jade { }; - hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; + jdee = callPackage ../applications/editors/emacs-modes/jdee { }; - htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + js2 = callPackage ../applications/editors/emacs-modes/js2 { }; + + let-alist = callPackage ../applications/editors/emacs-modes/let-alist { }; logito = callPackage ../applications/editors/emacs-modes/logito { }; @@ -8594,7 +10418,9 @@ let metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; - notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); + notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); + + ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; @@ -8626,28 +10452,65 @@ let quack = callPackage ../applications/editors/emacs-modes/quack { }; + rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { }; + rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; remember = callPackage ../applications/editors/emacs-modes/remember { }; rudel = callPackage ../applications/editors/emacs-modes/rudel { }; + s = callPackage ../applications/editors/emacs-modes/s { }; + 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 { }; + stratego = callPackage ../applications/editors/emacs-modes/stratego { }; + + structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { + inherit (haskellPackages) cabal ; + haskellSrcExts = haskellPackages.haskellSrcExts_1_15_0_1; + }; + sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; + tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; + writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; + + cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); + + emacsPackagesNgGen = emacs: import ./emacs-packages.nix { + overrides = (config.emacsPackageOverrides or (p: {})) pkgs; + + inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs; + + trivialBuild = import ../build-support/emacs/trivial.nix { + inherit lib stdenv emacs texinfo; + }; + + melpaBuild = import ../build-support/emacs/melpa.nix { + inherit lib stdenv fetchurl emacs texinfo; + }; + + external = { + inherit (haskellngPackages) ghc-mod structured-haskell-mode Agda; + }; + }; + + emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); inherit (gnome3) empathy; + enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + epdfview = callPackage ../applications/misc/epdfview { }; inherit (gnome3) epiphany; @@ -8684,18 +10547,24 @@ let fbreader = callPackage ../applications/misc/fbreader { }; - fetchmail = import ../applications/misc/fetchmail { - inherit stdenv fetchurl openssl; - }; + fetchmail = callPackage ../applications/misc/fetchmail { }; fldigi = callPackage ../applications/audio/fldigi { }; fluidsynth = callPackage ../applications/audio/fluidsynth { }; + fmit = callPackage ../applications/audio/fmit { }; + + focuswriter = callPackage ../applications/editors/focuswriter { }; + fossil = callPackage ../applications/version-management/fossil { }; + freewheeling = callPackage ../applications/audio/freewheeling { }; + fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; + fritzing = callPackage ../applications/science/electronics/fritzing { }; + fvwm = callPackage ../applications/window-managers/fvwm { }; geany = callPackage ../applications/editors/geany { }; @@ -8711,8 +10580,12 @@ let goldendict = callPackage ../applications/misc/goldendict { }; + google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; + google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + gpa = callPackage ../applications/misc/gpa { }; + gpicview = callPackage ../applications/graphics/gpicview { }; gqrx = callPackage ../applications/misc/gqrx { }; @@ -8748,7 +10621,13 @@ let wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; - wireshark = callPackage ../applications/networking/sniffers/wireshark { }; + wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { + withQt = false; + withGtk = false; + }; + wireshark-gtk = wireshark-cli.override { withGtk = true; }; + wireshark-qt = wireshark-cli.override { withQt = true; }; + wireshark = wireshark-gtk; wvdial = callPackage ../os-specific/linux/wvdial { }; @@ -8760,18 +10639,6 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { - inherit (gnome) libIDL; - }; - - firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; - - firefox30Pkgs = callPackage ../applications/networking/browsers/firefox/30.nix { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - libpng = libpng_apng; - }; - firefox = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; @@ -8782,8 +10649,8 @@ let 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; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext + libXfixes libXinerama libXrender libXt; }; flac = callPackage ../applications/audio/flac { }; @@ -8794,7 +10661,13 @@ let fluxbox = callPackage ../applications/window-managers/fluxbox { }; + fme = callPackage ../applications/misc/fme { + inherit (gnome) libglademm; + inherit pkgconfig autoconf automake gettext; + }; + freecad = callPackage ../applications/graphics/freecad { + boost = boost156; opencascade = opencascade_6_5; inherit (pythonPackages) matplotlib pycollada; }; @@ -8819,13 +10692,10 @@ let freicoin = callPackage ../applications/misc/freicoin { }; - fspot = callPackage ../applications/graphics/f-spot { - inherit (gnome) libgnome libgnomeui; - gtksharp = gtksharp1; - }; - fuze = callPackage ../applications/networking/instant-messengers/fuze {}; + game-music-emu = callPackage ../applications/audio/game-music-emu { }; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; get_iplayer = callPackage ../applications/misc/get_iplayer {}; @@ -8848,7 +10718,12 @@ let }); git = gitAndTools.git; gitFull = gitAndTools.gitFull; + gitMinimal = git.override { + withManual = false; + pythonSupport = false; + }; gitSVN = gitAndTools.gitSVN; + git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27; @@ -8872,22 +10747,26 @@ let goffice = goffice_0_8; }; - goffice_0_8 = callPackage ../desktops/gnome-3/3.10/misc/goffice/0.8.nix { + goffice_0_8 = callPackage ../desktops/gnome-3/3.12/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 { })); + idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; + linssid = callPackage ../applications/networking/linssid { }; + mi2ly = callPackage ../applications/audio/mi2ly {}; praat = callPackage ../applications/audio/praat { }; - quvi = callPackage ../applications/video/quvi/tool.nix { }; + quvi = callPackage ../applications/video/quvi/tool.nix { + lua5_sockets = lua5_1_sockets; + lua5 = lua5_1; + }; quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; @@ -8929,6 +10808,8 @@ let inherit libgphoto2 fuse pkgconfig glib libtool; }; + gramps = callPackage ../applications/misc/gramps { }; + graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; @@ -8937,6 +10818,7 @@ let }; gtkpod = callPackage ../applications/audio/gtkpod { + gnome = gnome3; inherit (gnome) libglade; }; @@ -8962,7 +10844,9 @@ let gqview = callPackage ../applications/graphics/gqview { }; - gmpc = callPackage ../applications/audio/gmpc { }; + gmpc = callPackage ../applications/audio/gmpc { + inherit (xlibs) libSM libICE; + }; gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { inherit (gnome) GConf; @@ -8974,9 +10858,7 @@ let libpng = libpng12; }; - gosmore = builderDefsPackage ../applications/misc/gosmore { - inherit fetchsvn curl pkgconfig libxml2 gtk; - }; + gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = callPackage ../applications/misc/gpsbabel { }; @@ -8984,7 +10866,13 @@ let gpsd = callPackage ../servers/gpsd { }; - guitone = callPackage ../applications/version-management/guitone { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { + inherit (gnome2) gtk; + }; + + guitone = callPackage ../applications/version-management/guitone { + graphviz = graphviz_2_32; + }; gv = callPackage ../applications/misc/gv { }; @@ -8992,6 +10880,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -9000,17 +10890,25 @@ let hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; - homebank = callPackage ../applications/office/homebank { }; + homebank = callPackage ../applications/office/homebank { + gtk = gtk3; + }; htmldoc = callPackage ../applications/misc/htmldoc { fltk = fltk13; }; - hugin = callPackage ../applications/graphics/hugin { }; + hugin = callPackage ../applications/graphics/hugin { + boost = boost155; + }; hydrogen = callPackage ../applications/audio/hydrogen { }; - i3 = callPackage ../applications/window-managers/i3 { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; + + i3 = callPackage ../applications/window-managers/i3 { + xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; + }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { inherit (xorg) libxkbfile; @@ -9031,7 +10929,7 @@ let ii = callPackage ../applications/networking/irc/ii { }; - ike = callPackage ../applications/ike { }; + ike = callPackage ../applications/networking/ike { }; ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber @@ -9040,12 +10938,44 @@ let AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { - tetex = null; + imagemagick_light = imagemagick.override { + libcl = null; + perl = null; + jemalloc = null; + bzip2 = null; + zlib = null; + libX11 = null; + libXext = null; + libXt = null; + dejavu_fonts = null; + fftw = null; + libfpx = null; + djvulibre = null; + fontconfig = null; + freetype = null; + ghostscript = null; + graphviz = null; + jbigkit = null; + libjpeg = null; + lcms2 = null; + openjpeg = null; + liblqr1 = null; + xz = null; + openexr = null; + pango = null; + libpng = null; librsvg = null; + libtiff = null; + libwebp = null; + libxml2 = null; + }; + + imagemagick = callPackage ../applications/graphics/ImageMagick { + ghostscript = if stdenv.isDarwin then null else ghostscript; + perl = null; # Currently Broken }; - imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { }); + imagemagickBig = imagemagick; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { @@ -9068,12 +10998,7 @@ let iptraf = callPackage ../applications/networking/iptraf { }; - irssi = callPackage ../applications/networking/irc/irssi { - # compile with gccApple on darwin to support the -no-cpp-precompile flag - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + irssi = callPackage ../applications/networking/irc/irssi { }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; @@ -9081,6 +11006,8 @@ let bip = callPackage ../applications/networking/irc/bip { }; + jabref = callPackage ../applications/office/jabref/default.nix { }; + jack_capture = callPackage ../applications/audio/jack-capture { }; jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { }; @@ -9103,25 +11030,58 @@ let inherit (pythonPackages) lxml; }; + jumanji = callPackage ../applications/networking/browsers/jumanji { + webkitgtk = webkitgtk24x; + gtk = gtk3; + }; + jwm = callPackage ../applications/window-managers/jwm { }; k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; + boost = boost155; }; + kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { + kf5 = kf57; + kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; + }); + kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 { + kf5 = kf59; + kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; + }); + kdeApps_stable = kdeApps_14_12; + kdeApps_latest = kdeApps_15_04; + keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; }; kermit = callPackage ../tools/misc/kermit { }; + keyfinder = callPackage ../applications/audio/keyfinder { }; + + keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { }; + keymon = callPackage ../applications/video/key-mon { }; + khal = callPackage ../applications/misc/khal { + pythonPackages = python3Packages; + }; + + kid3 = callPackage ../applications/audio/kid3 { + qt = qt4; + }; + kino = callPackage ../applications/video/kino { inherit (gnome) libglade; }; - lame = callPackage ../applications/audio/lame { }; + koji = callPackage ../tools/package-management/koji { }; + + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -9141,12 +11101,16 @@ let lbdb = callPackage ../tools/misc/lbdb { }; + lbzip2 = callPackage ../tools/compression/lbzip2 { }; + lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { inherit (gnome) libglade; }; + libowfat = callPackage ../development/libraries/libowfat { }; + librecad = callPackage ../applications/misc/librecad { }; librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; @@ -9155,8 +11119,9 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; - boost = boost155; - jdk = openjdk; + #boost = boost155; + #glm = glm_0954; + bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf @@ -9169,7 +11134,9 @@ let }; }; - liferea = callPackage ../applications/networking/newsreaders/liferea { }; + liferea = callPackage ../applications/networking/newsreaders/liferea { + webkitgtk = webkitgtk24x; + }; lingot = callPackage ../applications/audio/lingot { inherit (gnome) libglade; @@ -9177,59 +11144,73 @@ let links = callPackage ../applications/networking/browsers/links { }; - ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; + ledger3 = callPackage ../applications/office/ledger { }; + ledger = ledger3; lighttable = callPackage ../applications/editors/lighttable {}; links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { - inherit (gnome) libglade; - libexosip = libexosip_3; - libosip = libosip_3; - }; + linphone = callPackage ../applications/networking/instant-messengers/linphone rec { }; linuxsampler = callPackage ../applications/audio/linuxsampler { bison = bison2; }; - llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; + llpp = callPackage ../applications/misc/llpp { + inherit (ocamlPackages_4_02_1) lablgl findlib; + ocaml = ocaml_4_02_1; + }; lmms = callPackage ../applications/audio/lmms { }; lrzsz = callPackage ../tools/misc/lrzsz { }; + luakit = callPackage ../applications/networking/browsers/luakit { + inherit (lua51Packages) luafilesystem luasqlite3; + lua5 = lua5_1; + gtk = gtk3; + webkit = webkitgtk2; + }; + luminanceHDR = callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { }; + handbrake = callPackage ../applications/video/handbrake { + webkitgtk = webkitgtk24x; + }; lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome) vte; gtk = gtk2; }; - + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = callPackage ../applications/misc/lyx { }; makeself = callPackage ../applications/misc/makeself { }; + marathon = callPackage ../applications/networking/cluster/marathon { }; + matchbox = callPackage ../applications/window-managers/matchbox { }; mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; - meld = callPackage ../applications/version-management/meld { - inherit (gnome) scrollkeeper; - pygtk = pyGtkGlade; - }; + mediainfo = callPackage ../applications/misc/mediainfo { }; + + mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + + meld = callPackage ../applications/version-management/meld { }; mcomix = callPackage ../applications/graphics/mcomix { }; + mendeley = callPackage ../applications/office/mendeley { }; + mercurial = callPackage ../applications/version-management/mercurial { inherit (pythonPackages) curses docutils; guiSupport = false; # use mercurialFull to get hgk GUI @@ -9241,11 +11222,15 @@ let meshlab = callPackage ../applications/graphics/meshlab { }; + metersLv2 = callPackage ../applications/audio/meters_lv2 { }; + mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; mid2key = callPackage ../applications/audio/mid2key { }; - midori = callPackage ../applications/networking/browsers/midori { }; + midori = callPackage ../applications/networking/browsers/midori { + webkitgtk = webkitgtk24x; + }; midoriWrapper = wrapFirefox { browser = midori; browserName = "midori"; desktopName = "Midori"; @@ -9260,36 +11245,33 @@ let minidjvu = callPackage ../applications/graphics/minidjvu { }; + mimms = callPackage ../applications/audio/mimms {}; + mirage = callPackage ../applications/graphics/mirage {}; mixxx = callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; }; + mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; + mmex = callPackage ../applications/office/mmex { }; moc = callPackage ../applications/audio/moc { }; - monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; + monero = callPackage ../applications/misc/monero { }; - monodevelop = callPackage ../applications/editors/monodevelop { - inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf; - mozilla = firefox; - gtksharp = gtksharp2; - }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; - monodoc = callPackage ../applications/editors/monodoc { - gtksharp = gtksharp1; - }; + monodevelop = callPackage ../applications/editors/monodevelop {}; monotone = callPackage ../applications/version-management/monotone { lua = lua5; - boost = boost149; }; monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { - inherit ocaml graphviz pkgconfig autoconf automake libtool glib gtk; - inherit (ocamlPackages) lablgtk; + inherit graphviz pkgconfig autoconf automake libtool glib gtk; + inherit (ocamlPackages_4_01_0) lablgtk ocaml; inherit (gnome) libgnomecanvas; }; @@ -9299,16 +11281,18 @@ let mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; - mozilla = callPackage ../applications/networking/browsers/mozilla { - inherit (gnome) libIDL; - }; + mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) { inherit firefox; inherit (xlibs) libX11 xproto; }; - easytag = callPackage ../applications/audio/easytag { }; + easytag = callPackage ../applications/audio/easytag { + inherit (gnome3) gnome_icon_theme dconf; + }; + + mp3gain = callPackage ../applications/audio/mp3gain { }; mp3info = callPackage ../applications/audio/mp3info { }; @@ -9328,33 +11312,34 @@ let normalize = callPackage ../applications/audio/normalize { }; - mplayer = callPackage ../applications/video/mplayer { + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; - vdpauSupport = config.mplayer.vdpauSupport or false; - }; - - mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 - }; + } // (config.mplayer or {})); MPlayerPlugin = browser: - import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { + callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; - inherit fetchurl stdenv pkgconfig gettext; inherit (xlibs) libXpm; # !!! should depend on MPlayer }; mpv = callPackage ../applications/video/mpv { lua = lua5_1; + lua5_sockets = lua5_1_sockets; bs2bSupport = config.mpv.bs2bSupport or true; - quviSupport = config.mpv.quviSupport or false; + youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; vaapiSupport = config.mpv.vaapiSupport or false; }; + mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; + mrxvt = callPackage ../applications/misc/mrxvt { }; + mudlet = callPackage ../games/mudlet { + inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; + }; + multisync = callPackage ../applications/misc/multisync { inherit (gnome) ORBit2 libbonobo libgnomeui GConf; }; @@ -9365,6 +11350,7 @@ let }; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; + pulseSupport = config.pulseaudio or false; }; murmur = callPackage ../applications/networking/mumble/murmur.nix { @@ -9374,50 +11360,44 @@ let iceSupport = config.murmur.iceSupport or true; }; + musescore = callPackage ../applications/audio/musescore { }; + mutt = callPackage ../applications/networking/mailreaders/mutt { }; + mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { + withSidebar = true; + }; - pcmanfm = callPackage ../applications/misc/pcmanfm { }; + mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { }; - ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { - ruby = ruby19; - hoe = rubyLibs.hoe; + panamax_api = callPackage ../applications/networking/cluster/panamax/api { + ruby = ruby_2_1; + }; + panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { + ruby = ruby_2_1; }; - ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; smplayer = callPackage ../applications/video/smplayer { }; - sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { - ruby = ruby19.override { - cursesSupport = true; - }; - - inherit gettext highline iconv locale lockfile - text trollop xapian_ruby which; + smtube = callPackage ../applications/video/smtube {}; - rmail_sup = ""; # missing - unicode = ""; - - # 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; - gpgme = ruby_gpgme; - mime_types = mime_types; - ncursesw_sup = ruby_ncursesw_sup; - rake = rake; + sup = callPackage ../applications/networking/mailreaders/sup { + ruby = ruby_1_9_3.override { cursesSupport = true; }; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; }; + librep = callPackage ../development/libraries/librep { }; + + rep-gtk = callPackage ../development/libraries/rep-gtk { }; + + sawfish = callPackage ../applications/window-managers/sawfish { }; + sxhkd = callPackage ../applications/window-managers/sxhkd { }; msmtp = callPackage ../applications/networking/msmtp { }; @@ -9426,7 +11406,11 @@ let lua = lua5; }; - mupdf = callPackage ../applications/misc/mupdf { }; + maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; + + mupdf = callPackage ../applications/misc/mupdf { + openjpeg = openjpeg_2_0_1; + }; mypaint = callPackage ../applications/graphics/mypaint { }; @@ -9438,6 +11422,8 @@ let nano = callPackage ../applications/editors/nano { }; + nanoblogger = callPackage ../applications/misc/nanoblogger { }; + navipowm = callPackage ../applications/misc/navipowm { }; navit = callPackage ../applications/misc/navit { }; @@ -9456,14 +11442,19 @@ let netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; }); notmuch = callPackage ../applications/networking/mailreaders/notmuch { - # use emacsPackages.notmuch if you want emacs support + # No need to build Emacs - notmuch.el works just fine without + # byte-compilation. Use emacs24Packages.notmuch if you want to + # byte-compiled files emacs = null; + sphinx = pythonPackages.sphinx; }; nova = callPackage ../applications/virtualization/nova { }; novaclient = callPackage ../applications/virtualization/nova/client.nix { }; + nova-filters = callPackage ../applications/audio/nova-filters { }; + nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; nvi = callPackage ../applications/editors/nvi { }; @@ -9474,6 +11465,8 @@ let inherit (gnome) libglade; }; + obs-studio = callPackage ../applications/video/obs-studio { }; + ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; @@ -9486,6 +11479,8 @@ let openbox = callPackage ../applications/window-managers/openbox { }; + openbox-menu = callPackage ../applications/misc/openbox-menu { }; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; @@ -9508,6 +11503,10 @@ let panotools = callPackage ../applications/graphics/panotools { }; + paprefs = callPackage ../applications/audio/paprefs { + inherit (gnome) libglademm gconfmm; + }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = callPackage ../applications/graphics/paraview { }; @@ -9521,11 +11520,16 @@ let pdftk = callPackage ../tools/typesetting/pdftk { }; pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; + photoqt = callPackage ../applications/graphics/photoqt { }; + pianobar = callPackage ../applications/audio/pianobar { }; pianobooster = callPackage ../applications/audio/pianobooster { }; - picard = callPackage ../applications/audio/picard { }; + picard = callPackage ../applications/audio/picard { + python-libdiscid = pythonPackages.discid; + mutagen = pythonPackages.mutagen; + }; picocom = callPackage ../tools/misc/picocom { }; @@ -9534,17 +11538,16 @@ let gnutls = if config.pidgin.gnutls or false then gnutls else null; libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; startupnotification = libstartup_notification; + inherit (xlibs) libXext libICE libSM; }; - pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { - imagemagick = imagemagickBig; + pidgin-with-plugins = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix { + plugins = []; }; - pidginlatexSF = builderDefsPackage - (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix) - { - inherit pkgconfig pidgin texLive imagemagick which glib gtk; - }; + pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { }; + + pidginlatexSF = pidginlatex; pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; @@ -9552,18 +11555,24 @@ let pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; + pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { }; pinfo = callPackage ../applications/misc/pinfo { }; + pinpoint = callPackage ../applications/office/pinpoint {}; + pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtksharp2; + gtksharp = gtk-sharp; }; pommed = callPackage ../os-specific/linux/pommed { inherit (xorg) libXpm; }; + pond = callPackage ../applications/networking/pond { goPackages = go13Packages; }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; @@ -9572,34 +11581,76 @@ let qiv = callPackage ../applications/graphics/qiv { }; + processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; }; + # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules procmail = callPackage ../applications/misc/procmail { }; + profanity = callPackage ../applications/networking/instant-messengers/profanity { + notifySupport = config.profanity.notifySupport or true; + autoAwaySupport = config.profanity.autoAwaySupport or true; + }; + pstree = callPackage ../applications/misc/pstree { }; pulseview = callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; + puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; + + puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; + qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { + boost = boost156; + libtorrentRasterbar = libtorrentRasterbar_0_16; + }; - eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { }; + eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; qemu = callPackage ../applications/virtualization/qemu { }; qmmp = callPackage ../applications/audio/qmmp { }; + qrcode = callPackage ../tools/graphics/qrcode {}; + qsampler = callPackage ../applications/audio/qsampler { }; qsynth = callPackage ../applications/audio/qsynth { }; + qtox = callPackage ../applications/networking/instant-messengers/qtox { }; + qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; + quassel_qt5 = callPackage ../applications/networking/irc/quassel { + monolithic = true; + daemon = false; + client = false; + withKDE = false; + useQt5 = true; + qt = qt5; + dconf = gnome3.dconf; + tag = "-qt5"; + }; + + quasselClient_qt5 = quassel_qt5.override { + monolithic = false; + client = true; + tag = "-client-qt5"; + }; + + quasselDaemon_qt5 = quassel_qt5.override { + monolithic = false; + daemon = true; + tag = "-daemon-qt5"; + }; + + quirc = callPackage ../tools/graphics/quirc {}; + quodlibet = callPackage ../applications/audio/quodlibet { inherit (pythonPackages) mutagen; }; @@ -9619,6 +11670,8 @@ let rapidsvn = callPackage ../applications/version-management/rapidsvn { }; + ratox = callPackage ../applications/networking/instant-messengers/ratox { }; + ratpoison = callPackage ../applications/window-managers/ratpoison { }; rawtherapee = callPackage ../applications/graphics/rawtherapee { @@ -9631,6 +11684,8 @@ let recode = callPackage ../tools/text/recode { }; + remotebox = callPackage ../applications/virtualization/remotebox { }; + retroshare = callPackage ../applications/networking/p2p/retroshare { qt = qt4; }; @@ -9639,6 +11694,12 @@ let qt = qt4; }); + rofi = callPackage ../applications/misc/rofi { + automake = automake114x; + }; + + rstudio = callPackage ../applications/editors/rstudio { }; + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); @@ -9657,12 +11718,29 @@ let unicode3Support = true; }; + # urxvt plugins + urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; + urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; + + rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + plugins = [ urxvt_perls urxvt_tabbedex ]; + }; + + # FIXME: remove somewhere in future + rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; + sakura = callPackage ../applications/misc/sakura { - inherit (gnome) vte; + inherit (gnome3) vte; }; sbagen = callPackage ../applications/misc/sbagen { }; + scantailor = callPackage ../applications/graphics/scantailor { + boost = boost155; + }; + + scim = callPackage ../applications/misc/scim { }; + scite = callPackage ../applications/editors/scite { }; scribus = callPackage ../applications/office/scribus { @@ -9672,7 +11750,7 @@ let seafile-client = callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { - opencv = opencv_2_1; + protobuf = protobuf2_5; }; seg3d = callPackage ../applications/graphics/seg3d { @@ -9687,6 +11765,8 @@ let gtk = gtk3; }; + simple-scan = callPackage ../applications/graphics/simple-scan { }; + siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; @@ -9695,8 +11775,14 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + slmenu = callPackage ../applications/misc/slmenu {}; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; + + sound-juicer = callPackage ../applications/audio/sound-juicer { }; + spideroak = callPackage ../applications/networking/spideroak { }; ssvnc = callPackage ../applications/networking/remote/ssvnc { }; @@ -9705,6 +11791,12 @@ let conf = config.st.conf or null; }; + stag = callPackage ../applications/misc/stag { + curses = ncurses; + }; + + stella = callPackage ../misc/emulators/stella { }; + linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) @@ -9715,21 +11807,26 @@ let sxiv = callPackage ../applications/graphics/sxiv { }; - bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; + bittorrentSync = bittorrentSync14; + bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; + bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; + + copy-com = callPackage ../applications/networking/copy-com { }; dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; - lightdm = callPackage ../applications/display-managers/lightdm { }; + lightdm = callPackage ../applications/display-managers/lightdm { + qt4 = null; + qt5 = null; + }; + + lightdm_qt = lightdm.override { qt5 = qt5; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; - # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended" - slic3r = callPackage ../applications/misc/slic3r { - perlPackages = perl514Packages; - perl = perl514; - }; + slic3r = callPackage ../applications/misc/slic3r { }; curaengine = callPackage ../applications/misc/curaengine { }; @@ -9737,17 +11834,29 @@ let printrun = callPackage ../applications/misc/printrun { }; + sddm = callPackage ../applications/display-managers/sddm { }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; + smartgithg = callPackage ../applications/version-management/smartgithg { }; + + slimThemes = recurseIntoAttrs (import ../applications/display-managers/slim/themes.nix { + inherit stdenv fetchurl slim; + }); + smartdeblur = callPackage ../applications/graphics/smartdeblur { }; + snapper = callPackage ../tools/misc/snapper { }; + snd = callPackage ../applications/audio/snd { }; shntool = callPackage ../applications/audio/shntool { }; - sonic_visualiser = callPackage ../applications/audio/sonic-visualiser { + sipp = callPackage ../development/tools/misc/sipp { }; + + sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; fftw = pkgs.fftwSinglePrec; @@ -9757,6 +11866,8 @@ let soxr = callPackage ../applications/misc/audio/soxr { }; + spek = callPackage ../applications/audio/spek { }; + spotify = callPackage ../applications/audio/spotify { inherit (gnome) GConf; libpng = libpng12; @@ -9766,11 +11877,18 @@ let apiKey = config.libspotify.apiKey or null; }; + src = callPackage ../applications/version-management/src/default.nix { + git = gitMinimal; + }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; - stumpwm = lispPackages.stumpwm; + stumpwm = callPackage ../applications/window-managers/stumpwm { + sbcl = sbcl_1_2_5; + lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5); + }; sublime = callPackage ../applications/editors/sublime { }; @@ -9784,7 +11902,6 @@ let perlBindings = false; javahlBindings = false; saslSupport = false; - httpd = apacheHttpd; sasl = cyrus_sasl; }; @@ -9802,10 +11919,7 @@ let swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { - sslSupport = true; - gpgSupport = true; - }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; symlinks = callPackage ../tools/system/symlinks { }; @@ -9816,6 +11930,8 @@ let tabbed = callPackage ../applications/window-managers/tabbed { }; + tagainijisho = callPackage ../applications/office/tagainijisho {}; + tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { inherit (pythonPackages) twisted foolscap simplejson nevow zfec pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs @@ -9853,11 +11969,20 @@ let telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + + terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; + terminator = callPackage ../applications/misc/terminator { vte = gnome.vte.override { pythonSupport = true; }; inherit (pythonPackages) notify; }; + termite = callPackage ../applications/misc/termite { + gtk = gtk3; + vte = gnome3_12.vte-select-text; + }; + tesseract = callPackage ../applications/graphics/tesseract { }; thinkingRock = callPackage ../applications/misc/thinking-rock { }; @@ -9877,6 +12002,13 @@ let tig = gitAndTools.tig; + tilda = callPackage ../applications/misc/tilda { + vte = gnome3.vte; + gtk = gtk3; + }; + + timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -9885,8 +12017,19 @@ let tla = callPackage ../applications/version-management/arch { }; + tlp = callPackage ../tools/misc/tlp { + enableRDW = config.networking.networkmanager.enable or false; + }; + todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + tomahawk = callPackage ../applications/audio/tomahawk { + inherit (pkgs.kde4) kdelibs; + enableXMPP = config.tomahawk.enableXMPP or true; + enableKDE = config.tomahawk.enableKDE or false; + enableTelepathy = config.tomahawk.enableTelepathy or false; + }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; }; @@ -9904,8 +12047,12 @@ let tree = callPackage ../tools/system/tree {}; + trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; + twister = callPackage ../applications/networking/p2p/twister { }; twmn = callPackage ../applications/misc/twmn { }; @@ -9919,6 +12066,8 @@ let enableX11 = config.unison.enableX11 or true; }; + unpaper = callPackage ../tools/graphics/unpaper { }; + uucp = callPackage ../tools/misc/uucp { }; uvccapture = callPackage ../applications/video/uvccapture { }; @@ -9929,14 +12078,20 @@ let webkit = webkitgtk2; }; - uTox = callPackage ../applications/networking/instant-messengers/utox { }; + utox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { }; + vanubi = callPackage ../applications/editors/vanubi { vala = vala_0_26; }; + vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { }; + vdirsyncer = callPackage ../tools/misc/vdirsyncer { + pythonPackages = python3Packages; + }; + vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; veracity = callPackage ../applications/version-management/veracity {}; @@ -9950,36 +12105,35 @@ let vim = callPackage ../applications/editors/vim { }; - macvim = callPackage ../applications/editors/vim/macvim.nix { }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; - vim_configurable = callPackage ../applications/editors/vim/configurable.nix { + vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { 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; features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; + lua = pkgs.lua5_1; gui = config.vim.gui or "auto"; # optional features by flags flags = [ "python" "X11" ]; # only flag "X11" by now - - # so that we can use gccApple if we're building on darwin - inherit stdenvAdapters gccApple; - }; + }); vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); + qpdfview = callPackage ../applications/misc/qpdfview {}; + 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; + inherit (pkgs) stdenvAdapters; features = "huge"; # one of tiny, small, normal, big or huge lua = pkgs.lua5; @@ -9988,6 +12142,10 @@ let vimpc = callPackage ../applications/audio/vimpc { }; + neovim = callPackage ../applications/editors/neovim { + inherit (lua52Packages) lpeg luaMessagePack luabitop; + }; + virtviewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; @@ -10004,13 +12162,47 @@ let virtualgl = callPackage ../tools/X11/virtualgl { }; - bumblebee = callPackage ../tools/X11/bumblebee { }; + primus = callPackage ../tools/X11/primus { + primusLib = callPackage ../tools/X11/primus/lib.nix { + nvidia = linuxPackages.nvidia_x11; + }; + + primusLib_i686 = if system == "x86_64-linux" + then callPackage_i686 ../tools/X11/primus/lib.nix { + nvidia = pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }; + } + else null; + }; + + bumblebee = callPackage ../tools/X11/bumblebee { + nvidia_x11 = linuxPackages.nvidia_x11; + nvidia_x11_i686 = if system == "x86_64-linux" + then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } + else null; + virtualgl = virtualgl; + virtualgl_i686 = if system == "x86_64-linux" + then pkgsi686Linux.virtualgl + else null; + }; + + # use if you intend to connect the nvidia card to a monitor + bumblebee_display = bumblebee.override { + useDisplayDevice = true; + }; vkeybd = callPackage ../applications/audio/vkeybd { inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { }; + vlc = callPackage ../applications/video/vlc { + ffmpeg = ffmpeg_2; + }; + + vlc_qt5 = vlc.override { + qt4 = null; + withQt5 = true; + inherit qt5; + }; vmpk = callPackage ../applications/audio/vmpk { }; @@ -10018,9 +12210,7 @@ let vorbisTools = callPackage ../applications/audio/vorbis-tools { }; - vue = callPackage ../applications/misc/vue { - jre = icedtea7_jre; - }; + vue = callPackage ../applications/misc/vue { }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -10032,12 +12222,30 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; - weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); + westonLite = callPackage ../applications/window-managers/weston { + pango = null; + freerdp = null; + libunwind = null; + vaapi = null; + libva = null; + libwebp = null; + xwayland = null; + }; - weston = callPackage ../applications/window-managers/weston { }; + weston = callPackage ../applications/window-managers/weston { + freerdp = freerdpUnstable; + }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; + + wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; + + wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; + + wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; + winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { @@ -10065,11 +12273,9 @@ let wordnet = callPackage ../applications/misc/wordnet { }; - wrapChromium = browser: wrapFirefox { - inherit browser; - browserName = browser.packageName; - desktopName = "Chromium"; - icon = "${browser}/share/icons/hicolor/48x48/apps/${browser.packageName}.png"; + workrave = callPackage ../applications/misc/workrave { + inherit (gnome) GConf gconfmm; + inherit (python27Packages) cheetah; }; wrapFirefox = @@ -10079,29 +12285,90 @@ let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; enableGnash = cfg.enableGnash or false; + jre = cfg.jre or false; + icedtea = cfg.icedtea or false; in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; + libtrick = true; plugins = assert !(enableGnash && enableAdobeFlash); + assert !(jre && icedtea); ([ ] ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer - ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional icedtea icedtea_web ++ 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 + ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); + (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; + retroArchCores = + let + cfg = config.retroarch or {}; + inherit (lib) optional; + in with libretro; + ([ ] + ++ optional (cfg.enable4do or false) _4do + ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury + ++ optional (cfg.enableDesmume or false) desmume + ++ optional (cfg.enableFBA or false) fba + ++ optional (cfg.enableFceumm or false) fceumm + ++ optional (cfg.enableGambatte or false) gambatte + ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx + ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast + ++ optional (cfg.enableMupen64Plus or false) mupen64plus + ++ optional (cfg.enableNestopia or false) nestopia + ++ optional (cfg.enablePicodrive or false) picodrive + ++ optional (cfg.enablePrboom or false) prboom + ++ optional (cfg.enablePPSSPP or false) ppsspp + ++ optional (cfg.enableQuickNES or false) quicknes + ++ optional (cfg.enableScummVM or false) scummvm + ++ optional (cfg.enableSnes9x or false) snes9x + ++ optional (cfg.enableSnes9xNext or false) snes9x-next + ++ optional (cfg.enableStella or false) stella + ++ optional (cfg.enableVbaNext or false) vba-next + ++ optional (cfg.enableVbaM or false) vba-m + ); + + wrapRetroArch = { retroarch }: import ../misc/emulators/retroarch/wrapper.nix { + inherit stdenv lib makeWrapper retroarch; + cores = retroArchCores; + }; + + wrapKodi = { kodi }: import ../applications/video/kodi/wrapper.nix { + inherit stdenv lib makeWrapper kodi; + plugins = let inherit (lib) optional; in with kodiPlugins; + ([] + ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher + ++ optional (config.kodi.enableGenesis or false) genesis + ++ optional (config.kodi.enableSVTPlay or false) svtplay + ); + }; + + wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; + + wxcam = callPackage ../applications/video/wxcam { + inherit (gnome) libglade; + inherit intltool; + wxGTK = wxGTK28; + gtk = gtk2; + }; + x11vnc = callPackage ../tools/X11/x11vnc { }; + x2goclient = callPackage ../applications/networking/remote/x2goclient { }; + x2vnc = callPackage ../tools/X11/x2vnc { }; xaos = builderDefsPackage (import ../applications/graphics/xaos) { @@ -10116,9 +12383,28 @@ let xbindkeys = callPackage ../tools/X11/xbindkeys { }; - xbmc = callPackage ../applications/video/xbmc { - ffmpeg = ffmpeg_1; + xbindkeys-config = callPackage ../tools/X11/xbindkeys-config/default.nix { + gtk = gtk2; + }; + + kodiPlain = callPackage ../applications/video/kodi { }; + xbmcPlain = kodiPlain; + + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { + kodi = kodiPlain; + }); + xbmcPlugins = kodiPlugins; + + kodi = wrapKodi { + kodi = kodiPlain; }; + xbmc = kodi; + + kodi-retroarch-advanced-launchers = + callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { + cores = retroArchCores; + }; + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; @@ -10144,9 +12430,10 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { - stdenv = overrideGCC stdenv gcc45; - }; + xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { }; + xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; + xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; + xen = xen_4_5_0; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; @@ -10166,6 +12453,13 @@ let inherit (gnome) libglade GConf; }; + xiphos = callPackage ../applications/misc/xiphos { + gconf = gnome2.GConf; + inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper; + python = python27; + webkitgtk = webkitgtk2; + }; + xournal = callPackage ../applications/graphics/xournal { inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; }; @@ -10177,9 +12471,40 @@ let xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + + xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { + inherit (haskellngPackages) ghcWithPackages; + packages = self: []; + }; + + xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { + desktopSupport = "gnome2"; + inherit (xfce) libxfce4util xfce4panel; + gnome2_panel = gnome2.gnome_panel; + GConf2 = gnome2.GConf; + }; + + xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet { + desktopSupport = "gnome3"; + inherit (xfce) libxfce4util xfce4panel; + gnome2_panel = gnome2.gnome_panel; + GConf2 = gnome2.GConf; + }; + + xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet { + desktopSupport = "xfce4"; + inherit (xfce) libxfce4util xfce4panel; + gnome2_panel = gnome2.gnome_panel; + GConf2 = gnome2.GConf; + }; + libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { }; + xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { inherit (xlibs) libXinerama; }; + #TODO: 'pil' is not available for python3, yet + xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; }; xrestop = callPackage ../tools/X11/xrestop { }; @@ -10187,12 +12512,19 @@ let inherit (gnome) libglade; }; + xss-lock = callPackage ../misc/screensavers/xss-lock { }; + xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; xterm = callPackage ../applications/misc/xterm { }; finalterm = callPackage ../applications/misc/finalterm { }; + roxterm = callPackage ../applications/misc/roxterm { + inherit (pythonPackages) lockfile; + inherit (gnome3) vte gsettings_desktop_schemas; + }; + xtrace = callPackage ../tools/X11/xtrace { }; xlaunch = callPackage ../tools/X11/xlaunch { }; @@ -10203,10 +12535,7 @@ let xmp = callPackage ../applications/audio/xmp { }; - xnee = callPackage ../tools/X11/xnee { - # Work around "missing separator" error. - stdenv = overrideInStdenv stdenv [ gnumake381 ]; - }; + xnee = callPackage ../tools/X11/xnee { }; xvidcap = callPackage ../applications/video/xvidcap { inherit (gnome) scrollkeeper libglade; @@ -10216,9 +12545,13 @@ let inherit (gnome3) yelp; - qgis = callPackage ../applications/misc/qgis {}; + qgis = callPackage ../applications/gis/qgis {}; + + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { + qt = qt4; + }; - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + yed = callPackage ../applications/graphics/yed {}; ykpers = callPackage ../applications/misc/ykpers {}; @@ -10230,6 +12563,7 @@ let (let callPackage = newScope pkgs.zathuraCollection; in import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; + stdenv = overrideCC stdenv gcc49; useMupdf = config.zathura.useMupdf or false; }); @@ -10239,18 +12573,28 @@ let zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + girara = callPackage ../applications/misc/girara { gtk = gtk3; + stdenv = overrideCC stdenv gcc49; + }; + + girara-light = callPackage ../applications/misc/girara { + gtk = gtk3; + withBuildColors = false; + ncurses = null; }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; - zotero = callPackage ../applications/office/zotero { - xulrunner = xulrunner_30; + zim = callPackage ../applications/office/zim { + pygtk = pyGtkGlade; }; - zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + zotero = callPackage ../applications/office/zotero {}; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; ### GAMES @@ -10261,7 +12605,7 @@ let anki = callPackage ../games/anki { }; asc = callPackage ../games/asc { - lua = lua5; + lua = lua5_1; libsigcxx = libsigcxx12; }; @@ -10319,20 +12663,6 @@ 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 { }; @@ -10347,6 +12677,8 @@ let exult = callPackage ../games/exult { }; + fairymax = callPackage ../games/fairymax {}; + flightgear = callPackage ../games/flightgear { }; freeciv = callPackage ../games/freeciv { }; @@ -10368,27 +12700,32 @@ let glestae = callPackage ../games/glestae {}; - globulation2 = callPackage ../games/globulation {}; + globulation2 = callPackage ../games/globulation { + boost = boost155; + }; gltron = callPackage ../games/gltron { }; + gnubg = callPackage ../games/gnubg { }; + gnuchess = callPackage ../games/gnuchess { }; gnugo = callPackage ../games/gnugo { }; - gparted = callPackage ../tools/misc/gparted { }; + gtypist = callPackage ../games/gtypist { }; - gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { - inherit (gnome) libglademm; + hedgewars = callPackage ../games/hedgewars { + inherit (haskellPackages) ghc network vector utf8String bytestringShow + random hslogger dataenc; }; - gtypist = callPackage ../games/gtypist { }; - hexen = callPackage ../games/hexen { }; icbm3d = callPackage ../games/icbm3d { }; - ingen = callPackage ../applications/audio/ingen { }; + ingen = callPackage ../applications/audio/ingen { + inherit (pythonPackages) rdflib; + }; instead = callPackage ../games/instead { lua = lua5; @@ -10406,12 +12743,16 @@ let mars = callPackage ../games/mars { }; + megaglest = callPackage ../games/megaglest {}; + micropolis = callPackage ../games/micropolis { }; mnemosyne = callPackage ../games/mnemosyne { inherit (pythonPackages) matplotlib cherrypy sqlite3; }; + n2048 = callPackage ../games/n2048 {}; + naev = callPackage ../games/naev { }; nexuiz = callPackage ../games/nexuiz { }; @@ -10420,7 +12761,7 @@ let oilrush = callPackage ../games/oilrush { }; - openra = callPackage ../games/openra { }; + openra = callPackage ../games/openra { lua = lua5_1; }; openttd = callPackage ../games/openttd { zlib = zlibStatic; @@ -10430,6 +12771,8 @@ let openxcom = callPackage ../games/openxcom { }; + performous = callPackage ../games/performous { }; + pingus = callPackage ../games/pingus {}; pioneers = callPackage ../games/pioneers { }; @@ -10465,6 +12808,8 @@ let rogue = callPackage ../games/rogue { }; + saga = callPackage ../applications/gis/saga { }; + samplv1 = callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -10483,23 +12828,25 @@ let }; simutrans = callPackage ../games/simutrans { }; + # get binaries without data built by Hydra + simutrans_binaries = lowPrio simutrans.binaries; soi = callPackage ../games/soi {}; # You still can override by passing more arguments. spaceOrbit = callPackage ../games/orbit { }; - spring = callPackage ../games/spring { }; + spring = callPackage ../games/spring { + boost = boost155; + }; springLobby = callPackage ../games/spring/springlobby.nix { }; stardust = callPackage ../games/stardust {}; - steam = callPackage_i686 ../games/steam {}; + steam-original = callPackage ../games/steam { }; - steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix { - zenity = gnome2.zenity; - }; + steam = callPackage ../games/steam/chrootenv.nix { }; stuntrally = callPackage ../games/stuntrally { }; @@ -10509,7 +12856,11 @@ let synthv1 = callPackage ../applications/audio/synthv1 { }; - tbe = callPackage ../games/the-butterfly-effect {}; + the-powder-toy = callPackage ../games/the-powder-toy { + lua = lua5_1; + }; + + tbe = callPackage ../games/the-butterfly-effect { }; teetertorture = callPackage ../games/teetertorture { }; @@ -10517,7 +12868,7 @@ let tennix = callPackage ../games/tennix { }; - tibia = callPackage ../games/tibia { }; + tibia = callPackage_i686 ../games/tibia { }; tintin = callPackage ../games/tintin { }; @@ -10547,7 +12898,7 @@ let ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastardx = callPackage ../games/ultrastardx { - ffmpeg = ffmpeg_0_6; + ffmpeg = ffmpeg_0_10; lua = lua5; }; @@ -10557,6 +12908,8 @@ let urbanterror = callPackage ../games/urbanterror { }; + ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); + ut2004demo = callPackage ../games/ut2004demo { }; vdrift = callPackage ../games/vdrift { }; @@ -10594,6 +12947,8 @@ let xskat = callPackage ../games/xskat { }; + xsnow = callPackage ../games/xsnow { }; + xsokoban = builderDefsPackage (import ../games/xsokoban) { inherit (xlibs) libX11 xproto libXpm libXt; }; @@ -10629,16 +12984,13 @@ let cjs = callPackage ../desktops/cinnamon/cjs.nix { }; }; - enlightenment = callPackage ../desktops/enlightenment { }; + clearlooks-phenix = callPackage ../misc/themes/gtk3/clearlooks-phenix { }; - e17 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e17; in - import ../desktops/e17 { inherit callPackage pkgs; } - ); + enlightenment = callPackage ../desktops/enlightenment { }; - e18 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e18; in - import ../desktops/e18 { inherit callPackage pkgs; } + e19 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e19; in + import ../desktops/e19 { inherit callPackage pkgs; } ); gnome2 = callPackage ../desktops/gnome-2 { @@ -10649,176 +13001,220 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - 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; }); + gnome3 = gnome3_12; + gnome = recurseIntoAttrs gnome2; hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs pkgs.kde412; + kde4 = recurseIntoAttrs pkgs.kde414; - kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 ); + kde414 = + kdePackagesFor + { + libusb = libusb1; + libcanberra = libcanberra_kde; + boost = boost156; + kdelibs = kdeApps_stable.kdelibs; + } + ../desktops/kde-4.14; - kde412 = kdePackagesFor (pkgs.kde412 // { - eigen = eigen2; - libusb = libusb1; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.12; - kdePackagesFor = self: dir: - let callPackageOrig = callPackage; in + kdePackagesFor = extra: dir: let - callPackage = newScope self; - kde4 = callPackageOrig dir { - inherit callPackage callPackageOrig; - }; - in kde4 // { - inherit kde4; + # list of extra packages not included in KDE + # the real work in this function is done below this list + extraPackages = callPackage: + rec { + amarok = callPackage ../applications/audio/amarok { }; - wrapper = callPackage ../build-support/kdewrapper {}; + bangarang = callPackage ../applications/video/bangarang { }; - recurseForRelease = true; + basket = callPackage ../applications/office/basket { }; - akunambol = callPackage ../applications/networking/sync/akunambol { }; + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - amarok = callPackage ../applications/audio/amarok { }; + calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; - bangarang = callPackage ../applications/video/bangarang { }; + choqok = callPackage ../applications/networking/instant-messengers/choqok { }; - basket = callPackage ../applications/office/basket { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; - bluedevil = callPackage ../tools/bluetooth/bluedevil { }; + digikam = if builtins.compareVersions "4.9" kde4.release == 1 then + callPackage ../applications/graphics/digikam/2.nix { } + else + callPackage ../applications/graphics/digikam { }; - calligra = callPackage ../applications/office/calligra { }; + eventlist = callPackage ../applications/office/eventlist {}; - colord-kde = callPackage ../tools/misc/colord-kde { }; + k3b = callPackage ../applications/misc/k3b { + cdrtools = cdrkit; + }; - digikam = if builtins.compareVersions "4.9" kde4.release == 1 then - callPackage ../applications/graphics/digikam/2.nix { } - else - callPackage ../applications/graphics/digikam { }; + kadu = callPackage ../applications/networking/instant-messengers/kadu { }; - eventlist = callPackage ../applications/office/eventlist {}; + kbibtex = callPackage ../applications/office/kbibtex { }; - k3b = callPackage ../applications/misc/k3b { }; + kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; - kadu = callPackage ../applications/networking/instant-messengers/kadu { }; + kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - kbibtex = callPackage ../applications/office/kbibtex { }; + kdeconnect = callPackage ../applications/misc/kdeconnect { }; - kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; + kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; - kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + kdesvn = callPackage ../applications/version-management/kdesvn { }; - kdeconnect = callPackage ../applications/misc/kdeconnect { }; + kdevelop = callPackage ../applications/editors/kdevelop { }; - kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; + kdevplatform = callPackage ../development/libraries/kdevplatform { + boost = boost156; + }; - kdesvn = callPackage ../applications/version-management/kdesvn { }; + kdiff3 = callPackage ../tools/text/kdiff3 { }; - kdevelop = callPackage ../applications/editors/kdevelop { }; + kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; - kdevplatform = callPackage ../development/libraries/kdevplatform { }; + kile = callPackage ../applications/editors/kile { }; - kdiff3 = callPackage ../tools/text/kdiff3 { }; + kmplayer = callPackage ../applications/video/kmplayer { }; - kile = callPackage ../applications/editors/kile { }; + kmymoney = callPackage ../applications/office/kmymoney { }; - kmplayer = callPackage ../applications/video/kmplayer { }; + kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; - kmymoney = callPackage ../applications/office/kmymoney { }; + konversation = callPackage ../applications/networking/irc/konversation { }; - kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; + kvirc = callPackage ../applications/networking/irc/kvirc { }; - konversation = callPackage ../applications/networking/irc/konversation { }; + krename = callPackage ../applications/misc/krename { }; - kvirc = callPackage ../applications/networking/irc/kvirc { }; + krusader = callPackage ../applications/misc/krusader { }; - krename = callPackage ../applications/misc/krename { }; + ksshaskpass = callPackage ../tools/security/ksshaskpass {}; - krusader = callPackage ../applications/misc/krusader { }; + ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; - ksshaskpass = callPackage ../tools/security/ksshaskpass {}; + kuickshow = callPackage ../applications/graphics/kuickshow { }; - ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; + libalkimia = callPackage ../development/libraries/libalkimia { }; - kuickshow = callPackage ../applications/graphics/kuickshow { }; + libktorrent = callPackage ../development/libraries/libktorrent { + boost = boost156; + }; - libalkimia = callPackage ../development/libraries/libalkimia { }; + libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; + liblikeback = callPackage ../development/libraries/liblikeback { }; - libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; + libmm-qt = callPackage ../development/libraries/libmm-qt { }; - liblikeback = callPackage ../development/libraries/liblikeback { }; + libnm-qt = callPackage ../development/libraries/libnm-qt { }; - libmm-qt = callPackage ../development/libraries/libmm-qt { }; + massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; - libnm-qt = callPackage ../development/libraries/libnm-qt { }; + networkmanagement = callPackage ../tools/networking/networkmanagement { }; - networkmanagement = callPackage ../tools/networking/networkmanagement { }; + partitionManager = callPackage ../tools/misc/partition-manager { }; - partitionManager = callPackage ../tools/misc/partition-manager { }; + plasma-nm = callPackage ../tools/networking/plasma-nm { }; - plasma-nm = callPackage ../tools/networking/plasma-nm { }; + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; + qtcurve = callPackage ../misc/themes/qtcurve { }; - qtcurve = callPackage ../misc/themes/qtcurve { }; + quassel = callPackage ../applications/networking/irc/quassel rec { + monolithic = true; + daemon = false; + client = false; + withKDE = stdenv.isLinux; + qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0) + dconf = gnome3.dconf; + }; - quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; }; + quasselWithoutKDE = (quassel.override { + monolithic = true; + daemon = false; + client = false; + withKDE = false; + #qt = qt5; + tag = "-without-kde"; + }); - quasselWithoutKDE = (self.quassel.override { - withKDE = false; - tag = "-without-kde"; - }); + quasselDaemon = (quassel.override { + monolithic = false; + daemon = true; + client = false; + withKDE = false; + #qt = qt5; + tag = "-daemon"; + }); - quasselDaemon = (self.quassel.override { - monolithic = false; - daemon = true; - tag = "-daemon"; - }); + quasselClient = (quassel.override { + monolithic = false; + daemon = false; + client = true; + tag = "-client"; + }); - quasselClient = (self.quassel.override { - monolithic = false; - client = true; - tag = "-client"; - }); + quasselClientWithoutKDE = (quasselClient.override { + monolithic = false; + daemon = false; + client = true; + withKDE = false; + #qt = qt5; + tag = "-client-without-kde"; + }); - quasselClientWithoutKDE = (self.quasselClient.override { - withKDE = false; - tag = "-client-without-kde"; - }); + rekonq = callPackage ../applications/networking/browsers/rekonq { }; - rekonq = callPackage ../applications/networking/browsers/rekonq { }; + kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; - kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; + rsibreak = callPackage ../applications/misc/rsibreak { }; - rsibreak = callPackage ../applications/misc/rsibreak { }; + semnotes = callPackage ../applications/misc/semnotes { }; - semnotes = callPackage ../applications/misc/semnotes { }; + skrooge = callPackage ../applications/office/skrooge { }; - skrooge = callPackage ../applications/office/skrooge { }; + telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; + yakuake = callPackage ../applications/misc/yakuake { }; - yakuake = callPackage ../applications/misc/yakuake { }; + zanshin = callPackage ../applications/office/zanshin { }; - zanshin = callPackage ../applications/office/zanshin { }; + kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; + }; - kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; - }; + callPackageOrig = newScope extra; + + makePackages = extra: + let + callPackage = newScope (extra // self); + kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; + self = + kde4 + // extraPackages callPackage + // { + inherit kde4; + wrapper = callPackage ../build-support/kdewrapper {}; + recurseForRelease = true; + }; + in self; + + in makeOverridable makePackages extra; + + pantheon = recurseIntoAttrs rec { + callPackage = newScope pkgs.pantheon; + pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; + }; redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm @@ -10828,7 +13224,13 @@ let geoclue = geoclue2; }; - oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; + orion = callPackage ../misc/themes/orion {}; + + oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { }; + + oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { }; + + oxygen_gtk = oxygen-gtk2; # backwards compatibility gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; @@ -10840,9 +13242,20 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; - xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); + numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; + + plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { + kf5 = kf59; + }); + plasma5_latest = plasma52; + plasma5_stable = plasma52; + + kde5 = kf5_stable // plasma5_stable // kdeApps_stable; + xfce = xfce4-12; + xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + + xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE @@ -10869,8 +13282,6 @@ let archimedes = callPackage ../applications/science/electronics/archimedes { }; - biolib = callPackage ../development/libraries/science/biology/biolib { }; - emboss = callPackage ../applications/science/biology/emboss { }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -10900,8 +13311,12 @@ let # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; + liblapack = liblapack_3_5_0; + withLapack = false; }; + atlasWithLapack = atlas.override { withLapack = true; }; + blas = callPackage ../development/libraries/science/math/blas { }; content = builderDefsPackage ../applications/science/math/content { @@ -10917,15 +13332,27 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - openblas = callPackage ../development/libraries/science/math/openblas { }; - openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { + # julia is pinned to specific versions of openblas, so keep old versions + # until they aren't needed. The un-versioned attribute may continue to track + # upstream development. + openblas = callPackage ../development/libraries/science/math/openblas { liblapack = liblapack_3_5_0; }; + openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { + liblapack = liblapack_3_5_0; + }; + openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { }; mathematica = callPackage ../applications/science/math/mathematica { }; + mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; sage = callPackage ../applications/science/math/sage { }; + suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; + suitesparse_4_4_1 = callPackage ../development/libraries/science/math/suitesparse {}; + + ipopt = callPackage ../development/libraries/science/math/ipopt { }; + ### SCIENCE/MOLECULAR-DYNAMICS gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { @@ -10940,16 +13367,21 @@ let cmake = cmakeCurses; }); + ### SCIENCE/PROGRAMMING + + plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC abc-verifier = callPackage ../applications/science/logic/abc {}; + abella = callPackage ../applications/science/logic/abella {}; + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; coq = callPackage ../applications/science/logic/coq { - inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_01_0.camlp5_transitional; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { @@ -10958,11 +13390,55 @@ let }; coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + inherit (ocamlPackages_3_12_1) ocaml findlib; + camlp5 = ocamlPackages_3_12_1.camlp5_transitional; + lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; }; + mkCoqPackages_8_4 = self: let callPackage = newScope self; in { + + bedrock = callPackage ../development/coq-modules/bedrock {}; + + contribs = + let contribs = + import ../development/coq-modules/contribs + contribs + callPackage { }; + in + recurseIntoAttrs contribs; + + coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; + + coqeal = callPackage ../development/coq-modules/coqeal {}; + + domains = callPackage ../development/coq-modules/domains {}; + + fiat = callPackage ../development/coq-modules/fiat {}; + + flocq = callPackage ../development/coq-modules/flocq {}; + + heq = callPackage ../development/coq-modules/heq {}; + + interval = callPackage ../development/coq-modules/interval {}; + + mathcomp = callPackage ../development/coq-modules/mathcomp {}; + + paco = callPackage ../development/coq-modules/paco {}; + + ssreflect = callPackage ../development/coq-modules/ssreflect {}; + + tlc = callPackage ../development/coq-modules/tlc {}; + + unimath = callPackage ../development/coq-modules/unimath {}; + + ynot = callPackage ../development/coq-modules/ynot {}; + + }; + + coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages); + cvc3 = callPackage ../applications/science/logic/cvc3 {}; + cvc4 = callPackage ../applications/science/logic/cvc4 {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; @@ -10986,10 +13462,13 @@ let isabelle = import ../applications/science/logic/isabelle { inherit (pkgs) stdenv fetchurl nettools perl polyml; inherit (pkgs.emacs24Packages) proofgeneral; + java = if stdenv.isLinux then jre else jdk; }; iprover = callPackage ../applications/science/logic/iprover {}; + lean = callPackage ../applications/science/logic/lean {}; + leo2 = callPackage ../applications/science/logic/leo2 {}; logisim = callPackage ../applications/science/logic/logisim {}; @@ -11000,7 +13479,7 @@ let ocaml = ocaml_3_11_2; inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet camlzip ocaml_pcre; - ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_5_transitional; }; + ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_old_transitional; }; }; matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix { @@ -11012,13 +13491,17 @@ let opensmt = callPackage ../applications/science/logic/opensmt { }; + ott = callPackage ../applications/science/logic/ott { + camlp5 = ocamlPackages.camlp5_transitional; + }; + otter = callPackage ../applications/science/logic/otter {}; picosat = callPackage ../applications/science/logic/picosat {}; prooftree = callPackage ../applications/science/logic/prooftree { - inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_01_0.camlp5_transitional; }; prover9 = callPackage ../applications/science/logic/prover9 { }; @@ -11027,10 +13510,6 @@ let spass = callPackage ../applications/science/logic/spass {}; - ssreflect = callPackage ../applications/science/logic/ssreflect { - camlp5 = ocamlPackages.camlp5_transitional; - }; - tptp = callPackage ../applications/science/logic/tptp {}; twelf = callPackage ../applications/science/logic/twelf { @@ -11041,6 +13520,8 @@ let verifast = callPackage ../applications/science/logic/verifast {}; + veriT = callPackage ../applications/science/logic/verit {}; + why3 = callPackage ../applications/science/logic/why3 {}; yices = callPackage ../applications/science/logic/yices {}; @@ -11090,6 +13571,8 @@ let pari = callPackage ../applications/science/math/pari {}; + pcalc = callPackage ../applications/science/math/pcalc { }; + pspp = callPackage ../applications/science/math/pssp { inherit (gnome) libglade gtksourceview; }; @@ -11150,10 +13633,44 @@ let tulip = callPackage ../applications/science/misc/tulip { }; - vite = callPackage ../applications/science/misc/vite { }; + vite = enableDebugging (callPackage ../applications/science/misc/vite { }); xplanet = callPackage ../applications/science/astronomy/xplanet { }; + ### SCIENCE / PHYSICS + + geant4 = callPackage ../development/libraries/physics/geant4 { + enableMultiThreading = true; + enableG3toG4 = false; + enableInventor = false; + enableGDML = false; + enableQT = false; + enableXM = false; + enableOpenGLX11 = true; + enableRaytracerX11 = false; + + # Optional system packages, otherwise internal GEANT4 packages are used. + clhep = null; + expat = expat; + zlib = null; + + # For enableGDML. + xercesc = null; + + # For enableQT. + qt = null; # qt4SDK or qt5SDK + + # For enableXM. + motif = null; # motif or lesstif + + # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. + mesa = mesa; + x11 = x11; + inherit (xlibs) libXmu; + }; + + g4py = callPackage ../development/libraries/physics/geant4/g4py { }; + ### MISC atari800 = callPackage ../misc/emulators/atari800 { }; @@ -11166,7 +13683,9 @@ let cups = callPackage ../misc/cups { libusb = libusb1; }; - cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; + cups_filters = callPackage ../misc/cups/filters.nix { }; + + crashplan = callPackage ../applications/backup/crashplan { }; gutenprint = callPackage ../misc/drivers/gutenprint { }; @@ -11198,6 +13717,22 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + faust = callPackage ../applications/audio/faust { }; + + faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; + + faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { }; + + faust2csound = callPackage ../applications/audio/faust/faust2csound.nix { }; + + faust2firefox = callPackage ../applications/audio/faust/faust2firefox.nix { }; + + faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { }; + + faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; + + faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; + fceux = callPackage ../misc/emulators/fceux { }; foldingathome = callPackage ../misc/foldingathome { }; @@ -11217,7 +13752,6 @@ let ghostscript = callPackage ../misc/ghostscript { x11Support = false; cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); - gnuFork = config.ghostscript.gnu or false; }; ghostscriptX = appendToName "with-X" (ghostscript.override { @@ -11245,10 +13779,9 @@ let lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - martyr = callPackage ../development/libraries/martyr { }; + mailcore2 = callPackage ../development/libraries/mailcore2 { }; - maven = maven3; - maven3 = callPackage ../misc/maven { jdk = openjdk; }; + martyr = callPackage ../development/libraries/martyr { }; mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome) GConf; @@ -11272,10 +13805,25 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; + + nixui = callPackage ../tools/package-management/nixui { node_webkit = node_webkit_0_11; }; + nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; + nix-repl = callPackage ../tools/package-management/nix-repl { }; + nix-serve = callPackage ../tools/package-management/nix-serve { }; + + # Remember to check the default lightdm wallpaper + nixos-artwork = fetchgit { + url = "git://github.com/NixOS/nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -11305,7 +13853,8 @@ let lkproof = callPackage ../tools/typesetting/tex/lkproof { }; mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { - lua = lua5; + lua = lua5_1; + libctemplate = libctemplate_2_2; inherit (pythonPackages) pexpect paramiko; }; @@ -11313,6 +13862,8 @@ let opkg = callPackage ../tools/package-management/opkg { }; + opkg-utils = callPackage ../tools/package-management/opkg-utils { }; + pgadmin = callPackage ../applications/misc/pgadmin { }; pgf = pgf2; @@ -11323,8 +13874,14 @@ let pgf2 = callPackage ../tools/typesetting/tex/pgf/2.x.nix { }; + pgf3 = callPackage ../tools/typesetting/tex/pgf/3.x.nix { }; + pgfplots = callPackage ../tools/typesetting/tex/pgfplots { }; + phabricator = callPackage ../misc/phabricator { }; + + physlock = callPackage ../misc/screensavers/physlock { }; + pjsip = callPackage ../applications/networking/pjsip { }; polytable = callPackage ../tools/typesetting/tex/polytable { }; @@ -11333,14 +13890,28 @@ let uae = callPackage ../misc/emulators/uae { }; + fsuae = callPackage ../misc/emulators/fs-uae { }; + putty = callPackage ../applications/networking/remote/putty { }; - retroarch = callPackage ../misc/emulators/retroarch { }; + retroarchBare = callPackage ../misc/emulators/retroarch { }; + + retroarch = wrapRetroArch { retroarch = retroarchBare; }; + + libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + retroarch = retroarchBare; + }); + + rss-glx = callPackage ../misc/screensavers/rss-glx { }; - rssglx = callPackage ../misc/screensavers/rss-glx { }; + runit = callPackage ../tools/system/runit { }; + + refind = callPackage ../tools/bootloaders/refind { }; xlockmore = callPackage ../misc/screensavers/xlockmore { }; + sails = callPackage ../misc/sails { }; + samsungUnifiedLinuxDriver = import ../misc/cups/drivers/samsung { inherit fetchurl stdenv; inherit cups ghostscript glibc patchelf; @@ -11372,6 +13943,8 @@ let slock = callPackage ../misc/screensavers/slock { }; + soundOfSorting = callPackage ../misc/sound-of-sorting { }; + sourceAndTags = import ../misc/source-and-tags { inherit pkgs stdenv unzip lib ctags; hasktags = haskellPackages.hasktags; @@ -11393,7 +13966,7 @@ let 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 libpaper graphite2 - makeWrapper; + makeWrapper gmp mpfr xpdf; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; @@ -11405,7 +13978,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo - texLiveModerntimeline ]; + texLiveModerntimeline texLiveContext ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -11462,6 +14035,10 @@ let thinkfan = callPackage ../tools/system/thinkfan { }; + tup = callPackage ../development/tools/build-managers/tup { }; + + utf8proc = callPackage ../development/libraries/utf8proc { }; + vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; giflib = giflib_4_1; @@ -11469,6 +14046,8 @@ let viewnior = callPackage ../applications/graphics/viewnior { }; + vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { inherit writeText; }; + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { @@ -11479,6 +14058,10 @@ let { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2"; }; + rekonqWrapper = wrapFirefox { + browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq"; + }; + vimb = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; }; @@ -11489,6 +14072,9 @@ let desktopName = "Vimb"; }; + vips = callPackage ../tools/graphics/vips { }; + nip2 = callPackage ../tools/graphics/nip2 { }; + VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # Wine cannot be built in 64-bit; use a 32-bit build instead. @@ -11506,6 +14092,8 @@ let inherit (gnome2) zenity; }; + wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; x2x = callPackage ../tools/X11/x2x { }; @@ -11523,10 +14111,18 @@ let saneBackends = saneBackends; }; + xwiimote = callPackage ../misc/drivers/xwiimote { + bluez = pkgs.bluez5.override { + enableWiimote = true; + }; + }; + yafc = callPackage ../applications/networking/yafc { }; yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; + zdfmediathk = callPackage ../applications/video/zdfmediathk { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; @@ -11547,7 +14143,7 @@ let # this is to circumvent the bug with libgcc_s.so.1 which is # not found when using thread extraCmds = '' - LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib + LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.cc}/lib export LD_LIBRARY_PATH ''; }; @@ -11564,6 +14160,11 @@ let snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + higan = callPackage ../misc/emulators/higan { + profile = config.higan.profile or "performance"; + guiToolkit = config.higan.guiToolkit or "gtk"; + }; + misc = import ../misc/misc.nix { inherit pkgs stdenv; }; bullet = callPackage ../development/libraries/bullet {}; @@ -11577,9 +14178,26 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; + arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 + bridge_utils = bridge-utils; # added 2015-02-20 + clangAnalyzer = clang-analyzer; # added 2015-02-20 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 + jquery_ui = jquery-ui; # added 2014-09-07 + youtubeDL = youtube-dl; # added 2014-10-26 + rdiff_backup = rdiff-backup; # added 2014-11-23 + htmlTidy = html-tidy; # added 2014-12-06 + speedtest_cli = speedtest-cli; # added 2015-02-17 + sqliteInteractive = sqlite-interactive; # added 2014-12-06 + nfsUtils = nfs-utils; # added 2014-12-06 + buildbotSlave = buildbot-slave; # added 2014-12-09 + cool-old-term = cool-retro-term; # added 2015-01-31 + rssglx = rss-glx; #added 2015-03-25 + + + opentsdb = callPackage ../tools/misc/opentsdb {}; + hbase = callPackage ../servers/hbase {}; }; in self; in pkgs |