diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 692 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 449 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 971 | ||||
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/node-packages-generated.nix | 2582 | ||||
| -rw-r--r-- | pkgs/top-level/node-packages.json | 9 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 72 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 349 | ||||
| -rw-r--r-- | pkgs/top-level/r-packages.nix | 244 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/release-python.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 4 |
13 files changed, 2887 insertions, 2525 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fe1e91df848..63c2e6a6cd8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -270,7 +270,7 @@ let 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; + inherit less su buildEnv; }; dotnetenv = import ../build-support/dotnetenv { @@ -303,10 +303,32 @@ let inherit stdenv git cacert; }; + fetchgitPrivate = args: derivation ((fetchgit args).drvAttrs // { + SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success + then builtins.toString <ssh-auth-sock> + else null; + GIT_SSH = pkgs.writeScript "fetchgit-ssh" '' + #! ${pkgs.stdenv.shell} + exec -a ssh ${pkgs.openssh}/bin/ssh -F ${let + sshConfigFile = if (builtins.tryEval <ssh-config-file>).success + then <ssh-config-file> + else builtins.trace '' + Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path. + + Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access. + + You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. + '' "/var/lib/empty/config"; + in builtins.toString sshConfigFile} "$@" + ''; + }); + fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); + fetchpatch = callPackage ../build-support/fetchpatch { }; + fetchsvn = import ../build-support/fetchsvn { inherit stdenv subversion openssh; sshSupport = true; @@ -329,7 +351,7 @@ let }; # A wrapper around fetchurl that generates miror://gnome URLs automatically - fetchurl_gnome = callPackage ../build-support/fetchurl/gnome.nix { }; + fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { }; # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, @@ -338,6 +360,14 @@ let # linked curl in the case of stdenv-linux). fetchurlBoot = stdenv.fetchurlBoot; + fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; }; + + fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip { + name = "${repo}-${rev}-src"; + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; + inherit sha256; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -418,7 +448,7 @@ let aefs = callPackage ../tools/filesystems/aefs { }; aegisub = callPackage ../applications/video/aegisub { - wxGTK = wxGTK29; + wxGTK = wxGTK30; lua = lua5_1; }; @@ -426,8 +456,6 @@ let aescrypt = callPackage ../tools/misc/aescrypt { }; - cb1cat = callPackage ../tools/security/cb1cat { }; - ahcpd = callPackage ../tools/networking/ahcpd { }; aircrackng = callPackage ../tools/networking/aircrack-ng { }; @@ -491,7 +519,9 @@ let otool = callPackage ../os-specific/darwin/otool { }; - pass = callPackage ../tools/security/pass { }; + pass = callPackage ../tools/security/pass { + gnupg = gnupg1compat; + }; setfile = callPackage ../os-specific/darwin/setfile { }; @@ -578,6 +608,10 @@ let capstone = callPackage ../development/libraries/capstone { }; + coprthr = callPackage ../development/libraries/coprthr { + flex = flex_2_5_35; + }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -606,6 +640,8 @@ let mcelog = callPackage ../os-specific/linux/mcelog { }; + apparix = callPackage ../tools/misc/apparix { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; enableStandardFeatures = false; @@ -663,12 +699,16 @@ let par2Support = (config.bup.par2Support or false); }; + ori = callPackage ../tools/backup/ori { }; + atool = callPackage ../tools/archivers/atool { }; bzip2 = callPackage ../tools/compression/bzip2 { }; cabextract = callPackage ../tools/archivers/cabextract { }; + cantata = callPackage ../applications/audio/cantata { }; + can-utils = callPackage ../os-specific/linux/can-utils { }; ccid = callPackage ../tools/security/ccid { }; @@ -741,6 +781,8 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; + clamav = callPackage ../tools/security/clamav { }; cloc = callPackage ../tools/misc/cloc { @@ -827,8 +869,6 @@ let dhcpcd = callPackage ../tools/networking/dhcpcd { }; - dhcpcd_without_udev = callPackage ../tools/networking/dhcpcd { udev = null; }; - diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { }; @@ -1112,7 +1152,9 @@ let */ graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { }; - grive = callPackage ../tools/filesystems/grive { }; + grive = callPackage ../tools/filesystems/grive { + json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable + }; groff = callPackage ../tools/text/groff { ghostscript = null; @@ -1260,6 +1302,8 @@ let jing = callPackage ../tools/text/xml/jing { }; + jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; + jnettop = callPackage ../tools/networking/jnettop { }; jq = callPackage ../development/tools/jq {}; @@ -1394,7 +1438,13 @@ let mdbtools = callPackage ../tools/misc/mdbtools { }; - mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { + inherit (gnome) scrollkeeper; + }; + + mednafen = callPackage ../misc/emulators/mednafen { }; + + mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; megacli = callPackage ../tools/misc/megacli { }; @@ -1426,9 +1476,7 @@ let modemmanager = callPackage ../tools/networking/modemmanager {}; - monit = builderDefsPackage ../tools/system/monit { - inherit openssl flex bison; - }; + monit = callPackage ../tools/system/monit { }; mosh = callPackage ../tools/networking/mosh { boost = boostHeaders; @@ -1501,6 +1549,8 @@ let netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; + nethogs = callPackage ../tools/networking/nethogs { }; + netkittftp = callPackage ../tools/networking/netkit/tftp { }; netpbm = callPackage ../tools/graphics/netpbm { }; @@ -1535,6 +1585,8 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; + nifskope = callPackage ../tools/graphics/nifskope { }; + nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; nlopt = callPackage ../development/libraries/nlopt {}; @@ -1629,7 +1681,9 @@ let openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; - optipng = callPackage ../tools/graphics/optipng { }; + optipng = callPackage ../tools/graphics/optipng { + libpng = libpng12; + }; oslrd = callPackage ../tools/networking/oslrd { }; @@ -1812,9 +1866,7 @@ let privateer = callPackage ../games/privateer { }; - rtmpdump = callPackage ../tools/video/rtmpdump { - gnutls = gnutls31; # gnutls32: undefined reference to gnutls_calc_dh_{key,secret} - }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; reaverwps = callPackage ../tools/networking/reaver-wps {}; @@ -1830,6 +1882,8 @@ let inherit (gnome) gnome_vfs GConf; }; + remarkjs = callPackage ../development/web/remarkjs { }; + remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina {}; @@ -1846,6 +1900,8 @@ let ripmime = callPackage ../tools/networking/ripmime {}; + rkflashtool = callPackage ../tools/misc/rkflashtool { }; + rmlint = callPackage ../tools/misc/rmlint {}; rng_tools = callPackage ../tools/security/rng-tools { }; @@ -2051,6 +2107,10 @@ let guile = guile_1_8; }; + texmaker = callPackage ../applications/editors/texmaker { }; + + texstudio = callPackage ../applications/editors/texstudio { }; + tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; }; tinc = callPackage ../tools/networking/tinc { }; @@ -2418,11 +2478,16 @@ let clang = wrapClang llvmPackages.clang; - clang_34 = wrapClang llvmPackages.clang; + clang_34 = wrapClang llvmPackages_34.clang; clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); clang_32 = wrapClang (clangUnwrapped llvm_32 ../development/compilers/llvm/3.2/clang.nix); clang_31 = wrapClang (clangUnwrapped llvm_31 ../development/compilers/llvm/3.1/clang.nix); + clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { + clang = clang_34; + llvmPackages = llvmPackages_34; + }; + clangUnwrapped = llvm: pkg: callPackage pkg { stdenv = if stdenv.isDarwin then stdenvAdapters.overrideGCC stdenv gccApple @@ -2453,6 +2518,11 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; + compcert = callPackage_i686 ../development/compilers/compcert {}; + + cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {}); + cryptol2 = haskellPackages.cryptol; + cython = pythonPackages.cython; cython3 = python3Packages.cython; @@ -2511,10 +2581,10 @@ let gcc_realCross = gcc48_realCross; gccCrossStageStatic = let - isMingw = (stdenv.cross.libc == "msvcrt"); - isMingw64 = isMingw && stdenv.cross.config == "x86_64-w64-mingw32"; - libcCross1 = if isMingw64 then windows.mingw_w64_headers else - if isMingw then windows.mingw_headers1 else null; + libcCross1 = + if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers + else if stdenv.cross.libc == "libSystem" then darwin.xcode + else null; in wrapGCCCross { gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } ( @@ -2642,6 +2712,41 @@ let binutilsCross = null; })); + gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + })); + + gcc49_multi = + if system == "x86_64-linux" then lowPrio ( + wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc49.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); + profiledCompiler = false; + enableMultilib = true; + })) + else throw "Multilib gcc not supported on ‘${system}’"; + + gcc49_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 { + stripped = false; + + inherit noSysDirs; + cross = null; + libcCross = null; + binutilsCross = null; + })); + gccApple = assert stdenv.isDarwin; wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) { @@ -2730,6 +2835,8 @@ let enableMultilib = false; }); + ghdl_mcode = callPackage ../development/compilers/ghdl { }; + gcl = builderDefsPackage ../development/compilers/gcl { inherit mpfr m4 binutils fetchcvs emacs zlib which texinfo; @@ -2745,7 +2852,7 @@ let }; jhc = callPackage ../development/compilers/jhc { - inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl + inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl regexCompat HsSyck random; }; @@ -2783,36 +2890,27 @@ let builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" ) haskell)); - # Current default version: 7.6.3. haskellPackages = haskellPackages_ghc763; - # Current Haskell Platform: 2013.2.0.0 - haskellPlatform = haskellPackages.haskellPlatform; + haskellPlatform = haskellPlatformPackages."2013_2_0_0"; haskellPackages_ghc6104 = haskell.packages_ghc6104; - haskellPackages_ghc6121 = haskell.packages_ghc6121; - haskellPackages_ghc6122 = haskell.packages_ghc6122; haskellPackages_ghc6123 = haskell.packages_ghc6123; - haskellPackages_ghc701 = haskell.packages_ghc701; - haskellPackages_ghc702 = haskell.packages_ghc702; - haskellPackages_ghc703 = haskell.packages_ghc703; haskellPackages_ghc704 = haskell.packages_ghc704; - haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; - haskellPackages_ghc741 = haskell.packages_ghc741; haskellPackages_ghc742 = haskell.packages_ghc742; - haskellPackages_ghc761 = haskell.packages_ghc761; - haskellPackages_ghc762 = haskell.packages_ghc762; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc763_no_profiling = recurseIntoAttrs (haskell.packages_ghc763.noProfiling); - haskellPackages_ghc763_profiling = recurseIntoAttrs (haskell.packages_ghc763.profiling); - haskellPackages_ghc763 = recurseIntoAttrs (haskell.packages_ghc763.highPrio); + haskellPackages_ghc763_no_profiling = recurseIntoAttrs haskell.packages_ghc763.noProfiling; + haskellPackages_ghc763_profiling = recurseIntoAttrs haskell.packages_ghc763.profiling; + haskellPackages_ghc763 = recurseIntoAttrs haskell.packages_ghc763.highPrio; # Reasonably current HEAD snapshot. - haskellPackages_ghc781 = haskell.packages_ghc781; + haskellPackages_ghc782 = haskell.packages_ghc782; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; + haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); + haxe = callPackage ../development/compilers/haxe { }; hiphopvm = callPackage ../development/interpreters/hiphopvm { @@ -2941,12 +3039,12 @@ let else stdenv; }; - llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else { + llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // { # until someone solves build problems with _34 llvm = llvm_33; clang = clang_33; - dragonegg = null; }; + llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit stdenv newScope fetchurl; isl = isl_0_12; @@ -2957,6 +3055,8 @@ let callPackage_i686 ../development/compilers/mentor {} ); + mercury = callPackage ../development/compilers/mercury { }; + mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; @@ -3113,6 +3213,8 @@ let 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; + + zarith = callPackage ../development/ocaml-modules/zarith { }; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; @@ -3148,12 +3250,11 @@ let }; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; - scala_2_10 = callPackage ../development/compilers/scala { }; - scala = scala_2_10; + scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; + scala_2_11 = callPackage ../development/compilers/scala { }; + scala = scala_2_11; - sdcc = callPackage ../development/compilers/sdcc { - boost = boost149; # sdcc 3.2.0 fails to build with boost 1.53 - }; + sdcc = callPackage ../development/compilers/sdcc { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; @@ -3256,7 +3357,9 @@ let erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlang = callPackage ../development/interpreters/erlang/default.nix { }; + erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { }; + erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; + erlang = erlangR17; rebar = callPackage ../development/tools/build-managers/rebar { }; @@ -3354,20 +3457,21 @@ let 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; + }; + }; + }; + php54 = callPackage ../development/interpreters/php/5.4.nix { }; php_apc = callPackage ../development/libraries/php-apc { }; php_xcache = callPackage ../development/libraries/php-xcache { }; - phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug { - php = php53; - }); - - phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { }; - - phpXdebug = phpXdebug_5_4; - picolisp = callPackage ../development/interpreters/picolisp {}; pltScheme = racket; # just to be sure @@ -3378,18 +3482,13 @@ let llvm = llvm_33 ; }; - python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); + python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; + python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; }; python32 = callPackage ../development/interpreters/python/3.2 { }; python33 = callPackage ../development/interpreters/python/3.3 { }; - python34 = callPackage ../development/interpreters/python/3.4 { }; - + python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); python = python27; - python26 = callPackage ../development/interpreters/python/2.6 { - db = db47; - }; - python27 = callPackage ../development/interpreters/python/2.7 { - libX11 = xlibs.libX11; - }; + python3 = python3Packages.python; pypy = callPackage ../development/interpreters/pypy/2.2 { }; @@ -3468,6 +3567,8 @@ let fftw = fftwSinglePrec; }; + supercollider_scel = supercollider.override { useSCEL = true; }; + sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; tcl = callPackage ../development/interpreters/tcl { }; @@ -3590,11 +3691,13 @@ let gold = false; }); - binutilsCross = lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { - inherit stdenv fetchurl zlib; - noSysDirs = true; - cross = assert crossSystem != null; crossSystem; - })); + binutilsCross = + if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools + else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { + inherit stdenv fetchurl zlib; + noSysDirs = true; + cross = assert crossSystem != null; crossSystem; + })); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; @@ -3635,6 +3738,8 @@ let wrapGCC (ccache.links extraConfig)) {}; ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper); + cccc = callPackage ../development/tools/analysis/cccc { }; + cgdb = callPackage ../development/tools/misc/cgdb { }; chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; @@ -3659,7 +3764,7 @@ let coccinelle = callPackage ../development/tools/misc/coccinelle { }; - framac = callPackage ../development/tools/misc/frama-c { }; + framac = callPackage ../development/tools/analysis/frama-c { }; cppi = callPackage ../development/tools/misc/cppi { }; @@ -3667,6 +3772,8 @@ let cflow = callPackage ../development/tools/misc/cflow { }; + cov-build = callPackage ../development/tools/analysis/cov-build {}; + cppcheck = callPackage ../development/tools/analysis/cppcheck { }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -3829,6 +3936,10 @@ let ninja = callPackage ../development/tools/build-managers/ninja { }; + node_webkit = callPackage ../development/tools/node-webkit { + gconf = pkgs.gnome.GConf; + }; + noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; @@ -3922,6 +4033,8 @@ let swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; + swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; + swigWithJava = swig; swfmill = callPackage ../tools/video/swfmill { }; @@ -3975,6 +4088,8 @@ let xmlindent = callPackage ../development/web/xmlindent {}; + xpwn = callPackage ../development/mobile/xpwn {}; + xxdiff = callPackage ../development/tools/misc/xxdiff { bison = bison2; }; @@ -4079,6 +4194,8 @@ let caelum = callPackage ../development/libraries/caelum { }; + capnproto = callPackage ../development/libraries/capnproto { }; + scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; @@ -4152,6 +4269,8 @@ let ctl = callPackage ../development/libraries/ctl { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + cppunit = callPackage ../development/libraries/cppunit { }; cppnetlib = callPackage ../development/libraries/cppnetlib { @@ -4182,15 +4301,20 @@ let dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus_python = callPackage ../development/python-modules/dbus { }; + # Should we deprecate these? Currently there are many references. - dbus_tools = dbus.tools; - dbus_libs = dbus.libs; - dbus_daemon = dbus.daemon; + dbus_tools = pkgs.dbus.tools; + dbus_libs = pkgs.dbus.libs; + dbus_daemon = pkgs.dbus.daemon; dhex = callPackage ../applications/editors/dhex { }; dclib = callPackage ../development/libraries/dclib { }; + dillo = callPackage ../applications/networking/browsers/dillo { + fltk = fltk13; + }; + directfb = callPackage ../development/libraries/directfb { }; dotconf = callPackage ../development/libraries/dotconf { }; @@ -4394,9 +4518,8 @@ let # We can choose: libcCrossChooser = name : if name == "glibc" then glibcCross else if name == "uclibc" then uclibcCross - else if name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32" then - windows.mingw_w64 - else if name == "msvcrt" then windows.mingw_headers3 + else if name == "msvcrt" then windows.mingw_w64 + else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; @@ -4621,6 +4744,8 @@ let gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; + hamlib = callPackage ../development/libraries/hamlib { }; + # TODO : Add MIT Kerberos and let admin choose. kerberos = heimdal; @@ -4700,9 +4825,8 @@ let json_glib = callPackage ../development/libraries/json-glib { }; - json-c-0-9 = callPackage ../development/libraries/json-c { }; - json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; - json_c = json-c-0-9; + json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable + json_c = callPackage ../development/libraries/json-c { }; jsoncpp = callPackage ../development/libraries/jsoncpp { }; @@ -4877,6 +5001,8 @@ let libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = gnome3.libgnome_keyring; + libgnurl = callPackage ../development/libraries/libgnurl { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; @@ -5000,6 +5126,9 @@ let then null else libiconv; + # The logic behind this attribute is broken: libiconvOrNull==null does + # NOT imply libiconv=glibc! On Darwin, for example, we have a native + # libiconv library which is not glibc. libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv; # On non-GNU systems we need GNU Gettext for libintl. @@ -5082,6 +5211,8 @@ let libmusicbrainz = libmusicbrainz3; + libmx = callPackage ../development/libraries/libmx { }; + libnet = callPackage ../development/libraries/libnet { }; libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; @@ -5394,6 +5525,8 @@ let ming = callPackage ../development/libraries/ming { }; + minizip = callPackage ../development/libraries/minizip { }; + minmay = callPackage ../development/libraries/minmay { }; miro = callPackage ../applications/video/miro { @@ -5685,6 +5818,8 @@ let qwt = callPackage ../development/libraries/qwt {}; + qwt6 = callPackage ../development/libraries/qwt/6.nix { }; + rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; raul = callPackage ../development/libraries/audio/raul { }; @@ -5948,6 +6083,10 @@ let ucommon = callPackage ../development/libraries/ucommon { }; + v8 = callPackage ../development/libraries/v8 { + inherit (pythonPackages) gyp; + }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; @@ -5976,28 +6115,7 @@ let wayland = callPackage ../development/libraries/wayland { }; - webkit = - builderDefsPackage ../development/libraries/webkit { - inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild - inherit gtk3 glib atk cairo pango fontconfig freetype; - inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf flex - libjpeg libpng libtiff libxml2 libxslt sqlite icu curl - which libproxy geoclue enchant python ruby perl mesa xlibs; - inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; - bison = bison2; - }; - - webkit_gtk2 = - builderDefsPackage ../development/libraries/webkit/gtk2.nix { - inherit gtk2 glib atk cairo pango fontconfig freetype; - inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf flex - libjpeg libpng libtiff libxml2 libxslt sqlite icu curl - which libproxy geoclue enchant python ruby perl mesa xlibs; - inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; - bison = bison2; - }; + webkit = webkitgtk; webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzz.override { @@ -6080,6 +6198,8 @@ let xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; + xmlsec = callPackage ../development/libraries/xmlsec { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; yajl = callPackage ../development/libraries/yajl { }; @@ -6088,6 +6208,8 @@ let inherit ncurses flex bison autoconf automake m4 coreutils; }; + zeitgeist = callPackage ../development/libraries/zeitgeist { }; + zlib = callPackage ../development/libraries/zlib { fetchurl = fetchurlBoot; }; @@ -6098,6 +6220,9 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; + zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / JAVA @@ -6160,12 +6285,6 @@ let inherit (gnome) libsoup; }; - v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; }; - - xmlsec = callPackage ../development/libraries/xmlsec { }; - - zziplib = callPackage ../development/libraries/zziplib { }; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT @@ -6243,7 +6362,7 @@ let python = python26; }; - python3Packages = python33Packages; + python3Packages = python34Packages; python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; @@ -6284,6 +6403,8 @@ let pycairo = pythonPackages.pycairo; + pycapnp = pythonPackages.pycapnp; + pycrypto = pythonPackages.pycrypto; pycups = callPackage ../development/python-modules/pycups { }; @@ -6345,12 +6466,25 @@ let ### DEVELOPMENT / R MODULES - buildRPackage = import ../development/r-modules/generic R; + R = callPackage ../applications/science/math/R { + inherit (xlibs) libX11 libXt; + texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + withRecommendedPackages = false; + }; + + rWrapper = callPackage ../development/r-modules/wrapper.nix { + # Those packages are usually installed as part of the R build. + recommendedPackages = with rPackages; [ MASS lattice Matrix nlme + survival boot cluster codetools foreign KernSmooth rpart class + nnet spatial mgcv ]; + # Override this attribute to register additional libraries. + packages = []; + }; - rPackages = recurseIntoAttrs (import ./r-packages.nix { + rPackages = import ../development/r-modules/cran-packages.nix { inherit pkgs; overrides = (config.rPackageOverrides or (p: {})) pkgs; - }); + }; ### SERVERS @@ -6408,7 +6542,9 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; - ejabberd = callPackage ../servers/xmpp/ejabberd { }; + ejabberd = callPackage ../servers/xmpp/ejabberd { + erlang = erlangR16B02; + }; elasticmq = callPackage ../servers/elasticmq { }; @@ -6441,6 +6577,8 @@ let joseki = callPackage ../servers/http/joseki {}; + leafnode = callPackage ../servers/news/leafnode { }; + lighttpd = callPackage ../servers/http/lighttpd { }; mailman = callPackage ../servers/mail/mailman { }; @@ -6449,6 +6587,8 @@ let 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 { }; @@ -6470,7 +6610,12 @@ let myserver = callPackage ../servers/http/myserver { }; - nginx = callPackage ../servers/http/nginx { }; + nginx = callPackage ../servers/http/nginx { + rtmp = true; + fullWebDAV = true; + syslog = true; + moreheaders = true; + }; ngircd = callPackage ../servers/irc/ngircd { }; @@ -6482,6 +6627,8 @@ let postfix = callPackage ../servers/mail/postfix { }; + postfix211 = callPackage ../servers/mail/postfix/2.11.nix { }; + pulseaudio = callPackage ../servers/pulseaudio { gconf = gnome.GConf; # The following are disabled in the default build, because if this @@ -6639,7 +6786,7 @@ let xinetd = callPackage ../servers/xinetd { }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig + inherit fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa_drivers dbus libuuid openssl gperf m4 autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman; @@ -6720,6 +6867,8 @@ let bluez = bluez4; + inherit (pythonPackages) bedup; + beret = callPackage ../games/beret { }; bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; @@ -6753,6 +6902,22 @@ let cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; + darwin = rec { + cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port { + cross = assert crossSystem != null; crossSystem; + inherit maloader; + xctoolchain = xcode.toolchain; + }); + + maloader = callPackage ../os-specific/darwin/maloader { + inherit opencflite; + }; + + opencflite = callPackage ../os-specific/darwin/opencflite {}; + + xcode = callPackage ../os-specific/darwin/xcode {}; + }; + devicemapper = lvm2; dmidecode = callPackage ../os-specific/linux/dmidecode { }; @@ -6870,24 +7035,26 @@ let libnl = callPackage ../os-specific/linux/libnl { }; libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { }; - linuxHeaders = linuxHeaders37; - linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - linuxHeaders26 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { }; + # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { }; + linuxHeaders = linuxHeaders_3_7; - linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { + linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); - linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix { + linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); + linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { }; + + linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { }; + # We can choose: linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross else if ver == "2.6" then linuxHeaders26Cross @@ -6896,8 +7063,6 @@ let linuxHeadersCross = assert crossSystem != null; linuxHeadersCrossChooser crossSystem.platform.kernelMajor; - linuxHeaders_2_6_28 = callPackage ../os-specific/linux/kernel-headers/2.6.28.nix { }; - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { @@ -6905,47 +7070,6 @@ let kernelPatches = []; }; - grsecurityOverrider = args: { - # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins) - # include libgmp headers, so we need these extra tweaks - buildInputs = args.buildInputs ++ [ gmp ]; - preConfigure = '' - ${args.preConfigure or ""} - sed -i 's|-I|-I${gmp}/include -I|' scripts/gcc-plugin.sh - sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${gmp}/include|' tools/gcc/Makefile - sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${gmp}/include|' tools/gcc/Makefile - ''; - }; - - # Note: grsec is not enabled automatically, you need to specify which kernel - # config options you need (e.g. by overriding extraConfig). See list of options here: - # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options - linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs { - maintainers = with lib.maintainers; [ wizeman thoughtpolice ]; - } (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_57 kernelPatches.grsec_path ]; - argsOverride = { - modDirVersion = "${linux_3_2.modDirVersion}-grsec"; - }; - })) (args: grsecurityOverrider args))); - - linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs { - maintainers = with lib.maintainers; [ wizeman thoughtpolice ]; - } (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_9 kernelPatches.grsec_path ]; - argsOverride = { - modDirVersion = "${linux_3_13.modDirVersion}-grsec"; - }; - })) (args: grsecurityOverrider args))); - - linux_3_2_apparmor = lowPrio (linux_3_2.override { - kernelPatches = [ kernelPatches.apparmor_3_2 ]; - extraConfig = '' - SECURITY_APPARMOR y - DEFAULT_SECURITY_APPARMOR y - ''; - }); - linux_3_2_xen = lowPrio (linux_3_2.override { extraConfig = '' XEN_DOM0 y @@ -6960,14 +7084,6 @@ let ]; }; - linux_3_4_apparmor = lowPrio (linux_3_4.override { - kernelPatches = [ kernelPatches.apparmor_3_4 ]; - extraConfig = '' - SECURITY_APPARMOR y - DEFAULT_SECURITY_APPARMOR y - ''; - }); - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl buildLinux; }; @@ -7017,6 +7133,43 @@ let ]; }; + /* grsec configuration + + We build several flavors of 'default' grsec kernels. These are + built by default with Hydra. If the user selects a matching + 'default' flavor, then the pre-canned package set can be + chosen. Typically, users will make very basic choices like + 'security' + 'server' or 'performance' + 'desktop' with + virtualisation support. These will then be picked. + + Note: Xen guest kernels are included for e.g. NixOps deployments + to EC2, where Xen is the Hypervisor. + */ + + grFlavors = import ../build-support/grsecurity/flavors.nix; + + mkGrsecurity = opts: + (import ../build-support/grsecurity { + grsecOptions = opts; + inherit pkgs lib; + }); + + grKernel = opts: (mkGrsecurity opts).grsecKernel; + grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; + + # Stable kernels + linux_grsec_stable_desktop = grKernel grFlavors.linux_grsec_stable_desktop; + linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; + linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; + + # Stable+vserver kernels - server versions only + #linux_grsec_vserver_server = grKernel grFlavors.linux_grsec_vserver_server; + #linux_grsec_vserver_server_xen = grKernel grFlavors.linux_grsec_vserver_server_xen; + + # Testing kernels + linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; + linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; + linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -7039,6 +7192,8 @@ let cryptodev = callPackage ../os-specific/linux/cryptodev { }; + cpupower = callPackage ../os-specific/linux/cpupower { }; + e1000e = callPackage ../os-specific/linux/e1000e {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; @@ -7082,7 +7237,10 @@ let psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; - spl = callPackage ../os-specific/linux/spl/default.nix { }; + spl = callPackage ../os-specific/linux/spl { }; + spl_git = callPackage ../os-specific/linux/spl/git.nix { }; + + sysdig = callPackage ../os-specific/linux/sysdig {}; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; @@ -7096,29 +7254,43 @@ let virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - zfs = callPackage ../os-specific/linux/zfs/default.nix { }; + zfs = callPackage ../os-specific/linux/zfs { }; + zfs_git = callPackage ../os-specific/linux/zfs/git.nix { }; }; + # The current default kernel / kernel modules. + linux = linuxPackages.kernel; + linuxPackages = linuxPackages_3_12; + + # Update this when adding the newest kernel major version! + linux_latest = pkgs.linux_3_14; + linuxPackages_latest = pkgs.linuxPackages_3_14; + # 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_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; - linuxPackages_3_2_grsecurity = linuxPackagesFor pkgs.linux_3_2_grsecurity linuxPackages_3_2_grsecurity; linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); - linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_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_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity; linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); - # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_14; - # The current default kernel / kernel modules. - linux = linuxPackages.kernel; - linuxPackages = linuxPackages_3_12; + # grsecurity flavors + # Stable kernels + linuxPackages_grsec_stable_desktop = grPackage grFlavors.linux_grsec_stable_desktop; + linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; + linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; + + # Stable+vserver kernels - server versions only + #linuxPackages_grsec_vserver_server = grPackage grFlavors.linux_grsec_vserver_server; + #linuxPackages_grsec_vserver_server_xen = grPackage grFlavors.linux_grsec_vserver_server_xen; + + # Testing kernels + linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; + linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; + linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; @@ -7252,6 +7424,8 @@ let procps-ng = callPackage ../os-specific/linux/procps-ng { }; + watch = callPackage ../os-specific/linux/procps/watch.nix { }; + qemu_kvm = lowPrio (qemu.override { x86Only = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; @@ -7278,6 +7452,10 @@ let statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + sysdig = callPackage ../os-specific/linux/sysdig { + kernel = null; + }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor + sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; sysprof = callPackage ../development/tools/profiling/sysprof { @@ -7294,7 +7472,9 @@ let sysstat = callPackage ../os-specific/linux/sysstat { }; - systemd = callPackage ../os-specific/linux/systemd { }; + systemd = callPackage ../os-specific/linux/systemd { + linuxHeaders = linuxHeaders_3_14; + }; systemtap = callPackage ../development/tools/profiling/systemtap { inherit (gnome) libglademm; @@ -7425,6 +7605,10 @@ let onlyHeaders = true; }; + mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 { + onlyPthreads = true; + }; + pthreads = callPackage ../os-specific/windows/pthread-w32 { mingw_headers = mingw_headers3; }; @@ -7523,6 +7707,8 @@ let dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + eb-garamond = callPackage ../data/fonts/eb-garamond { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freepats = callPackage ../data/misc/freepats { }; @@ -7559,6 +7745,8 @@ let oldstandard = callPackage ../data/fonts/oldstandard { }; + poly = callPackage ../data/fonts/poly { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { }; @@ -7581,6 +7769,8 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + sourceCodePro = callPackage ../data/fonts/source-code-pro {}; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { @@ -7773,14 +7963,13 @@ let amdappsdk = amdappsdk28; }; - chatzilla = callPackage ../applications/networking/irc/chatzilla { - xulrunner = firefox36Pkgs.xulrunner; - }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { }; chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { channel = "stable"; - gconf = gnome.GConf; pulseSupport = config.pulseaudio or true; + enablePepperFlash = config.chromium.enablePepperFlash or false; + enablePepperPDF = config.chromium.enablePepperPDF or false; }); chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); @@ -7811,6 +8000,9 @@ let libpng = libpng12; }; + codeblocks = callPackage ../applications/editors/codeblocks { }; + codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; }; + codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) { inherit makeWrapper; python = pythonFull; @@ -7842,17 +8034,19 @@ let darcs = haskellPackages.darcs.override { # A variant of the Darcs derivation that containts only the executable and # thus has no dependencies on other Haskell packages. - cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { - isLibrary = false; - configureFlags = "-f-library"; }); }.final; - }; + cabal = haskellPackages.cabal.override { + extension = self : super : { + isLibrary = false; + configureFlags = "-f-library " + super.configureFlags or ""; + }; + }; }; darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; }; - "dd-agent" = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; + dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; @@ -7965,6 +8159,8 @@ let colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; + cryptol = callPackage ../applications/editors/emacs-modes/cryptol { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; @@ -8106,6 +8302,8 @@ let inherit stdenv fetchurl openssl; }; + fldigi = callPackage ../applications/audio/fldigi { }; + fluidsynth = callPackage ../applications/audio/fluidsynth { }; fossil = callPackage ../applications/version-management/fossil { }; @@ -8662,6 +8860,8 @@ let minicom = callPackage ../tools/misc/minicom { }; + minimodem = callPackage ../applications/audio/minimodem { }; + minidjvu = callPackage ../applications/graphics/minidjvu { }; mirage = callPackage ../applications/graphics/mirage {}; @@ -8742,6 +8942,7 @@ let }; mpv = callPackage ../applications/video/mpv { + lua = lua5_1; bs2bSupport = true; quviSupport = true; cacaSupport = true; @@ -8874,6 +9075,8 @@ let opusTools = callPackage ../applications/audio/opus-tools { }; + pamixer = callPackage ../applications/audio/pamixer { }; + pan = callPackage ../applications/networking/newsreaders/pan { spellChecking = false; }; @@ -8935,6 +9138,10 @@ let inherit (xorg) libXpm; }; + potrace = callPackage ../applications/graphics/potrace {}; + + posterazor = callPackage ../applications/misc/posterazor { }; + pqiv = callPackage ../applications/graphics/pqiv { }; qiv = callPackage ../applications/graphics/qiv { }; @@ -8953,8 +9160,6 @@ let qemu = callPackage ../applications/virtualization/qemu { }; - qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; - qmmp = callPackage ../applications/audio/qmmp { }; qsampler = callPackage ../applications/audio/qsampler { }; @@ -9041,6 +9246,8 @@ let seq24 = callPackage ../applications/audio/seq24 { }; + setbfree = callPackage ../applications/audio/setbfree { }; + sflphone = callPackage ../applications/networking/instant-messengers/sflphone { gtk = gtk3; }; @@ -9147,8 +9354,7 @@ let }); surf = callPackage ../applications/misc/surf { - libsoup = gnome.libsoup; - webkit = webkit_gtk2; + webkit = webkitgtk2; }; svk = perlPackages.SVK; @@ -9216,6 +9422,14 @@ let inherit (gnome) libIDL; }; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome3) at_spi2_atk; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXext + libXinerama libXrender libXt; + }; + tig = gitAndTools.tig; timidity = callPackage ../tools/misc/timidity { }; @@ -9269,12 +9483,8 @@ let uwimap = callPackage ../tools/networking/uwimap { }; - uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { - inherit pkgconfig webkit makeWrapper glib_networking python3; - inherit glib pango cairo gdk_pixbuf atk; - inherit (xlibs) libX11 kbproto; - inherit (gnome) libsoup; - gtk = gtk3; + uzbl = callPackage ../applications/networking/browsers/uzbl { + webkit = webkitgtk2; }; vanitygen = callPackage ../applications/misc/vanitygen { }; @@ -9342,7 +9552,10 @@ let vimrc = config.vim.vimrc or ""; }; - virtviewer = callPackage ../applications/virtualization/virt-viewer {}; + virtviewer = callPackage ../applications/virtualization/virt-viewer { + gtkvnc = gtkvnc.override { enableGTK3 = true; }; + spice_gtk = spice_gtk.override { enableGTK3 = true; }; + }; virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; vte = gnome3.vte; @@ -9370,7 +9583,7 @@ let vorbisTools = callPackage ../applications/audio/vorbis-tools { }; vue = callPackage ../applications/misc/vue { - jre = oraclejre; + jre = icedtea7_jre; }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -9381,6 +9594,8 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; + weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); + weston = callPackage ../applications/window-managers/weston { }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; @@ -9484,6 +9699,8 @@ let xdaliclock = callPackage ../tools/misc/xdaliclock {}; + xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; + xdg_utils = callPackage ../tools/X11/xdg-utils { }; xdotool = callPackage ../tools/X11/xdotool { }; @@ -9556,6 +9773,8 @@ let qgis = callPackage ../applications/misc/qgis {}; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; + ykpers = callPackage ../applications/misc/ykpers {}; yoshimi = callPackage ../applications/audio/yoshimi { @@ -9828,6 +10047,8 @@ let tennix = callPackage ../games/tennix { }; + tibia = callPackage ../games/tibia { }; + tintin = callPackage ../games/tintin { }; tpm = callPackage ../games/thePenguinMachine { }; @@ -9916,7 +10137,13 @@ let cinnamon = recurseIntoAttrs rec { callPackage = newScope pkgs.cinnamon; - inherit (gnome3) gnome_common; + inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity; + + muffin = callPackage ../desktops/cinnamon/muffin.nix { } ; + + cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ }; + + cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ }; cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ; @@ -9951,29 +10178,13 @@ let hsetroot = callPackage ../tools/X11/hsetroot { }; - kde4 = recurseIntoAttrs pkgs.kde411; - - kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 ); - - kde4_prev = recurseIntoAttrs pkgs.kde410; + kakasi = callPackage ../tools/text/kakasi { }; - kde410 = kdePackagesFor (pkgs.kde410 // { - boost = boost149; - eigen = eigen2; - libotr = libotr_3_2; - libusb = libusb1; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.10; + kde4 = recurseIntoAttrs pkgs.kde412; - kde411 = kdePackagesFor (pkgs.kde411 // { - boost = boost149; - eigen = eigen2; - libotr = libotr_3_2; - libusb = libusb1; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.11; + kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 ); - kde412 = kdePackagesFor (pkgs.kde412 // { + kde412 = kdePackagesFor (pkgs.kde412 // { eigen = eigen2; libusb = libusb1; libcanberra = libcanberra_kde; @@ -10200,10 +10411,14 @@ let liblapack = callPackage ../development/libraries/science/math/liblapack { }; + liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; + openblas = callPackage ../development/libraries/science/math/openblas { }; mathematica = callPackage ../applications/science/math/mathematica { }; + sage = callPackage ../applications/science/math/sage { }; + ### SCIENCE/MOLECULAR-DYNAMICS gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { @@ -10221,6 +10436,10 @@ let ### SCIENCE/LOGIC + abc-verifier = callPackage ../applications/science/logic/abc {}; + + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; + coq = callPackage ../applications/science/logic/coq { inherit (ocamlPackages) findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; @@ -10263,6 +10482,8 @@ let logisim = callPackage ../applications/science/logic/logisim {}; + ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; + matita = callPackage ../applications/science/logic/matita { ocaml = ocaml_3_11_2; inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http @@ -10295,6 +10516,12 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + verifast = callPackage_i686 ../applications/science/logic/verifast {}; + + why3 = callPackage ../applications/science/logic/why3 {}; + + yices = callPackage ../applications/science/logic/yices {}; + z3 = callPackage ../applications/science/logic/z3 {}; boolector = boolector15; @@ -10344,11 +10571,6 @@ let inherit (gnome) libglade gtksourceview; }; - R = callPackage ../applications/science/math/R { - inherit (xlibs) libX11 libXt; - texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - }; - singular = callPackage ../applications/science/math/singular {}; scilab = callPackage ../applications/science/math/scilab { @@ -10387,6 +10609,8 @@ let golly = callPackage ../applications/science/misc/golly { }; + megam = callPackage ../applications/science/misc/megam { }; + root = callPackage ../applications/science/misc/root { }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -10463,7 +10687,7 @@ let ghostscript = callPackage ../misc/ghostscript { x11Support = false; - cupsSupport = config.ghostscript.cups or true; + cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); gnuFork = config.ghostscript.gnu or false; }; @@ -10709,8 +10933,7 @@ let vimPlugins = callPackage ../misc/vim-plugins { }; vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { - inherit (gnome) libsoup; - webkit = webkit_gtk2; + webkit = webkitgtk2; }; vimprobable2Wrapper = wrapFirefox @@ -10718,8 +10941,7 @@ let }; vimb = callPackage ../applications/networking/browsers/vimb { - inherit (gnome) libsoup; - webkit = webkit_gtk2; + webkit = webkitgtk2; }; vimbWrapper = wrapFirefox { diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 2d4bdea6006d..3c5d50835ea9 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -8,242 +8,118 @@ # The actual Haskell packages are composed in haskell-packages.nix. There is # more documentation in there. -{ makeOverridable, lowPrio, stdenv, pkgs, newScope, config, callPackage } : rec { +{ makeOverridable, lowPrio, hiPrio, stdenv, pkgs, newScope, config, callPackage } : rec { - # Preferences functions. - # - # Change these if you want to change the default versions of packages being used - # for a particular GHC version. - - ghcHEADPrefs = - self : self.haskellPlatformArgs_future self // { - haskellPlatform = null; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; - cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; }; - cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; }; - }; - - ghc781Prefs = - self : self.haskellPlatformArgs_future self // { - haskellPlatform = null; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; - cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; }; - cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; }; - binary_0_7_1_0 = null; - }; + # haskell-packages.nix provides the latest possible version of every package, + # and this file overrides those version choices per compiler when appropriate. + # Older compilers inherit the overrides from newer ones. - ghc763Prefs = - self : self.haskellPlatformArgs_2013_2_0_0 self // { - haskellPlatform = self.haskellPlatform_2013_2_0_0; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; - }; + ghcHEADPrefs = self : super : super // { + mtl = self.mtl_2_1_3_1; + cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; }; + }; - ghc742Prefs = - self : self.haskellPlatformArgs_2012_4_0_0 self // { - haskellPlatform = self.haskellPlatform_2012_4_0_0; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; + ghc782Prefs = self : super : ghcHEADPrefs self super // { + cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; }; + }; - ghc741Prefs = - self : self.haskellPlatformArgs_2012_2_0_0 self // { - haskellPlatform = self.haskellPlatform_2012_2_0_0; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; - - ghc722Prefs = - self : self.haskellPlatformArgs_2012_2_0_0 self // { - haskellPlatform = self.haskellPlatform_2012_2_0_0; - deepseq = self.deepseq_1_3_0_2; - cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; - cabalInstall = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - binary = self.binary_0_6_0_0; - prettyShow = self.prettyShow_1_2; - quickcheckIo = self.quickcheckIo.override { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; - }; - hspecExpectations = self.hspecExpectations.override { - HUnit = self.HUnit_1_2_5_2; + ghc763Prefs = self : super : ghc782Prefs self super // { + ariadne = super.ariadne.override { + haskellNames = self.haskellNames.override { + haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; }; }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; }; - - ghc721Prefs = ghc722Prefs; - - ghc704Prefs = - self : self.haskellPlatformArgs_2011_4_0_0 self // { - haskellPlatform = self.haskellPlatform_2011_4_0_0; - cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; - monadPar = self.monadPar_0_1_0_3; - jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - prettyShow = self.prettyShow_1_2; - binary = self.binary_0_6_0_0; - Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; - quickcheckIo = self.quickcheckIo.override { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; + binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_0; }; + bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_0; }; }; + criterion = super.criterion.override { + statistics = self.statistics.override { + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_0; }; }; - hspecExpectations = self.hspecExpectations.override { - HUnit = self.HUnit_1_2_5_2; - }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; - - ghc703Prefs = - self : self.haskellPlatformArgs_2011_2_0_1 self // { - haskellPlatform = self.haskellPlatform_2011_2_0_1; - cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; }; - monadPar = self.monadPar_0_1_0_3; - jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - prettyShow = self.prettyShow_1_2; - binary = self.binary_0_6_0_0; - Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; - quickcheckIo = self.quickcheckIo.override { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; - }; - hspecExpectations = self.hspecExpectations.override { - HUnit = self.HUnit_1_2_5_2; - }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; - - ghc702Prefs = ghc701Prefs; - - ghc701Prefs = - self : self.haskellPlatformArgs_2011_2_0_0 self // { - haskellPlatform = self.haskellPlatform_2011_2_0_0; - cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; }; - monadPar = self.monadPar_0_1_0_3; - jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - prettyShow = self.prettyShow_1_2; - binary = self.binary_0_6_0_0; - Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; - quickcheckIo = self.quickcheckIo.override { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; - }; - hspecExpectations = self.hspecExpectations.override { - HUnit = self.HUnit_1_2_5_2; - }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; - - ghc6123Prefs = ghc6122Prefs; - - ghc6122Prefs = - self : self.haskellPlatformArgs_2010_2_0_0 self // { - haskellPlatform = self.haskellPlatform_2010_2_0_0; - mtl1 = self.mtl_1_1_0_2; - monadPar = self.monadPar_0_1_0_3; - deepseq = self.deepseq_1_1_0_2; - # deviating from Haskell platform here, to make some packages (notably statistics) compile - jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - binary = self.binary_0_6_0_0; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { - Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; - mtl = self.mtl_2_1_2; - HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; - }; - quickcheckIo = self.quickcheckIo.override { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; - }; - hspecExpectations = self.hspecExpectations.override { - HUnit = self.HUnit_1_2_5_2; - }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; - - ghc6121Prefs = - self : self.haskellPlatformArgs_2010_1_0_0 self // { - haskellPlatform = self.haskellPlatform_2010_1_0_0; - mtl1 = self.mtl_1_1_0_2; - extensibleExceptions = self.extensibleExceptions_0_1_1_0; - deepseq = self.deepseq_1_1_0_2; - monadPar = self.monadPar_0_1_0_3; - # deviating from Haskell platform here, to make some packages (notably statistics) compile - jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; - cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; - binary = self.binary_0_6_0_0; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { - Cabal = self.Cabal_1_16_0_3; - zlib = self.zlib_0_5_3_3; - mtl = self.mtl_2_1_2; - HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; - }; - quickcheckIo = self.quickcheckIo.override { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; - }; - hspecExpectations = self.hspecExpectations.override { - HUnit = self.HUnit_1_2_5_2; - }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; - }; - - ghc6104Prefs = - self : self.haskellPlatformArgs_2009_2_0_2 self // { - haskellPlatform = self.haskellPlatform_2009_2_0_2; - mtl = self.mtl_1_1_0_2; - mtl1 = self.mtl_1_1_0_2; - extensibleExceptions = self.extensibleExceptions_0_1_1_0; - text = self.text_0_11_0_6; - deepseq = self.deepseq_1_1_0_2; - monadPar = self.monadPar_0_1_0_3; - # deviating from Haskell platform here, to make some packages (notably statistics) compile - jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; - binary = self.binary_0_6_0_0; - cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { - Cabal = self.Cabal_1_16_0_3; - zlib = self.zlib_0_5_3_3; - mtl = self.mtl_2_1_2; - HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; - }; - haskeline = self.haskeline_0_7_1_1; - terminfo = self.terminfo_0_3_2_6; }; + gloss = null; # requires base >= 4.7 + haddock = self.haddock_2_13_2; + modularArithmetic = null; # requires base >= 4.7 + pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; }; + transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x + }; + + ghc742Prefs = self : super : ghc763Prefs self super // { + aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; }; + hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; + haddock = self.haddock_2_11_0; + haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + }; + + ghc722Prefs = self : super : ghc742Prefs self super // { + deepseq = self.deepseq_1_3_0_2; + DrIFT = null; # doesn't compile with old GHC versions + extensibleExceptions = null; # core package in ghc <= 7.4.x + haddock = self.haddock_2_9_4; + syb = self.syb_0_4_0; + }; + + ghc704Prefs = self : super : ghc722Prefs self super // { + binary = self.binary_0_7_2_0; # core package in ghc >= 7.2.2 + haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; + HsSyck = self.HsSyck_0_51; + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; + random = null; # core package in ghc <= 7.0.x + }; + + ghc6123Prefs = self : super : ghc704Prefs self super // { + alex = self.alex_3_1_3; + cabalInstall = self.cabalInstall_1_16_0_2; + cgi = self.cgi_3001_1_7_5; + deepseq = self.deepseq_1_2_0_1; + haddock = self.haddock_2_7_2; + parallel = self.parallel_3_2_0_3; + primitive = self.primitive_0_5_0_1; + stm = self.stm_2_4_2; + syb = null; # core package in ghc < 7 + }; + + ghc6104Prefs = self : super : ghc6123Prefs self super // { + alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + binary = super.binary_0_6_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + Cabal = self.Cabal_1_16_0_3; + GLUT = self.GLUT_2_2_2_1; + haddock = self.haddock_2_4_2; + happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + hashable = self.hashable_1_1_2_5; + HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + OpenGLRaw = self.OpenGLRaw_1_3_0_0; + OpenGL = self.OpenGL_2_6_0_1; + QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + }; # Abstraction for Haskell packages collections packagesFun = makeOverridable ({ ghcPath , ghcBinary ? ghc6101Binary , prefFun - , extraPrefs ? (x : {}) + , extension ? (self : super : {}) , profExplicit ? false, profDefault ? false , modifyPrio ? lowPrio , extraArgs ? {} } : - import ./haskell-packages.nix { - inherit pkgs newScope modifyPrio; - prefFun = self : super : self // prefFun super // extraPrefs super; - # prefFun = self : super : self; - enableLibraryProfiling = - if profExplicit then profDefault - else config.cabal.libraryProfiling or profDefault; - ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs); - }); + let haskellPackagesClass = import ./haskell-packages.nix { + inherit pkgs newScope modifyPrio; + enableLibraryProfiling = + if profExplicit then profDefault + else config.cabal.libraryProfiling or profDefault; + ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs); + }; + haskellPackagesPrefsClass = self : let super = haskellPackagesClass self; in super // prefFun self super; + haskellPackagesExtensionClass = self : let super = haskellPackagesPrefsClass self; in super // extension self super; + haskellPackages = haskellPackagesExtensionClass haskellPackages; + in haskellPackages); defaultVersionPrioFun = profDefault : @@ -253,7 +129,7 @@ packages = args : let r = packagesFun args; in r // { lowPrio = r.override { modifyPrio = lowPrio; }; - highPrio = r.override { modifyPrio = x : x; }; + highPrio = r.override { modifyPrio = hiPrio; }; noProfiling = r.override { profDefault = false; profExplicit = true; modifyPrio = defaultVersionPrioFun false; }; @@ -266,16 +142,6 @@ # # GHC binaries are around for bootstrapping purposes - # If we'd want to reactivate the 6.6 and 6.8 series of ghc, we'd - # need to reenable an old binary such as this. - /* - ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix { - inherit fetchurl stdenv ncurses gmp; - readline = if stdenv.system == "i686-linux" then readline4 else readline5; - perl = perl58; - }); - */ - ghc6101Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.1-binary.nix { gmp = pkgs.gmp4; }); @@ -304,68 +170,32 @@ # Here, we associate compiler versions with bootstrap compiler versions and # preference functions. - packages_ghc6104 = - packages { ghcPath = ../development/compilers/ghc/6.10.4.nix; - prefFun = ghc6104Prefs; - }; - - packages_ghc6121 = - packages { ghcPath = ../development/compilers/ghc/6.12.1.nix; - prefFun = ghc6121Prefs; - }; - - packages_ghc6122 = - packages { ghcPath = ../development/compilers/ghc/6.12.2.nix; - prefFun = ghc6122Prefs; - }; - - packages_ghc6123 = - packages { ghcPath = ../development/compilers/ghc/6.12.3.nix; - prefFun = ghc6123Prefs; - }; - - # Will never make it into a platform release, severe bugs; leave at lowPrio. - packages_ghc701 = - packages { ghcPath = ../development/compilers/ghc/7.0.1.nix; - prefFun = ghc701Prefs; - }; - - packages_ghc702 = - packages { ghcPath = ../development/compilers/ghc/7.0.2.nix; - prefFun = ghc702Prefs; + packages_ghcHEAD = + packages { ghcPath = ../development/compilers/ghc/head.nix; + ghcBinary = pkgs.haskellPackages.ghcPlain; + prefFun = ghcHEADPrefs; + extraArgs = { + happy = pkgs.haskellPackages.happy_1_19_2; + alex = pkgs.haskellPackages.alex_3_1_3; + }; }; - packages_ghc703 = - packages { ghcPath = ../development/compilers/ghc/7.0.3.nix; - prefFun = ghc703Prefs; + packages_ghc782 = + packages { ghcPath = ../development/compilers/ghc/7.8.2.nix; + ghcBinary = ghc742Binary; + prefFun = ghc782Prefs; }; - # The following items are a bit convoluted, but they serve the - # following purpose: - # - for the default version of GHC, both profiling and - # non-profiling versions should be built by Hydra -- - # therefore, the _no_profiling and _profiling calls; - # - however, if a user just upgrades a profile, then the - # cabal/libraryProfiling setting should be respected; i.e., - # the versions not matching the profiling config setting - # should have low priority -- therefore, the use of - # defaultVersionPrioFun; - # - it should be possible to select library versions that - # respect the config setting using the standard - # packages_ghc704 path -- therefore, the additional - # call in packages_ghc704, without recurseIntoAttrs, - # so that Hydra doesn't build these. - - packages_ghc704 = - packages { ghcPath = ../development/compilers/ghc/7.0.4.nix; - ghcBinary = ghc6101BinaryDarwin; - prefFun = ghc704Prefs; + packages_ghc763 = + packages { ghcPath = ../development/compilers/ghc/7.6.3.nix; + ghcBinary = ghc704Binary; + prefFun = ghc763Prefs; }; - packages_ghc721 = - packages { ghcPath = ../development/compilers/ghc/7.2.1.nix; + packages_ghc742 = + packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; ghcBinary = ghc6121BinaryDarwin; - prefFun = ghc721Prefs; + prefFun = ghc742Prefs; }; packages_ghc722 = @@ -374,51 +204,20 @@ prefFun = ghc722Prefs; }; - packages_ghc741 = - packages { ghcPath = ../development/compilers/ghc/7.4.1.nix; - ghcBinary = ghc6121BinaryDarwin; - prefFun = ghc741Prefs; - }; - - packages_ghc742 = - packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; - ghcBinary = ghc6121BinaryDarwin; - prefFun = ghc742Prefs; - }; - - packages_ghc761 = - packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; - ghcBinary = ghc704Binary; - prefFun = ghc763Prefs; - }; - - packages_ghc762 = - packages { ghcPath = ../development/compilers/ghc/7.6.2.nix; - ghcBinary = ghc704Binary; - prefFun = ghc763Prefs; - }; - - packages_ghc763 = - packages { ghcPath = ../development/compilers/ghc/7.6.3.nix; - ghcBinary = ghc704Binary; - prefFun = ghc763Prefs; + packages_ghc704 = + packages { ghcPath = ../development/compilers/ghc/7.0.4.nix; + ghcBinary = ghc6101BinaryDarwin; + prefFun = ghc704Prefs; }; - packages_ghc781 = - packages { ghcPath = ../development/compilers/ghc/7.8.1.nix; - ghcBinary = ghc742Binary; - prefFun = ghc781Prefs; + packages_ghc6123 = + packages { ghcPath = ../development/compilers/ghc/6.12.3.nix; + prefFun = ghc6123Prefs; }; - # Reasonably current HEAD snapshot. Should *always* be lowPrio. - packages_ghcHEAD = - packages { ghcPath = ../development/compilers/ghc/head.nix; - ghcBinary = ghc742Binary; - prefFun = ghcHEADPrefs; - extraArgs = { - happy = pkgs.haskellPackages.happy_1_19_2; - alex = pkgs.haskellPackages.alex_3_1_3; - }; + packages_ghc6104 = + packages { ghcPath = ../development/compilers/ghc/6.10.4.nix; + prefFun = ghc6104Prefs; }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e1904403a85..886190a34e13 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,20 +1,5 @@ # Haskell packages in Nixpkgs # -# If you have any questions about the packages defined here or how to -# contribute, please contact Andres Loeh. -# -# This file defines all packages that depend on GHC, the Glasgow Haskell -# compiler. They are usually distributed via Hackage, the central Haskell -# package repository. Since at least the libraries are incompatible between -# different compiler versions, the whole file is parameterized by the GHC -# that is being used. GHC itself is composed in haskell-defaults.nix. -# -# Note that next to the packages defined here, there is another way to build -# arbitrary packages from HackageDB in Nix, using the hack-nix tool that is -# developed by Marc Weber. -# -> http://github.com/MarcWeber/hack-nix. Read its README file. -# -# # This file defines a function parameterized by the following: # # pkgs: @@ -58,7 +43,7 @@ # # For most packages, however, we keep only one version, and use default.nix. -{ pkgs, newScope, ghc, prefFun, modifyPrio ? (x : x) +{ pkgs, newScope, ghc, modifyPrio ? (x : x) , enableLibraryProfiling ? false , enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version @@ -70,17 +55,13 @@ # modifyPrio argument can be set to lowPrio to make all Haskell packages have # low priority. -let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x y); - self = (prefFun result) result; in +self : let callPackage = x : y : modifyPrio (newScope self x y); in # Indentation deliberately broken at this point to keep the bulk # of this file at a low indentation level. { - - finalReturn = self; - - callPackage = callPackage; + inherit callPackage; # GHC and its wrapper # @@ -114,9 +95,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # packages. It isn't the Cabal library, which is spelled "Cabal". cabal = callPackage ../build-support/cabal { + Cabal = null; # prefer the Cabal version shipped with the compiler inherit enableLibraryProfiling enableCheckPhase enableStaticLibraries enableSharedLibraries enableSharedExecutables; glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; + extension = self : super : {}; }; # A variant of the cabal build driver that disables unit testing. @@ -127,383 +110,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Convenience helper function. disableTest = x: x.override { cabal = self.cabalNoTest; }; - # Haskell Platform - # - # We try to support several platform versions. For these, we set all - # versions explicitly. - # - # DO NOT CHANGE THE VERSIONS LISTED HERE from the actual Haskell - # Platform defaults. If you must update the defaults for a particular - # GHC version, change the "preferences function" for that GHC version - # in haskell-defaults.nix. - - # NOTE: 2013.2.0.0 is the current default. - - haskellPlatformArgs_future = self : { - inherit (self) cabal ghc; - async = self.async_2_0_1_5; - attoparsec = self.attoparsec_0_11_2_1; - caseInsensitive = self.caseInsensitive_1_2_0_0; - cgi = self.cgi_3001_1_8_5; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_5_1_0; - GLURaw = self.GLURaw_1_4_0_0; - haskellSrc = self.haskellSrc_1_0_1_5; - hashable = self.hashable_1_2_1_0; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_11; - HUnit = self.HUnit_1_2_5_2; - mtl = self.mtl_2_1_3_1; - network = self.network_2_4_2_2; - OpenGL = self.OpenGL_2_9_1_0; - OpenGLRaw = self.OpenGLRaw_1_4_0_0; - parallel = self.parallel_3_2_0_4; - parsec = self.parsec_3_1_5; - QuickCheck = self.QuickCheck_2_6; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_2; - stm = self.stm_2_4_3; - syb = self.syb_0_4_1; - text = self.text_1_1_0_1; - transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 - unorderedContainers = self.unorderedContainers_0_2_3_3; - vector = self.vector_0_10_9_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_18_0_3; - alex = self.alex_3_1_3; - haddock = self.haddock_2_14_1; - happy = self.happy_1_19_3; - primitive = self.primitive_0_5_2_1; # semi-official, but specified - }; - - haskellPlatformArgs_2013_2_0_0 = self : { - inherit (self) cabal ghc; - async = self.async_2_0_1_4; - attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_0_0_1; - cgi = self.cgi_3001_1_7_5; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_4_0_0; - GLURaw = self.GLURaw_1_3_0_0; - haskellSrc = self.haskellSrc_1_0_1_5; - hashable = self.hashable_1_2_1_0; # not HP (1.1.2.5), but fixes many builds - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_8; - HUnit = self.HUnit_1_2_5_2; - mtl = self.mtl_2_1_2; - network = self.network_2_4_1_2; - OpenGL = self.OpenGL_2_8_0_0; - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_6; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_2; - stm = self.stm_2_4_2; - syb = self.syb_0_4_0; - text = self.text_0_11_3_1; - transformers = self.transformers_0_3_0_0; - unorderedContainers = self.unorderedContainers_0_2_3_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_16_0_2; - alex = self.alex_3_0_5; - haddock = self.haddock_2_13_2; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - - haskellPlatform_2013_2_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2013.2.0.0.nix - (self.haskellPlatformArgs_2013_2_0_0 self); - - haskellPlatformArgs_2012_4_0_0 = self : { - inherit (self) cabal ghc; - async = self.async_2_0_1_3; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_5; - HUnit = self.HUnit_1_2_5_1; - mtl = self.mtl_2_1_2; - network = self.network_2_3_1_0; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_5_1_1; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_1_1; - stm = self.stm_2_4; - syb = self.syb_0_3_7; - text = self.text_0_11_2_3; - transformers = self.transformers_0_3_0_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_0; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_2; - haddock = self.haddock_2_11_0; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - - haskellPlatform_2012_4_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2012.4.0.0.nix - (self.haskellPlatformArgs_2012_4_0_0 self); - - haskellPlatformArgs_2012_2_0_0 = self : { - inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_3; - HUnit = self.HUnit_1_2_4_2; - mtl = self.mtl_2_1_1; - network = self.network_2_3_0_13; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_2; - parsec = self.parsec_3_1_2; - QuickCheck = self.QuickCheck_2_4_2; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_3; - syb = self.syb_0_3_6_1; - text = self.text_0_11_2_0; - transformers = self.transformers_0_3_0_0; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_3_3; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_1; - haddock = self.haddock_2_10_0; - happy = self.happy_1_18_9; - }; - - haskellPlatform_2012_2_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2012.2.0.0.nix - (self.haskellPlatformArgs_2012_2_0_0 self); - - haskellPlatformArgs_2011_4_0_0 = self : { - inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_4_2; - network = self.network_2_3_0_5; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3_3; - xhtml = self.xhtml_3000_2_0_4; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_2; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_1_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - haddock = self.haddock_2_9_2; - }; - - haskellPlatform_2011_4_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2011.4.0.0.nix - (self.haskellPlatformArgs_2011_4_0_0 self); - - haskellPlatformArgs_2011_2_0_1 = self : { - inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_6; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - haddock = self.haddock_2_9_2; - }; - - haskellPlatform_2011_2_0_1 = - callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.1.nix - (self.haskellPlatformArgs_2011_2_0_1 self); - - haskellPlatformArgs_2011_2_0_0 = self : { - inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - haddock = self.haddock_2_9_2; - }; - - haskellPlatform_2011_2_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.0.nix - (self.haskellPlatformArgs_2011_2_0_0 self); - - haskellPlatformArgs_2010_2_0_0 = self : { - inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_3; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_1; - mtl = self.mtl_1_1_0_2; - network = self.network_2_2_1_7; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_2_1_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_2; - stm = self.stm_2_1_2_1; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_2_0; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - cabalInstall = self.cabalInstall_0_8_2; - alex = self.alex_2_3_3; - happy = self.happy_1_18_5; - haddock = self.haddock_2_7_2; - }; - - haskellPlatform_2010_2_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix - (self.haskellPlatformArgs_2010_2_0_0 self); - - haskellPlatformArgs_2010_1_0_0 = self : { - inherit (self) cabal ghc; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - fgl = self.fgl_5_4_2_2; - cabalInstall = self.cabalInstall_0_8_0; - GLUT = self.GLUT_2_1_2_1; - OpenGL = self.OpenGL_2_2_3_0; - zlib = self.zlib_0_5_2_0; - alex = self.alex_2_3_2; - cgi = self.cgi_3001_1_7_2; - QuickCheck = self.QuickCheck_2_1_1_1; - HTTP = self.HTTP_4000_0_9; - HUnit = self.HUnit_1_2_2_1; - network = self.network_2_2_1_7; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - regexBase = self.regexBase_0_93_1; - regexCompat = self.regexCompat_0_92; - regexPosix = self.regexPosix_0_94_1; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - haddock = self.haddock_2_7_2; - happy = self.happy_1_18_4; - }; - - haskellPlatform_2010_1_0_0 = - callPackage ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix - (self.haskellPlatformArgs_2010_1_0_0 self); - - haskellPlatformArgs_2009_2_0_2 = self : { - inherit (self) cabal ghc; - time = self.time_1_1_2_4; - haddock = self.haddock_2_4_2; - cgi = self.cgi_3001_1_7_1; - editline = self.editline_0_2_1_0; - fgl = self.fgl_5_4_2_2; - GLUT = self.GLUT_2_1_1_2; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_0_3; - network = self.network_2_2_1_4; - OpenGL = self.OpenGL_2_2_1_1; - parallel = self.parallel_1_1_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_1_2_0_0; - regexBase = self.regexBase_0_72_0_2; - regexCompat = self.regexCompat_0_71_0_1; - regexPosix = self.regexPosix_0_72_0_3; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_0_0; - HTTP = self.HTTP_4000_0_6; - cabalInstall = self.cabalInstall_0_6_2; - alex = self.alex_2_3_1; - happy = self.happy_1_18_4; - }; - - haskellPlatform_2009_2_0_2 = - callPackage ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix - (self.haskellPlatformArgs_2009_2_0_2 self); - # Haskell libraries. acidState = callPackage ../development/libraries/haskell/acid-state {}; - Agda = callPackage ../development/libraries/haskell/Agda {}; - accelerate = callPackage ../development/libraries/haskell/accelerate {}; accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {}; @@ -529,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x aes = callPackage ../development/libraries/haskell/aes {}; aeson = callPackage ../development/libraries/haskell/aeson { - blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; + blazeBuilder = null; }; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -552,18 +162,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; - ariadne = callPackage ../development/libraries/haskell/ariadne { - Cabal = self.Cabal_1_18_1_3; - haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_3; - }; - haskellNames = self.haskellNames.override { - Cabal = self.Cabal_1_18_1_3; - haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_3; - }; - }; - }; + ariadne = callPackage ../development/libraries/haskell/ariadne {}; arithmoi = callPackage ../development/libraries/haskell/arithmoi {}; @@ -579,8 +178,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; - AspectAG = callPackage ../development/libraries/haskell/AspectAG {}; - async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {}; @@ -593,8 +190,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x attoLisp = callPackage ../development/libraries/haskell/atto-lisp {}; attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; - attoparsec_0_11_2_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.2.1.nix {}; - attoparsec = self.attoparsec_0_10_4_0; + attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; + attoparsec = self.attoparsec_0_11_3_1; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -630,18 +227,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x bimap = callPackage ../development/libraries/haskell/bimap {}; - binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {}; - binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {}; - binary = null; # core package starting with GHC 7.4.x + binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; + binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {}; + binary = null; # core package since ghc >= 7.2.x - binaryConduit = callPackage ../development/libraries/haskell/binary-conduit { - binary = self.binary_0_7_1_0; - }; + binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {}; + bindingsGLFW = callPackage ../development/libraries/haskell/bindings-GLFW {}; + bindingsLibusb = callPackage ../development/libraries/haskell/bindings-libusb { libusb = pkgs.libusb1; }; @@ -673,20 +270,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp = callPackage ../development/libraries/haskell/bmp { - binary = self.binary_0_7_1_0; + binary = self.binary_0_7_2_0; }; Boolean = callPackage ../development/libraries/haskell/Boolean {}; brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; - bson = callPackage ../development/libraries/haskell/bson { - binary = self.binary_0_7_1_0; - dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_1_0; }; - }; + bson = callPackage ../development/libraries/haskell/bson {}; boomerang = callPackage ../development/libraries/haskell/boomerang {}; + bv = callPackage ../development/libraries/haskell/bv {}; + byteable = callPackage ../development/libraries/haskell/byteable {}; bytedump = callPackage ../development/libraries/haskell/bytedump {}; @@ -705,15 +301,22 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {}; + bzlib = callPackage ../development/libraries/haskell/bzlib {}; + c2hs = callPackage ../development/libraries/haskell/c2hs {}; - Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal = null; # core package in GHC + c2hsc = callPackage ../development/libraries/haskell/c2hsc {}; + + Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; + Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; + Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; + Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix {}; + Cabal = null; # core package since forever cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; + cabalLenses = callPackage ../development/libraries/haskell/cabal-lenses {}; + cabalMacosx = callPackage ../development/libraries/haskell/cabal-macosx {}; cairo = callPackage ../development/libraries/haskell/cairo { @@ -732,6 +335,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; + CCdelcont = callPackage ../development/libraries/haskell/CC-delcont {}; + cereal = callPackage ../development/libraries/haskell/cereal {}; cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {}; @@ -753,11 +358,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {}; ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {}; - ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms { QuickCheck = self.QuickCheck_2_6; }; cheapskate = callPackage ../development/libraries/haskell/cheapskate {}; - checkers = callPackage ../development/libraries/haskell/checkers {}; + checkers = callPackage ../development/libraries/haskell/checkers { QuickCheck = self.QuickCheck_2_6; }; chell = callPackage ../development/libraries/haskell/chell {}; @@ -809,10 +414,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + composition = callPackage ../development/libraries/haskell/composition {}; + concatenative = callPackage ../development/libraries/haskell/concatenative {}; concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {}; + cond = callPackage ../development/libraries/haskell/cond {}; + conduit = callPackage ../development/libraries/haskell/conduit {}; conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {}; @@ -831,7 +440,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; - convertible = callPackage ../development/libraries/haskell/convertible {}; + convertible_1_0_11_1 = callPackage ../development/libraries/haskell/convertible/1.0.11.1.nix {}; + convertible_1_1_0_0 = callPackage ../development/libraries/haskell/convertible/1.1.0.0.nix {}; + convertible = self.convertible_1_1_0_0; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; @@ -917,10 +528,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dataLens = callPackage ../development/libraries/haskell/data-lens {}; + dataLensLight = callPackage ../development/libraries/haskell/data-lens-light {}; + dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; + dataOrdlist = callPackage ../development/libraries/haskell/data-ordlist {}; + dataPprint = callPackage ../development/libraries/haskell/data-pprint {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; @@ -939,7 +554,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {}; - deepseq = null; # a core package in recent GHCs + deepseq = null; # core package since ghc >= 7.4.x deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; @@ -993,6 +608,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x distributive = callPackage ../development/libraries/haskell/distributive {}; + djinn = callPackage ../development/libraries/haskell/djinn {}; + dlist = callPackage ../development/libraries/haskell/dlist {}; dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {}; @@ -1001,6 +618,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x doctest = callPackage ../development/libraries/haskell/doctest {}; + doctestProp = callPackage ../development/libraries/haskell/doctest-prop {}; + dotgen = callPackage ../development/libraries/haskell/dotgen {}; doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; @@ -1011,14 +630,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x DRBG = callPackage ../development/libraries/haskell/DRBG {}; - DSH = callPackage ../development/libraries/haskell/DSH {}; - dsp = callPackage ../development/libraries/haskell/dsp {}; dstring = callPackage ../development/libraries/haskell/dstring {}; dualTree = callPackage ../development/libraries/haskell/dual-tree {}; + dynamicCabal = callPackage ../development/libraries/haskell/dynamic-cabal {}; + dyre = callPackage ../development/libraries/haskell/dyre {}; editDistance = callPackage ../development/libraries/haskell/edit-distance {}; @@ -1028,16 +647,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x editline = self.editline_0_2_1_1; ekg = callPackage ../development/libraries/haskell/ekg {}; + ekgCore = callPackage ../development/libraries/haskell/ekg-core {}; elerea = callPackage ../development/libraries/haskell/elerea {}; - Elm = callPackage ../development/compilers/elm/elm.nix { - binary = self.binary_0_7_1_0; - pandoc = self.pandoc.override { - binary = self.binary_0_7_1_0; - zipArchive = self.zipArchive.override { binary = self.binary_0_7_1_0; }; - }; - }; + Elm = callPackage ../development/compilers/elm/elm.nix {}; elmServer = callPackage ../development/compilers/elm/elm-server.nix {}; @@ -1053,6 +667,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {}; + enumset = callPackage ../development/libraries/haskell/enumset {}; + entropy = callPackage ../development/libraries/haskell/entropy {}; erf = callPackage ../development/libraries/haskell/erf {}; @@ -1075,22 +691,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; - exceptions = callPackage ../development/libraries/haskell/exceptions { - QuickCheck = self.QuickCheck_2_5_1_1; - }; + exceptions = callPackage ../development/libraries/haskell/exceptions {}; explicitException = callPackage ../development/libraries/haskell/explicit-exception {}; executablePath = callPackage ../development/libraries/haskell/executable-path {}; + Extra = callPackage ../development/libraries/haskell/Extra {}; + fay = callPackage ../development/libraries/haskell/fay {}; fayBase = callPackage ../development/libraries/haskell/fay-base {}; + fayText = callPackage ../development/libraries/haskell/fay-text {}; + fdoNotify = callPackage ../development/libraries/haskell/fdo-notify {}; - filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {}; - filepath = null; # a core package in recent GHCs + filepath_1_3_0_2 = callPackage ../development/libraries/haskell/filepath/1.3.0.2.nix {}; + filepath = null; # core package since forever fileLocation = callPackage ../development/libraries/haskell/file-location {}; @@ -1102,7 +720,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {}; - extensibleExceptions = null; # a core package in recent GHCs + extensibleExceptions = self.extensibleExceptions_0_1_1_4; failure = callPackage ../development/libraries/haskell/failure {}; @@ -1135,7 +753,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; - fgl = self.fgl_5_4_2_4; + fgl_5_5_0_1 = callPackage ../development/libraries/haskell/fgl/5.5.0.1.nix {}; + fgl = self.fgl_5_5_0_1; fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {}; @@ -1167,6 +786,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ghcEventsAnalyze = callPackage ../development/tools/haskell/ghc-events-analyze {}; + ghcGcTune = callPackage ../development/tools/haskell/ghc-gc-tune {}; + ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view { cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled }; @@ -1207,6 +828,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x GLFW = callPackage ../development/libraries/haskell/GLFW {}; + GLFWb = callPackage ../development/libraries/haskell/GLFW-b {}; + glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; libc = pkgs.stdenv.gcc.libc; @@ -1226,21 +849,23 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; - GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix {}; - GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix {}; + GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; + GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; }; GLURaw = self.GLURaw_1_4_0_0; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {}; GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { - OpenGL = self.OpenGL_2_4_0_2; + OpenGL = self.OpenGL_2_6_0_1; }; GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { - OpenGL = self.OpenGL_2_6_0_1; + OpenGLRaw = self.OpenGLRaw_1_3_0_0; + OpenGL = self.OpenGL_2_6_0_1.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; }; GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { - OpenGL = self.OpenGL_2_8_0_0; + OpenGLRaw = self.OpenGLRaw_1_3_0_0; + OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; }; GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix { OpenGL = self.OpenGL_2_9_1_0; @@ -1272,8 +897,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x graphviz = callPackage ../development/libraries/haskell/graphviz {}; + graphSCC = callPackage ../development/libraries/haskell/graphscc {}; + graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {}; + groom = callPackage ../development/libraries/haskell/groom {}; + groups = callPackage ../development/libraries/haskell/groups {}; groupoids = callPackage ../development/libraries/haskell/groupoids {}; @@ -1291,8 +920,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_1_0 = callPackage ../development/libraries/haskell/hashable/1.2.1.0.nix {}; - hashable = self.hashable_1_2_1_0; + hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {}; + hashable = self.hashable_1_2_2_0; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; @@ -1300,12 +929,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskelldb = callPackage ../development/libraries/haskell/haskelldb {}; - haskeline_0_7_1_1 = callPackage ../development/libraries/haskell/haskeline/0.7.1.1.nix {}; - haskeline_0_7_1_2 = callPackage ../development/libraries/haskell/haskeline/0.7.1.2.nix {}; - haskeline = self.haskeline_0_7_1_2; + haskeline = callPackage ../development/libraries/haskell/haskeline {}; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; + haskellGenerate = callPackage ../development/libraries/haskell/haskell-generate {}; + haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {}; haskellMpi = callPackage ../development/libraries/haskell/haskell-mpi { @@ -1319,7 +948,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; - haskellSrc = self.haskellSrc_1_0_1_5; + haskellSrc_1_0_1_6 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.6.nix {}; + haskellSrc = self.haskellSrc_1_0_1_6; haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {}; @@ -1329,10 +959,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hastache = callPackage ../development/libraries/haskell/hastache {}; + hcltest = callPackage ../development/libraries/haskell/hcltest {}; + heredoc = callPackage ../development/libraries/haskell/heredoc {}; hexpat = callPackage ../development/libraries/haskell/hexpat {}; + hgal = callPackage ../development/libraries/haskell/hgal {}; + + hourglass = callPackage ../development/libraries/haskell/hourglass {}; + hseCpp = callPackage ../development/libraries/haskell/hse-cpp {}; hsimport = callPackage ../development/libraries/haskell/hsimport {}; @@ -1346,10 +982,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; + HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; }; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_11 = callPackage ../development/libraries/haskell/HTTP/4000.2.11.nix {}; - HTTP = self.HTTP_4000_2_11; + HTTP_4000_2_15 = callPackage ../development/libraries/haskell/HTTP/4000.2.15.nix {}; + HTTP = self.HTTP_4000_2_15; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; @@ -1363,6 +999,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x httpCommon = callPackage ../development/libraries/haskell/http-common {}; + httpKit = callPackage ../development/libraries/haskell/http-kit {}; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; @@ -1389,6 +1027,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hflags = callPackage ../development/libraries/haskell/hflags {}; + hfsevents = callPackage ../development/libraries/haskell/hfsevents {}; + HFuse = callPackage ../development/libraries/haskell/HFuse {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; @@ -1397,8 +1037,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hint = callPackage ../development/libraries/haskell/hint {}; - Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {}; - hit = callPackage ../development/libraries/haskell/hit {}; hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; @@ -1413,6 +1051,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; + hmatrix-special = callPackage ../development/libraries/haskell/hmatrix-special {}; + hoauth = callPackage ../development/libraries/haskell/hoauth {}; hoauth2 = callPackage ../development/libraries/haskell/hoauth2 {}; @@ -1447,7 +1087,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsdns = callPackage ../development/libraries/haskell/hsdns {}; - hsemail = callPackage ../development/libraries/haskell/hsemail {}; + hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else + callPackage ../development/libraries/haskell/hsemail {}; hslua = callPackage ../development/libraries/haskell/hslua { lua = pkgs.lua5_1; @@ -1457,7 +1098,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsini = callPackage ../development/libraries/haskell/hsini {}; - HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; + HsSyck_0_51 = callPackage ../development/libraries/haskell/HsSyck/0.51.nix {}; + HsSyck_0_52 = callPackage ../development/libraries/haskell/HsSyck/0.52.nix {}; + HsSyck = self.HsSyck_0_52; HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {}; @@ -1469,19 +1112,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; - hspec = callPackage ../development/libraries/haskell/hspec { - QuickCheck = self.QuickCheck_2_7_3; - quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; }; - }; + hspec = callPackage ../development/libraries/haskell/hspec {}; hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; - hspecMeta = callPackage ../development/libraries/haskell/hspec-meta { - QuickCheck = self.QuickCheck_2_7_3; - quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; }; - }; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; @@ -1561,6 +1198,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ioStreams = callPackage ../development/libraries/haskell/io-streams {}; + ipprint = callPackage ../development/libraries/haskell/ipprint {}; + iproute = callPackage ../development/libraries/haskell/iproute {}; irc = callPackage ../development/libraries/haskell/irc {}; @@ -1575,21 +1214,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ixShapable = callPackage ../development/libraries/haskell/ix-shapable {}; + jack = callPackage ../development/libraries/haskell/jack {}; + JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {}; jpeg = callPackage ../development/libraries/haskell/jpeg {}; - JsContracts = callPackage ../development/libraries/haskell/JsContracts { - WebBits = self.WebBits_1_0; - WebBitsHtml = self.WebBitsHtml_1_0_1; - }; - json = callPackage ../development/libraries/haskell/json {}; jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; + kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {}; + kansasLava = callPackage ../development/libraries/haskell/kansas-lava {}; keys = callPackage ../development/libraries/haskell/keys {}; @@ -1597,7 +1235,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x knob = callPackage ../development/libraries/haskell/knob {}; languageC = callPackage ../development/libraries/haskell/language-c {}; - + languageCInline = callPackage ../development/libraries/haskell/language-c-inline {}; languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {}; @@ -1606,9 +1244,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x languageJava = callPackage ../development/libraries/haskell/language-java {}; - languageJavascript = callPackage ../development/libraries/haskell/language-javascript { - alex = self.alex_3_1_3; - }; + languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; @@ -1622,8 +1258,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; - leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; - lens = callPackage ../development/libraries/haskell/lens {}; lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; @@ -1658,6 +1292,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x List = callPackage ../development/libraries/haskell/List {}; + lists = callPackage ../development/libraries/haskell/lists {}; + + listExtras = callPackage ../development/libraries/haskell/listExtras {}; + listTries = callPackage ../development/libraries/haskell/list-tries {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; @@ -1680,12 +1318,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lrucache = callPackage ../development/libraries/haskell/lrucache {}; - ltk = callPackage ../development/libraries/haskell/ltk {}; - lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {}; logfloat = callPackage ../development/libraries/haskell/logfloat {}; + logging = callPackage ../development/libraries/haskell/logging {}; + logict = callPackage ../development/libraries/haskell/logict {}; lushtags = callPackage ../development/libraries/haskell/lushtags {}; @@ -1717,7 +1355,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x minimorph = callPackage ../development/libraries/haskell/minimorph {}; miniutter = callPackage ../development/libraries/haskell/miniutter { - binary = self.binary_0_7_1_0; + binary = self.binary_0_7_2_0; }; mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; @@ -1726,9 +1364,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x misfortune = callPackage ../development/libraries/haskell/misfortune {}; - MissingH = callPackage ../development/libraries/haskell/MissingH { - testpack = null; - }; + missingForeign = callPackage ../development/libraries/haskell/missing-foreign {}; + + MissingH = callPackage ../development/libraries/haskell/MissingH { testpack = null; }; mmap = callPackage ../development/libraries/haskell/mmap {}; @@ -1740,8 +1378,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monadControl = callPackage ../development/libraries/haskell/monad-control {}; + monadCoroutine = callPackage ../development/libraries/haskell/monad-coroutine {}; + monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {}; + monadExtras = callPackage ../development/libraries/haskell/monad-extras {}; + + monadLib = callPackage ../development/libraries/haskell/monadlib {}; + monadloc = callPackage ../development/libraries/haskell/monadloc {}; monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; @@ -1752,6 +1396,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; monadPar = self.monadPar_0_3_4_6; + monadParallel = callPackage ../development/libraries/haskell/monad-parallel {}; + monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; monadPeel = callPackage ../development/libraries/haskell/monad-peel {}; @@ -1760,6 +1406,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; + monadStm = callPackage ../development/libraries/haskell/monad-stm {}; + monadsTf = callPackage ../development/libraries/haskell/monads-tf {}; monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {}; @@ -1774,19 +1422,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mpppc = callPackage ../development/libraries/haskell/mpppc {}; + msgpack = callPackage ../development/libraries/haskell/msgpack {}; + mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; - mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix { - transformers = self.transformers_0_3_0_0; - }; - mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix { - transformers = self.transformers_0_3_0_0; - }; - mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix { - transformers = self.transformers_0_3_0_0; - }; - mtl = self.mtl_2_1_3_1; + mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; + mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; + mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; + mtl_2_2_0_1 = callPackage ../development/libraries/haskell/mtl/2.2.0.1.nix {}; + mtl = null; # tightly coupled with 'transformers' which is a core package mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; @@ -1794,13 +1439,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x multiarg = callPackage ../development/libraries/haskell/multiarg {}; + multimap = callPackage ../development/libraries/haskell/multimap {}; + multiplate = callPackage ../development/libraries/haskell/multiplate {}; multirec = callPackage ../development/libraries/haskell/multirec {}; - multiset_0_2_1 = callPackage ../development/libraries/haskell/multiset/0.2.1.nix {}; - multiset_0_2_2 = callPackage ../development/libraries/haskell/multiset/0.2.2.nix {}; - multiset = self.multiset_0_2_1; # later versions work only with ghc 7.6 and beyond + multiset = callPackage ../development/libraries/haskell/multiset {}; murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; @@ -1813,8 +1458,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {}; - NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; - nanospec = callPackage ../development/libraries/haskell/nanospec {}; nat = callPackage ../development/libraries/haskell/nat {}; @@ -1840,8 +1483,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; - network_2_4_2_2 = callPackage ../development/libraries/haskell/network/2.4.2.2.nix {}; - network = self.network_2_4_2_2; + network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; + network = self.network_2_5_0_0; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; @@ -1892,10 +1535,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix { - OpenGLRaw = self.OpenGLRaw_1_4_0_0; - GLURaw = self.GLURaw_1_4_0_0.override { OpenGLRaw = self.OpenGLRaw_1_4_0_0; }; - }; + OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; @@ -1942,16 +1582,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; parsec_3_1_5 = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {}; - parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_5; - parsec = self.parsec3; + parsec = self.parsec_3_1_5; - parsers = callPackage ../development/libraries/haskell/parsers {}; + parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; + parsers_0_11 = callPackage ../development/libraries/haskell/parsers/0.11.nix {}; + parsers = self.parsers_0_11; parsimony = callPackage ../development/libraries/haskell/parsimony {}; - Pathfinder = callPackage ../development/libraries/haskell/Pathfinder {}; - pathtype = callPackage ../development/libraries/haskell/pathtype {}; pbkdf = callPackage ../development/libraries/haskell/pbkdf {}; @@ -1984,9 +1622,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {}; - pipesBinary = callPackage ../development/libraries/haskell/pipes-binary { - binary = self.binary_0_7_1_0; - }; + pipesBinary = callPackage ../development/libraries/haskell/pipes-binary {}; pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {}; @@ -2019,6 +1655,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x libc = pkgs.stdenv.gcc.libc; }; + posixPaths = callPackage ../development/libraries/haskell/posix-paths {}; + postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { inherit (pkgs) postgresql; }; @@ -2029,25 +1667,31 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pqueue = callPackage ../development/libraries/haskell/pqueue {}; - preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {}; + process_1_2_0_0 = callPackage ../development/libraries/haskell/process/1.2.0.0.nix {}; + process = null; # core package since forever - preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {}; + profiteur = callPackage ../development/tools/haskell/profiteur {}; + preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {}; + + preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {}; + preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {}; preprocessorTools = self.preprocessorTools_1_0_1; + presburger = callPackage ../development/libraries/haskell/presburger {}; + prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix { - happy = self.happy_1_19_2; - }; + prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {}; prettyShow = self.prettyShow_1_6_7; punycode = callPackage ../development/libraries/haskell/punycode {}; - primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; - primitive = self.primitive_0_5_0_1; + primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; + primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; + primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; + primitive = self.primitive_0_5_3_0; profunctors = callPackage ../development/libraries/haskell/profunctors {}; @@ -2059,15 +1703,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x processExtras = callPackage ../development/libraries/haskell/process-extras {}; - processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; - prolog = callPackage ../development/libraries/haskell/prolog {}; - prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib { - fgl = self.fgl_5_4_2_4; - }; - prologGraph = callPackage ../development/libraries/haskell/prolog-graph { - fgl = self.fgl_5_4_2_4; - }; + prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {}; + prologGraph = callPackage ../development/libraries/haskell/prolog-graph {}; protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {}; @@ -2090,18 +1728,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; QuickCheck_2_7_3 = callPackage ../development/libraries/haskell/QuickCheck/2.7.3.nix {}; - QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_6; - QuickCheck = self.QuickCheck2; + QuickCheck = self.QuickCheck_2_7_3; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; - quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances { - QuickCheck = self.QuickCheck_2_7_3; - }; + quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; + quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {}; + qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; }; @@ -2109,7 +1745,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; - random = null; # core package until ghc-7.2.1 + random = self.random_1_0_1_1; randomFu = callPackage ../development/libraries/haskell/random-fu {}; @@ -2139,17 +1775,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x reflection = callPackage ../development/libraries/haskell/reflection {}; + regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; + regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; - regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; - regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; + regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; + regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; regexBase = self.regexBase_0_93_2; regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; - regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; - regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; - regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; - regexCompat93 = self.regexCompat_0_93_1; - regexCompat = self.regexCompat_0_71_0_1; + regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; + regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; + regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; + regexCompat = self.regexCompat_0_95_1; regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {}; @@ -2165,8 +1802,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {}; - regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {}; - regexPcre = self.regexPCRE; + regexPcre = callPackage ../development/libraries/haskell/regex-pcre {}; regexpr = callPackage ../development/libraries/haskell/regexpr {}; @@ -2191,6 +1827,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {}; + rex = callPackage ../development/libraries/haskell/rex {}; + rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {}; robotsTxt = callPackage ../development/libraries/haskell/robots-txt {}; @@ -2243,6 +1881,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + smtLib = callPackage ../development/libraries/haskell/smtLib {}; + smtpMail = callPackage ../development/libraries/haskell/smtp-mail {}; smtpsGmail = callPackage ../development/libraries/haskell/smtps-gmail {}; @@ -2251,10 +1891,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {}; + snapletStripe = callPackage ../development/libraries/haskell/snaplet-stripe {}; + snapBlaze = callPackage ../development/libraries/haskell/snap-blaze/default.nix {}; snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; + snapCORS = callPackage ../development/libraries/haskell/snap-cors {}; + snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {}; snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {}; @@ -2267,6 +1911,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x sparse = callPackage ../development/libraries/haskell/sparse {}; + speculation = callPackage ../development/libraries/haskell/speculation {}; + + spoon = callPackage ../development/libraries/haskell/spoon {}; + srcloc = callPackage ../development/libraries/haskell/srcloc {}; stateref = callPackage ../development/libraries/haskell/stateref {}; @@ -2275,10 +1923,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x StateVar = callPackage ../development/libraries/haskell/StateVar {}; - statistics = callPackage ../development/libraries/haskell/statistics { - binary = self.binary_0_7_1_0; - vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; }; - }; + statistics = callPackage ../development/libraries/haskell/statistics {}; statvfs = callPackage ../development/libraries/haskell/statvfs {}; @@ -2314,8 +1959,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; syb_0_4_1 = callPackage ../development/libraries/haskell/syb/0.4.1.nix {}; - syb = null; # by default, we assume that syb ships with GHC, which is - # true for the older GHC versions + syb = self.syb_0_4_1; sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {}; @@ -2382,6 +2026,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stmConduit = callPackage ../development/libraries/haskell/stm-conduit {}; + stmStats = callPackage ../development/libraries/haskell/stm-stats {}; + storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; storableRecord = callPackage ../development/libraries/haskell/storable-record {}; @@ -2408,6 +2054,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {}; + systemTimeMonotonic = callPackage ../development/libraries/haskell/system-time-monotonic {}; + TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; tabular = callPackage ../development/libraries/haskell/tabular {}; @@ -2430,9 +2078,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; - tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { - QuickCheck = self.QuickCheck_2_7_3; - }; + tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; @@ -2444,6 +2090,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x temporary = callPackage ../development/libraries/haskell/temporary {}; + temporaryRc = callPackage ../development/libraries/haskell/temporary-rc {}; + Tensor = callPackage ../development/libraries/haskell/Tensor {}; terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {}; @@ -2459,7 +2107,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck { - QuickCheck = self.QuickCheck1; + QuickCheck = self.QuickCheck_1_2_0_1; # doesn't support version 2.x }; testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; @@ -2479,8 +2127,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text_1_1_0_1 = callPackage ../development/libraries/haskell/text/1.1.0.1.nix {}; - text = self.text_1_1_0_1; + text_1_1_1_2 = callPackage ../development/libraries/haskell/text/1.1.1.2.nix {}; + text = self.text_1_1_1_2; textFormat = callPackage ../development/libraries/haskell/text-format {}; @@ -2488,16 +2136,23 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; - tfRandom = callPackage ../development/libraries/haskell/tf-random {}; + tfRandom = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else + callPackage ../development/libraries/haskell/tf-random {}; + + these = callPackage ../development/libraries/haskell/these {}; thespian = callPackage ../development/libraries/haskell/thespian {}; thDesugar = callPackage ../development/libraries/haskell/th-desugar {}; + thExpandSyns = callPackage ../development/libraries/haskell/th-expand-syns {}; + thExtras = callPackage ../development/libraries/haskell/th-extras {}; thLift = callPackage ../development/libraries/haskell/th-lift {}; + thLiftInstances = callPackage ../development/libraries/haskell/th-lift-instances {}; + thOrphans = callPackage ../development/libraries/haskell/th-orphans {}; threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; @@ -2510,9 +2165,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {}; - # time is in the core package set. It should only be necessary to - # pass it explicitly in rare circumstances. - time = null; + time = null; # core package since ghc >= 6.12.x + + timeparsers = callPackage ../development/libraries/haskell/timeparsers { + convertible = self.convertible_1_0_11_1; + }; + + timeRecurrence = callPackage ../development/libraries/haskell/time-recurrence {}; timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {}; @@ -2521,17 +2180,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_6 = callPackage ../development/libraries/haskell/tls/1.2.6.nix {}; - tls = self.tls_1_2_6; + tls_1_2_7 = callPackage ../development/libraries/haskell/tls/1.2.7.nix {}; + tls = self.tls_1_2_7; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; }; transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; - transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then - (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null; - transformers = self.transformers_0_3_0_0; + transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; + transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; + transformers = null; # core package since ghc >= 7.8.2 transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; @@ -2559,6 +2218,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + tz = callPackage ../development/libraries/haskell/tz { + pkgs_tzdata = pkgs.tzdata; + }; + + tzdata = callPackage ../development/libraries/haskell/tzdata {}; + unbound = callPackage ../development/libraries/haskell/unbound {}; unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {}; @@ -2573,15 +2238,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unixMemory = callPackage ../development/libraries/haskell/unix-memory {}; + unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {}; unixTime = callPackage ../development/libraries/haskell/unix-time {}; + Unixutils = callPackage ../development/libraries/haskell/Unixutils {}; + unlambda = callPackage ../development/libraries/haskell/unlambda {}; unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; - unorderedContainers_0_2_3_3 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.3.nix {}; - unorderedContainers = self.unorderedContainers_0_2_3_3; + unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {}; + unorderedContainers = self.unorderedContainers_0_2_4_0; + + uri = callPackage ../development/libraries/haskell/uri {}; url = callPackage ../development/libraries/haskell/url {}; @@ -2625,8 +2296,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vect = callPackage ../development/libraries/haskell/vect {}; - vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; - vector_0_10_9_1 = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {}; + vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; + vector_0_10_9_1 = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {}; vector = self.vector_0_10_9_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; @@ -2641,6 +2312,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vectorThUnbox = callPackage ../development/libraries/haskell/vector-th-unbox {}; + vinyl = callPackage ../development/libraries/haskell/vinyl {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; @@ -2669,28 +2342,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x warpTls = callPackage ../development/libraries/haskell/warp-tls {}; - WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { - parsec = self.parsec2; - }; - WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix { - parsec = self.parsec2; - }; - WebBits_2_2 = callPackage ../development/libraries/haskell/WebBits/2.2.nix {}; - WebBits = self.WebBits_2_2; - - WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix { - WebBits = self.WebBits_2_0; - }; - WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix { - WebBits = self.WebBits_2_0; - }; - WebBitsHtml = self.WebBitsHtml_1_0_2; - webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; - websockets = callPackage ../development/libraries/haskell/websockets {}; + websockets = callPackage ../development/libraries/haskell/websockets { + testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { QuickCheck = self.QuickCheck_2_6; }; + }; websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {}; @@ -2708,6 +2366,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x word8 = callPackage ../development/libraries/haskell/word8 {}; + wreq = callPackage ../development/libraries/haskell/wreq { + aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; + attoparsec = self.attoparsec_0_11_3_1; + lens = self.lens.override { + aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; + }; + }; + wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix { @@ -2752,6 +2418,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlLens = callPackage ../development/libraries/haskell/xml-lens {}; + xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xournalParser = callPackage ../development/libraries/haskell/xournal-parser {}; @@ -2798,28 +2466,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x zeromq3Haskell = callPackage ../development/libraries/haskell/zeromq3-haskell { zeromq = pkgs.zeromq3; }; + zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; + zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; zipper = callPackage ../development/libraries/haskell/zipper {}; - zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { - inherit (pkgs) zlib; - }; - zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { - inherit (pkgs) zlib; - }; - zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { - inherit (pkgs) zlib; - }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { - inherit (pkgs) zlib; - }; - zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { - inherit (pkgs) zlib; - }; - zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { - inherit (pkgs) zlib; - }; + zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; + zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; + zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; + zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; + zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { inherit (pkgs) zlib; }; + zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { inherit (pkgs) zlib;}; zlib = self.zlib_0_5_4_1; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; @@ -2830,14 +2488,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Compilers. - AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; + Agda = callPackage ../development/compilers/agda/agda.nix { QuickCheck = self.QuickCheck_2_6; }; + AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {}; uhc = callPackage ../development/compilers/uhc {}; epic = callPackage ../development/compilers/epic {}; - flapjax = callPackage ../development/compilers/flapjax {}; - pakcs = callPackage ../development/compilers/pakcs {}; # Development tools. @@ -2862,18 +2519,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cpphs = callPackage ../development/tools/misc/cpphs {}; - Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; + DrIFT = callPackage ../development/tools/haskell/DrIFT {}; - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; + haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; }; + haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; }; haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; - haddock_2_14_1 = callPackage ../development/tools/documentation/haddock/2.14.1.nix {}; - haddock = self.haddock_2_14_1; + haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; + haddock = self.haddock_2_14_2; HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; @@ -2914,6 +2571,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x arbtt = callPackage ../applications/misc/arbtt {}; + cryptol = callPackage ../development/compilers/cryptol/2.0.x.nix { + Cabal = self.Cabal_1_18_1_3; + cabalInstall = self.cabalInstall_1_18_0_3; + process = self.process_1_2_0_0; + }; + darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { @@ -2923,10 +2586,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x idris = callPackage ../development/compilers/idris/wrapper.nix {}; - leksah = callPackage ../applications/editors/leksah { - QuickCheck = self.QuickCheck2; - }; - nc-indicators = callPackage ../applications/misc/nc-indicators {}; sloane = callPackage ../applications/science/math/sloane {}; @@ -2950,7 +2609,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; # Build a cabal package given a local .cabal file - buildLocalCabal = src: name: let + buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; } }: let cabalExpr = pkgs.stdenv.mkDerivation ({ name = "${name}.nix"; @@ -2958,36 +2617,49 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ | grep -v FILTERME | sed \ -e 's/licenses.proprietary/licenses.unfree/' \ - -e 's/{ cabal/{ cabal, src/' \ - -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n jailbreak = true;/' > $out + -e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \ + -e 's/cabal.mkDerivation (self: {/cabal.mkDerivation (self: cabalDrvArgs \/\/ {/' \ + -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \ + -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n/' > $out ''; } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; }); - in callPackage cabalExpr { inherit src; }; + in callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args); + + buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; }; - cabalDev = callPackage ../development/tools/haskell/cabal-dev {}; + cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; + + cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { + Cabal = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version + then null + else self.Cabal_1_18_1_3; + }; + + cabalDev = callPackage ../development/tools/haskell/cabal-dev { + HTTP = self.HTTP.override { network = self.network_2_4_1_2; }; + }; + + cabalMeta = callPackage ../development/tools/haskell/cabal-meta {}; cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {}; cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {}; - cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; - cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; - cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; + cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; + cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; + cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; - cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; - cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { - Cabal = self.Cabal_1_18_1_3; - }; - cabalInstall = self.cabalInstall_1_18_0_3; + cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; + cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; + cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall = self.cabalInstall_1_20_0_1; - gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex { - hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_3; }; }; - }; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; @@ -2999,21 +2671,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x packunused = callPackage ../development/tools/haskell/packunused {}; + rehoo = callPackage ../development/tools/haskell/rehoo {}; + + sizes = callPackage ../tools/system/sizes {}; + splot = callPackage ../development/tools/haskell/splot {}; timeplot = callPackage ../development/tools/haskell/timeplot {}; + una = callPackage ../development/tools/haskell/una {}; + # Games. LambdaHack = callPackage ../games/LambdaHack { - binary = self.binary_0_7_1_0; - vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; }; + vectorBinaryInstances = self.vectorBinaryInstances.override { + binary = self.binary_0_7_2_0; # the miniutter build input requires this version + }; }; - MazesOfMonad = callPackage ../games/MazesOfMonad {}; - # End of the main part of the file. -}; - -in result.finalReturn +} diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 8e5bab29474b..70330f4304f1 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -46,8 +46,18 @@ releaseTools.sourceTarball rec { export NIX_STATE_DIR=$TMPDIR nix-store --init + # Make sure that derivation paths do not depend on the Nixpkgs path. + mkdir $TMPDIR/foo + ln -s $(readlink -f .) $TMPDIR/foo/bar + p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox) + p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox) + if [ "$p1" != "$p2" ]; then + echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" + exit 1 + fi + # Run the regression tests in `lib'. - res="$(nix-instantiate --eval-only --strict --show-trace lib/tests.nix)" + res="$(nix-instantiate --eval --strict --show-trace lib/tests.nix)" if test "$res" != "[ ]"; then echo "regression tests for lib failed, got: $res" exit 1 @@ -56,24 +66,22 @@ releaseTools.sourceTarball rec { # Check that all-packages.nix evaluates on a number of platforms. for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do header "checking pkgs/top-level/all-packages.nix on $platform" - nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \ + nix-env -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest done header "checking eval-release.nix" - nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null + nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null stopNest header "checking find-tarballs.nix" - nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null + nix-instantiate --eval --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null stopNest ''; distPhase = '' - find . -name "\.svn" -exec rm -rvf {} \; -prune - mkdir -p $out/tarballs mkdir ../$releaseName cp -prd . ../$releaseName diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b764512ff0bd..356b736506df 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2,14 +2,14 @@ { by-spec."Base64"."~0.2.0" = - self.by-version."Base64"."0.2.0"; - by-version."Base64"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-Base64-0.2.0"; + self.by-version."Base64"."0.2.1"; + by-version."Base64"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-Base64-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/Base64/-/Base64-0.2.0.tgz"; - name = "Base64-0.2.0.tgz"; - sha1 = "448879efb6803979daaf7f36e7807e8a1d291205"; + url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"; + name = "Base64-0.2.1.tgz"; + sha1 = "ba3a4230708e186705065e66babdd4c35cf60028"; }) ]; buildInputs = @@ -35,7 +35,7 @@ (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.5" - self.by-version."domutils"."1.4.1" + self.by-version."domutils"."1.4.3" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" ]; @@ -58,7 +58,7 @@ (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.5" - self.by-version."domutils"."1.4.1" + self.by-version."domutils"."1.4.3" ]; peerDependencies = [ ]; @@ -105,21 +105,21 @@ passthru.names = [ "JSONStream" ]; }; by-spec."JSONStream"."~0.7.1" = - self.by-version."JSONStream"."0.7.1"; - by-version."JSONStream"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "node-JSONStream-0.7.1"; + self.by-version."JSONStream"."0.7.2"; + by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.1.tgz"; - name = "JSONStream-0.7.1.tgz"; - sha1 = "0a6bf7f85459beb1319486927d293c7cef8a0260"; + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz"; + name = "JSONStream-0.7.2.tgz"; + sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7"; }) ]; buildInputs = (self.nativeDeps."JSONStream" or []); deps = [ self.by-version."jsonparse"."0.0.5" - self.by-version."through"."2.2.7" + self.by-version."through"."2.3.4" ]; peerDependencies = [ ]; @@ -145,14 +145,14 @@ passthru.names = [ "StringScanner" ]; }; by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.4"; - by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-abbrev-1.0.4"; + self.by-version."abbrev"."1.0.5"; + by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-abbrev-1.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; - name = "abbrev-1.0.4.tgz"; - sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; + url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; + name = "abbrev-1.0.5.tgz"; + sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; }) ]; buildInputs = @@ -164,9 +164,9 @@ passthru.names = [ "abbrev" ]; }; by-spec."abbrev"."1.0.x" = - self.by-version."abbrev"."1.0.4"; + self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.4" = - self.by-version."abbrev"."1.0.4"; + self.by-version."abbrev"."1.0.5"; by-spec."accepts"."1.0.0" = self.by-version."accepts"."1.0.0"; by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -496,7 +496,7 @@ buildInputs = (self.nativeDeps."archiver" or []); deps = [ - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" self.by-version."zip-stream"."0.1.4" self.by-version."lazystream"."0.1.0" self.by-version."file-utils"."0.1.5" @@ -746,35 +746,35 @@ ]; passthru.names = [ "assertion-error" ]; }; - by-spec."astw"."~0.1.0" = - self.by-version."astw"."0.1.0"; - by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-astw-0.1.0"; + by-spec."astw"."~1.1.0" = + self.by-version."astw"."1.1.0"; + by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-astw-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz"; - name = "astw-0.1.0.tgz"; - sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085"; + url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz"; + name = "astw-1.1.0.tgz"; + sha1 = "f394778ab01c4ea467e64a614ed896ace0321a34"; }) ]; buildInputs = (self.nativeDeps."astw" or []); deps = [ - self.by-version."esprima-six"."0.0.3" + self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb" ]; peerDependencies = [ ]; passthru.names = [ "astw" ]; }; by-spec."async"."*" = - self.by-version."async"."0.6.2"; - by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.6.2"; + self.by-version."async"."0.7.0"; + by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz"; - name = "async-0.6.2.tgz"; - sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef"; + url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz"; + name = "async-0.7.0.tgz"; + sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5"; }) ]; buildInputs = @@ -785,7 +785,7 @@ ]; passthru.names = [ "async" ]; }; - "async" = self.by-version."async"."0.6.2"; + "async" = self.by-version."async"."0.7.0"; by-spec."async"."0.1.15" = self.by-version."async"."0.1.15"; by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -878,6 +878,44 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.4" = + self.by-version."async"."0.4.1"; + by-version."async"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz"; + name = "async-0.4.1.tgz"; + sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."async"."~0.6.2" = + self.by-version."async"."0.6.2"; + by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.6.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz"; + name = "async-0.6.2.tgz"; + sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; by-spec."aws-sdk"."*" = self.by-version."aws-sdk"."2.0.0-rc9"; by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage { @@ -1156,14 +1194,14 @@ passthru.names = [ "binary" ]; }; by-spec."bindings"."*" = - self.by-version."bindings"."1.1.1"; - by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-bindings-1.1.1"; + self.by-version."bindings"."1.2.0"; + by-version."bindings"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bindings-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz"; - name = "bindings-1.1.1.tgz"; - sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3"; + url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz"; + name = "bindings-1.2.0.tgz"; + sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f"; }) ]; buildInputs = @@ -1234,6 +1272,28 @@ ]; passthru.names = [ "blueimp-md5" ]; }; + by-spec."body-parser"."~1.0.1" = + self.by-version."body-parser"."1.0.2"; + by-version."body-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz"; + name = "body-parser-1.0.2.tgz"; + sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c"; + }) + ]; + buildInputs = + (self.nativeDeps."body-parser" or []); + deps = [ + self.by-version."type-is"."1.1.0" + self.by-version."raw-body"."1.1.4" + self.by-version."qs"."0.6.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "body-parser" ]; + }; by-spec."boolbase"."~1.0.0" = self.by-version."boolbase"."1.0.0"; by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -1294,20 +1354,20 @@ passthru.names = [ "boom" ]; }; by-spec."bower"."*" = - self.by-version."bower"."1.3.1"; - by-version."bower"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "bower-1.3.1"; + self.by-version."bower"."1.3.2"; + by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "bower-1.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower/-/bower-1.3.1.tgz"; - name = "bower-1.3.1.tgz"; - sha1 = "60d564e774be4e60631a159566830fce260e469a"; + url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz"; + name = "bower-1.3.2.tgz"; + sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b"; }) ]; buildInputs = (self.nativeDeps."bower" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" self.by-version."archy"."0.0.2" self.by-version."bower-config"."0.5.0" self.by-version."bower-endpoint-parser"."0.2.1" @@ -1317,7 +1377,7 @@ self.by-version."cardinal"."0.4.4" self.by-version."chalk"."0.4.0" self.by-version."chmodr"."0.1.0" - self.by-version."decompress-zip"."0.0.5" + self.by-version."decompress-zip"."0.0.6" self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" self.by-version."glob"."3.2.9" @@ -1326,10 +1386,10 @@ self.by-version."inquirer"."0.4.1" self.by-version."junk"."0.2.2" self.by-version."mkdirp"."0.3.5" - self.by-version."mout"."0.9.0" + self.by-version."mout"."0.9.1" self.by-version."nopt"."2.1.2" self.by-version."lru-cache"."2.5.0" - self.by-version."open"."0.0.4" + self.by-version."open"."0.0.5" self.by-version."osenv"."0.0.3" self.by-version."promptly"."0.2.0" self.by-version."q"."1.0.1" @@ -1347,16 +1407,17 @@ self.by-version."insight"."0.3.1" self.by-version."is-root"."0.1.0" self.by-version."shell-quote"."1.4.1" + self.by-version."lockfile"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "bower" ]; }; - "bower" = self.by-version."bower"."1.3.1"; + "bower" = self.by-version."bower"."1.3.2"; by-spec."bower".">=0.9.0" = - self.by-version."bower"."1.3.1"; + self.by-version."bower"."1.3.2"; by-spec."bower".">=1.2.8 <2" = - self.by-version."bower"."1.3.1"; + self.by-version."bower"."1.3.2"; by-spec."bower"."~1.2.0" = self.by-version."bower"."1.2.8"; by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage { @@ -1371,7 +1432,7 @@ buildInputs = (self.nativeDeps."bower" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" self.by-version."archy"."0.0.2" self.by-version."bower-config"."0.5.0" self.by-version."bower-endpoint-parser"."0.2.1" @@ -1381,7 +1442,7 @@ self.by-version."cardinal"."0.4.4" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" - self.by-version."decompress-zip"."0.0.5" + self.by-version."decompress-zip"."0.0.6" self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" self.by-version."glob"."3.2.9" @@ -1393,7 +1454,7 @@ self.by-version."mout"."0.7.1" self.by-version."nopt"."2.1.2" self.by-version."lru-cache"."2.3.1" - self.by-version."open"."0.0.4" + self.by-version."open"."0.0.5" self.by-version."osenv"."0.0.3" self.by-version."promptly"."0.2.0" self.by-version."q"."0.9.7" @@ -1591,7 +1652,7 @@ self.by-version."bower-json"."0.4.0" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.3.1" + self.by-version."bower"."1.3.2" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" self.by-version."semver"."2.2.1" @@ -1651,27 +1712,27 @@ passthru.names = [ "browser-pack" ]; }; by-spec."browser-resolve"."~1.2.1" = - self.by-version."browser-resolve"."1.2.2"; - by-version."browser-resolve"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-browser-resolve-1.2.2"; + self.by-version."browser-resolve"."1.2.4"; + by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-browser-resolve-1.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.2.tgz"; - name = "browser-resolve-1.2.2.tgz"; - sha1 = "83b1eaed8f120b906f56078e134669db0a4a5c11"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz"; + name = "browser-resolve-1.2.4.tgz"; + sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806"; }) ]; buildInputs = (self.nativeDeps."browser-resolve" or []); deps = [ - self.by-version."resolve"."0.6.1" + self.by-version."resolve"."0.6.3" ]; peerDependencies = [ ]; passthru.names = [ "browser-resolve" ]; }; by-spec."browser-resolve"."~1.2.2" = - self.by-version."browser-resolve"."1.2.2"; + self.by-version."browser-resolve"."1.2.4"; by-spec."browserchannel"."*" = self.by-version."browserchannel"."1.2.0"; by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1687,7 +1748,7 @@ (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.14.3" + self.by-version."connect"."2.14.4" self.by-version."request"."2.34.0" self.by-version."ascii-json"."0.2.0" ]; @@ -1696,70 +1757,155 @@ passthru.names = [ "browserchannel" ]; }; "browserchannel" = self.by-version."browserchannel"."1.2.0"; - by-spec."browserify"."~3.32.0" = - self.by-version."browserify"."3.32.1"; - by-version."browserify"."3.32.1" = lib.makeOverridable self.buildNodePackage { - name = "browserify-3.32.1"; + by-spec."browserify"."*" = + self.by-version."browserify"."3.44.2"; + by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.44.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-3.32.1.tgz"; - name = "browserify-3.32.1.tgz"; - sha1 = "5d4ad85d5cafee3fc1062e76e56143d0c298bfcb"; + url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz"; + name = "browserify-3.44.2.tgz"; + sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a"; }) ]; buildInputs = (self.nativeDeps."browserify" or []); deps = [ - self.by-version."module-deps"."1.7.1" + self.by-version."JSONStream"."0.7.2" + self.by-version."assert"."1.1.1" self.by-version."browser-pack"."2.0.1" + self.by-version."browser-resolve"."1.2.4" + self.by-version."browserify-zlib"."0.1.4" + self.by-version."buffer"."2.1.13" + self.by-version."builtins"."0.0.3" + self.by-version."commondir"."0.0.1" + self.by-version."concat-stream"."1.4.5" + self.by-version."console-browserify"."1.0.3" + self.by-version."constants-browserify"."0.0.1" + self.by-version."crypto-browserify"."1.0.9" + self.by-version."deep-equal"."0.1.2" + self.by-version."defined"."0.0.0" self.by-version."deps-sort"."0.1.1" - self.by-version."shell-quote"."0.0.1" - self.by-version."through"."2.3.4" + self.by-version."derequire"."0.8.0" + self.by-version."domain-browser"."1.1.1" self.by-version."duplexer"."0.1.1" - self.by-version."stream-combiner"."0.0.4" - self.by-version."concat-stream"."1.4.4" - self.by-version."insert-module-globals"."3.2.0" - self.by-version."syntax-error"."0.1.0" - self.by-version."browser-resolve"."1.2.2" + self.by-version."events"."1.0.0" + self.by-version."glob"."3.2.9" + self.by-version."http-browserify"."1.3.2" + self.by-version."https-browserify"."0.0.0" self.by-version."inherits"."2.0.1" - self.by-version."JSONStream"."0.7.1" - self.by-version."umd"."2.0.0" - self.by-version."parents"."0.0.2" - self.by-version."deep-equal"."0.1.2" - self.by-version."constants-browserify"."0.0.1" + self.by-version."insert-module-globals"."5.0.1" + self.by-version."module-deps"."1.10.0" self.by-version."os-browserify"."0.1.2" - self.by-version."console-browserify"."1.0.3" + self.by-version."parents"."0.0.2" + self.by-version."path-browserify"."0.0.0" + self.by-version."punycode"."1.2.4" + self.by-version."querystring-es3"."0.2.0" + self.by-version."resolve"."0.6.3" + self.by-version."shallow-copy"."0.0.1" + self.by-version."shell-quote"."0.0.1" + self.by-version."stream-browserify"."0.1.3" + self.by-version."stream-combiner"."0.0.4" + self.by-version."string_decoder"."0.0.1" + self.by-version."subarg"."0.0.1" + self.by-version."syntax-error"."1.1.0" + self.by-version."through2"."0.4.1" + self.by-version."timers-browserify"."1.0.1" + self.by-version."tty-browserify"."0.0.0" + self.by-version."umd"."2.0.0" + self.by-version."url"."0.10.1" + self.by-version."util"."0.10.3" self.by-version."vm-browserify"."0.0.4" - self.by-version."zlib-browserify"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; + "browserify" = self.by-version."browserify"."3.44.2"; + by-spec."browserify"."~3.38.0" = + self.by-version."browserify"."3.38.1"; + by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.38.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.38.1.tgz"; + name = "browserify-3.38.1.tgz"; + sha1 = "4790937ec5b01f1c340e83521e36c4e3aaf3d7ba"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = [ + self.by-version."JSONStream"."0.7.2" self.by-version."assert"."1.1.1" - self.by-version."http-browserify"."1.3.2" + self.by-version."browser-pack"."2.0.1" + self.by-version."browser-resolve"."1.2.4" + self.by-version."buffer"."2.1.13" + self.by-version."builtins"."0.0.3" + self.by-version."commondir"."0.0.1" + self.by-version."concat-stream"."1.4.5" + self.by-version."console-browserify"."1.0.3" + self.by-version."constants-browserify"."0.0.1" self.by-version."crypto-browserify"."1.0.9" - self.by-version."util"."0.10.3" + self.by-version."deep-equal"."0.1.2" + self.by-version."defined"."0.0.0" + self.by-version."deps-sort"."0.1.1" + self.by-version."derequire"."0.8.0" + self.by-version."domain-browser"."1.1.1" + self.by-version."duplexer"."0.1.1" self.by-version."events"."1.0.0" - self.by-version."buffer"."2.1.5" - self.by-version."url"."0.7.9" + self.by-version."glob"."3.2.9" + self.by-version."http-browserify"."1.3.2" self.by-version."https-browserify"."0.0.0" + self.by-version."inherits"."2.0.1" + self.by-version."insert-module-globals"."5.0.1" + self.by-version."module-deps"."1.8.1" + self.by-version."os-browserify"."0.1.2" + self.by-version."parents"."0.0.2" self.by-version."path-browserify"."0.0.0" + self.by-version."punycode"."1.2.4" self.by-version."querystring-es3"."0.2.0" + self.by-version."resolve"."0.6.3" + self.by-version."shallow-copy"."0.0.1" + self.by-version."shell-quote"."0.0.1" self.by-version."stream-browserify"."0.1.3" + self.by-version."stream-combiner"."0.0.4" self.by-version."string_decoder"."0.0.1" - self.by-version."tty-browserify"."0.0.0" - self.by-version."timers-browserify"."1.0.1" - self.by-version."punycode"."1.2.4" - self.by-version."defined"."0.0.0" - self.by-version."domain-browser"."1.1.1" - self.by-version."derequire"."0.6.1" - self.by-version."commondir"."0.0.1" - self.by-version."shallow-copy"."0.0.1" self.by-version."subarg"."0.0.1" - self.by-version."resolve"."0.6.2" - self.by-version."glob"."3.2.9" - self.by-version."builtins"."0.0.2" + self.by-version."syntax-error"."1.1.0" + self.by-version."through2"."0.4.1" + self.by-version."timers-browserify"."1.0.1" + self.by-version."tty-browserify"."0.0.0" + self.by-version."umd"."2.0.0" + self.by-version."url"."0.7.9" + self.by-version."util"."0.10.3" + self.by-version."vm-browserify"."0.0.4" + self.by-version."zlib-browserify"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "browserify" ]; }; + by-spec."browserify-zlib"."~0.1.2" = + self.by-version."browserify-zlib"."0.1.4"; + by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-browserify-zlib-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + name = "browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify-zlib" or []); + deps = [ + self.by-version."pako"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browserify-zlib" ]; + }; by-spec."bson"."0.1.8" = self.by-version."bson"."0.1.8"; by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -1838,14 +1984,14 @@ passthru.names = [ "bson" ]; }; by-spec."buffer"."~2.1.4" = - self.by-version."buffer"."2.1.5"; - by-version."buffer"."2.1.5" = lib.makeOverridable self.buildNodePackage { - name = "node-buffer-2.1.5"; + self.by-version."buffer"."2.1.13"; + by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-2.1.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.1.5.tgz"; - name = "buffer-2.1.5.tgz"; - sha1 = "15373190bc584061de5cbc155db82a0dc1a462de"; + url = "http://registry.npmjs.org/buffer/-/buffer-2.1.13.tgz"; + name = "buffer-2.1.13.tgz"; + sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355"; }) ]; buildInputs = @@ -1956,15 +2102,15 @@ ]; passthru.names = [ "buffertools" ]; }; - by-spec."builtins"."0.0.2" = - self.by-version."builtins"."0.0.2"; - by-version."builtins"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-builtins-0.0.2"; + by-spec."builtins"."~0.0.3" = + self.by-version."builtins"."0.0.3"; + by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-builtins-0.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/builtins/-/builtins-0.0.2.tgz"; - name = "builtins-0.0.2.tgz"; - sha1 = "b738db1ea166b752f7e0144c76f6ad5289448e51"; + url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz"; + name = "builtins-0.0.3.tgz"; + sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755"; }) ]; buildInputs = @@ -2073,10 +2219,31 @@ ]; passthru.names = [ "bytes" ]; }; + by-spec."bytes"."0.3.0" = + self.by-version."bytes"."0.3.0"; + by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bytes-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; + name = "bytes-0.3.0.tgz"; + sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; by-spec."bytes"."~0.2.0" = self.by-version."bytes"."0.2.1"; by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; + by-spec."bytes"."~0.3.0" = + self.by-version."bytes"."0.3.0"; by-spec."callsite"."~1.0.0" = self.by-version."callsite"."1.0.0"; by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2173,7 +2340,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.4" + self.by-version."has-color"."0.1.7" self.by-version."ansi-styles"."1.0.0" self.by-version."strip-ansi"."0.1.1" ]; @@ -2195,7 +2362,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.4" + self.by-version."has-color"."0.1.7" self.by-version."ansi-styles"."0.1.2" ]; peerDependencies = [ @@ -2216,7 +2383,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.4" + self.by-version."has-color"."0.1.7" self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ @@ -2237,7 +2404,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.4" + self.by-version."has-color"."0.1.7" self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ @@ -2369,7 +2536,7 @@ ]; passthru.names = [ "chmodr" ]; }; - by-spec."chokidar"."~0.8.0" = + by-spec."chokidar".">=0.8.2" = self.by-version."chokidar"."0.8.2"; by-version."chokidar"."0.8.2" = lib.makeOverridable self.buildNodePackage { name = "node-chokidar-0.8.2"; @@ -2409,6 +2576,26 @@ ]; passthru.names = [ "chownr" ]; }; + by-spec."circular-json"."0.1.x" = + self.by-version."circular-json"."0.1.6"; + by-version."circular-json"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "node-circular-json-0.1.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/circular-json/-/circular-json-0.1.6.tgz"; + name = "circular-json-0.1.6.tgz"; + sha1 = "fd692b65f8bce4f2900bea14f74ad681ab294c7f"; + }) + ]; + buildInputs = + (self.nativeDeps."circular-json" or []); + deps = [ + self.by-version."wru"."0.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "circular-json" ]; + }; by-spec."class-extend"."~0.1.0" = self.by-version."class-extend"."0.1.1"; by-version."class-extend"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -2927,6 +3114,26 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."1.2.x" = + self.by-version."commander"."1.2.0"; + by-version."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-commander-1.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz"; + name = "commander-1.2.0.tgz"; + sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = [ + self.by-version."keypress"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; by-spec."commander"."1.3.1" = self.by-version."commander"."1.3.1"; by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage { @@ -3072,14 +3279,14 @@ passthru.names = [ "compression" ]; }; by-spec."concat-stream"."^1.4.1" = - self.by-version."concat-stream"."1.4.4"; - by-version."concat-stream"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-concat-stream-1.4.4"; + self.by-version."concat-stream"."1.4.5"; + by-version."concat-stream"."1.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.4.tgz"; - name = "concat-stream-1.4.4.tgz"; - sha1 = "88cf474555dfbbdbeb34453e7f1e417dae97ce21"; + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz"; + name = "concat-stream-1.4.5.tgz"; + sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6"; }) ]; buildInputs = @@ -3087,14 +3294,14 @@ deps = [ self.by-version."inherits"."2.0.1" self.by-version."typedarray"."0.0.5" - self.by-version."readable-stream"."1.1.12" + self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ ]; passthru.names = [ "concat-stream" ]; }; by-spec."concat-stream"."~1.4.1" = - self.by-version."concat-stream"."1.4.4"; + self.by-version."concat-stream"."1.4.5"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -3212,7 +3419,7 @@ self.by-version."fresh"."0.2.0" self.by-version."pause"."0.0.1" self.by-version."uid2"."0.0.3" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."methods"."0.0.1" self.by-version."raw-body"."0.0.3" self.by-version."negotiator"."0.3.0" @@ -3222,40 +3429,6 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.12.0" = - self.by-version."connect"."2.12.0"; - by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-2.12.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; - name = "connect-2.12.0.tgz"; - sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"; - }) - ]; - buildInputs = - (self.nativeDeps."connect" or []); - deps = [ - self.by-version."batch"."0.5.0" - self.by-version."qs"."0.6.6" - self.by-version."cookie-signature"."1.0.1" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."cookie"."0.1.0" - self.by-version."send"."0.1.4" - self.by-version."bytes"."0.2.1" - self.by-version."fresh"."0.2.0" - self.by-version."pause"."0.0.1" - self.by-version."uid2"."0.0.3" - self.by-version."debug"."0.8.0" - self.by-version."methods"."0.1.0" - self.by-version."raw-body"."1.1.2" - self.by-version."negotiator"."0.3.0" - self.by-version."multiparty"."2.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "connect" ]; - }; by-spec."connect"."2.14.1" = self.by-version."connect"."2.14.1"; by-version."connect"."2.14.1" = lib.makeOverridable self.buildNodePackage { @@ -3289,7 +3462,7 @@ self.by-version."vhost"."1.0.0" self.by-version."bytes"."0.2.1" self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."raw-body"."1.1.3" self.by-version."multiparty"."2.2.0" ]; @@ -3318,7 +3491,7 @@ self.by-version."bytes"."0.1.0" self.by-version."send"."0.0.3" self.by-version."fresh"."0.1.0" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -3347,7 +3520,7 @@ self.by-version."bytes"."0.2.0" self.by-version."fresh"."0.1.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -3376,21 +3549,21 @@ self.by-version."bytes"."0.2.0" self.by-version."fresh"."0.1.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.14.3"; - by-version."connect"."2.14.3" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-2.14.3"; + self.by-version."connect"."2.14.4"; + by-version."connect"."2.14.4" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-2.14.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.14.3.tgz"; - name = "connect-2.14.3.tgz"; - sha1 = "be8267f116cc905b53b29e0e7c9ea278d71d597b"; + url = "http://registry.npmjs.org/connect/-/connect-2.14.4.tgz"; + name = "connect-2.14.4.tgz"; + sha1 = "40e74de3947a5278035c12f21535604555609a5a"; }) ]; buildInputs = @@ -3401,7 +3574,7 @@ self.by-version."cookie-signature"."1.0.3" self.by-version."compression"."1.0.0" self.by-version."connect-timeout"."1.0.0" - self.by-version."csurf"."1.0.0" + self.by-version."csurf"."1.1.0" self.by-version."errorhandler"."1.0.0" self.by-version."express-session"."1.0.2" self.by-version."fresh"."0.2.2" @@ -3409,13 +3582,14 @@ self.by-version."morgan"."1.0.0" self.by-version."qs"."0.6.6" self.by-version."response-time"."1.0.0" + self.by-version."setimmediate"."1.0.1" self.by-version."serve-index"."1.0.1" - self.by-version."serve-static"."1.0.2" + self.by-version."serve-static"."1.0.4" self.by-version."static-favicon"."1.0.2" self.by-version."vhost"."1.0.0" - self.by-version."bytes"."0.2.1" + self.by-version."bytes"."0.3.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."raw-body"."1.1.3" self.by-version."multiparty"."2.2.0" ]; @@ -3425,6 +3599,38 @@ }; by-spec."connect"."~2.12.0" = self.by-version."connect"."2.12.0"; + by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-2.12.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; + name = "connect-2.12.0.tgz"; + sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"; + }) + ]; + buildInputs = + (self.nativeDeps."connect" or []); + deps = [ + self.by-version."batch"."0.5.0" + self.by-version."qs"."0.6.6" + self.by-version."cookie-signature"."1.0.1" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."cookie"."0.1.0" + self.by-version."send"."0.1.4" + self.by-version."bytes"."0.2.1" + self.by-version."fresh"."0.2.0" + self.by-version."pause"."0.0.1" + self.by-version."uid2"."0.0.3" + self.by-version."debug"."0.8.1" + self.by-version."methods"."0.1.0" + self.by-version."raw-body"."1.1.2" + self.by-version."negotiator"."0.3.0" + self.by-version."multiparty"."2.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; by-spec."connect-flash"."*" = self.by-version."connect-flash"."0.1.1"; by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -3478,7 +3684,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."1.3.0" + self.by-version."jade"."1.3.1" ]; peerDependencies = [ ]; @@ -3520,7 +3726,7 @@ buildInputs = (self.nativeDeps."connect-timeout" or []); deps = [ - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -3739,6 +3945,25 @@ ]; passthru.names = [ "cookie" ]; }; + by-spec."cookie"."0.1.2" = + self.by-version."cookie"."0.1.2"; + by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + name = "cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie" ]; + }; by-spec."cookie-jar"."~0.2.0" = self.by-version."cookie-jar"."0.2.0"; by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -3798,6 +4023,8 @@ ]; passthru.names = [ "cookie-parser" ]; }; + by-spec."cookie-parser"."~1.0.1" = + self.by-version."cookie-parser"."1.0.1"; by-spec."cookie-signature"."1.0.0" = self.by-version."cookie-signature"."1.0.0"; by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -4211,6 +4438,27 @@ ]; passthru.names = [ "csurf" ]; }; + by-spec."csurf"."1.1.0" = + self.by-version."csurf"."1.1.0"; + by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-csurf-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; + name = "csurf-1.1.0.tgz"; + sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2"; + }) + ]; + buildInputs = + (self.nativeDeps."csurf" or []); + deps = [ + self.by-version."uid2"."0.0.3" + self.by-version."scmp"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "csurf" ]; + }; by-spec."ctype"."0.5.0" = self.by-version."ctype"."0.5.0"; by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -4326,14 +4574,14 @@ passthru.names = [ "dateformat" ]; }; by-spec."debug"."*" = - self.by-version."debug"."0.8.0"; - by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-0.8.0"; + self.by-version."debug"."0.8.1"; + by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-0.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; - name = "debug-0.8.0.tgz"; - sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; + url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; + name = "debug-0.8.1.tgz"; + sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; }) ]; buildInputs = @@ -4383,48 +4631,51 @@ passthru.names = [ "debug" ]; }; by-spec."debug".">= 0.7.3 < 1" = - self.by-version."debug"."0.8.0"; + self.by-version."debug"."0.8.1"; by-spec."debug"."~0.7.0" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.7.3" = - self.by-version."debug"."0.7.4"; - by-spec."decompress"."~0.2.0" = - self.by-version."decompress"."0.2.0"; - by-version."decompress"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-decompress-0.2.0"; + by-spec."debug"."~0.8" = + self.by-version."debug"."0.8.1"; + by-spec."decompress"."^0.2.0" = + self.by-version."decompress"."0.2.3"; + by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "decompress-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress/-/decompress-0.2.0.tgz"; - name = "decompress-0.2.0.tgz"; - sha1 = "548f7d789181afe2378ddff1db18784ffa181410"; + url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz"; + name = "decompress-0.2.3.tgz"; + sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc"; }) ]; buildInputs = (self.nativeDeps."decompress" or []); deps = [ self.by-version."adm-zip"."0.4.4" + self.by-version."extname"."0.1.2" + self.by-version."get-stdin"."0.1.0" + self.by-version."map-key"."0.1.1" self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" self.by-version."rimraf"."2.2.6" - self.by-version."stream-combiner"."0.0.2" + self.by-version."stream-combiner"."0.0.4" self.by-version."tar"."0.1.19" self.by-version."tempfile"."0.1.3" - self.by-version."map-key"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "decompress" ]; }; by-spec."decompress-zip"."~0.0.3" = - self.by-version."decompress-zip"."0.0.5"; - by-version."decompress-zip"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "decompress-zip-0.0.5"; + self.by-version."decompress-zip"."0.0.6"; + by-version."decompress-zip"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "decompress-zip-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.5.tgz"; - name = "decompress-zip-0.0.5.tgz"; - sha1 = "ab145d0dfe4f1c4249af7efcdff1df669eca0c8c"; + url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz"; + name = "decompress-zip-0.0.6.tgz"; + sha1 = "263ef05b304cdcd1172858af453561c53ae017bb"; }) ]; buildInputs = @@ -4434,7 +4685,7 @@ self.by-version."mkpath"."0.1.0" self.by-version."binary"."0.3.0" self.by-version."touch"."0.0.2" - self.by-version."readable-stream"."1.1.12" + self.by-version."readable-stream"."1.1.13-1" self.by-version."nopt"."2.2.0" ]; peerDependencies = [ @@ -4621,44 +4872,44 @@ ]; passthru.names = [ "deps-sort" ]; }; - by-spec."derequire"."~0.6.0" = - self.by-version."derequire"."0.6.1"; - by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-derequire-0.6.1"; + by-spec."derequire"."~0.8.0" = + self.by-version."derequire"."0.8.0"; + by-version."derequire"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-derequire-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz"; - name = "derequire-0.6.1.tgz"; - sha1 = "cce8ee25380de715deb61900f0bdd38222928788"; + url = "http://registry.npmjs.org/derequire/-/derequire-0.8.0.tgz"; + name = "derequire-0.8.0.tgz"; + sha1 = "c1f7f1da2cede44adede047378f03f444e9c4c0d"; }) ]; buildInputs = (self.nativeDeps."derequire" or []); deps = [ self.by-version."estraverse"."1.5.0" - self.by-version."esprima-six"."0.0.3" self.by-version."esrefactor"."0.1.0" + self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb" ]; peerDependencies = [ ]; passthru.names = [ "derequire" ]; }; - by-spec."detective"."~2.4.0" = - self.by-version."detective"."2.4.1"; - by-version."detective"."2.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-detective-2.4.1"; + by-spec."detective"."~3.1.0" = + self.by-version."detective"."3.1.0"; + by-version."detective"."3.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-detective-3.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/detective/-/detective-2.4.1.tgz"; - name = "detective-2.4.1.tgz"; - sha1 = "943b8eec4c346f6ac501de25da2ea1a57ed77819"; + url = "http://registry.npmjs.org/detective/-/detective-3.1.0.tgz"; + name = "detective-3.1.0.tgz"; + sha1 = "77782444ab752b88ca1be2e9d0a0395f1da25eed"; }) ]; buildInputs = (self.nativeDeps."detective" or []); deps = [ self.by-version."escodegen"."1.1.0" - self.by-version."esprima-six"."0.0.3" + self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb" ]; peerDependencies = [ ]; @@ -4904,14 +5155,14 @@ passthru.names = [ "domutils" ]; }; by-spec."domutils"."1.4" = - self.by-version."domutils"."1.4.1"; - by-version."domutils"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-domutils-1.4.1"; + self.by-version."domutils"."1.4.3"; + by-version."domutils"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-domutils-1.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.4.1.tgz"; - name = "domutils-1.4.1.tgz"; - sha1 = "e716621c245561dd03c1ecd5667f70e8ddeb2f59"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + name = "domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; }) ]; buildInputs = @@ -4924,22 +5175,25 @@ passthru.names = [ "domutils" ]; }; by-spec."download"."~0.1.6" = - self.by-version."download"."0.1.12"; - by-version."download"."0.1.12" = lib.makeOverridable self.buildNodePackage { - name = "node-download-0.1.12"; + self.by-version."download"."0.1.16"; + by-version."download"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "download-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/download/-/download-0.1.12.tgz"; - name = "download-0.1.12.tgz"; - sha1 = "ff596658f301c340a292ac0ac1972790084568ad"; + url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz"; + name = "download-0.1.16.tgz"; + sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99"; }) ]; buildInputs = (self.nativeDeps."download" or []); deps = [ - self.by-version."decompress"."0.2.0" + self.by-version."decompress"."0.2.3" self.by-version."each-async"."0.1.2" + self.by-version."get-stdin"."0.1.0" + self.by-version."get-urls"."0.1.1" self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" self.by-version."request"."2.34.0" self.by-version."through2"."0.4.1" ]; @@ -4987,25 +5241,6 @@ ]; passthru.names = [ "dtrace-provider" ]; }; - by-spec."duplexer"."~0.0.3" = - self.by-version."duplexer"."0.0.4"; - by-version."duplexer"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-duplexer-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz"; - name = "duplexer-0.0.4.tgz"; - sha1 = "afcb7f1f8b8d74f820726171d5d64ac9e4a8ff20"; - }) - ]; - buildInputs = - (self.nativeDeps."duplexer" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "duplexer" ]; - }; by-spec."duplexer"."~0.1.1" = self.by-version."duplexer"."0.1.1"; by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -5025,7 +5260,7 @@ ]; passthru.names = [ "duplexer" ]; }; - by-spec."each-async"."~0.1.1" = + by-spec."each-async"."^0.1.1" = self.by-version."each-async"."0.1.2"; by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-each-async-0.1.2"; @@ -5243,22 +5478,22 @@ by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."1.3.x" = - self.by-version."escodegen"."1.3.0"; - by-version."escodegen"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.3.0"; + self.by-version."escodegen"."1.3.2"; + by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.0.tgz"; - name = "escodegen-1.3.0.tgz"; - sha1 = "9d7b4aa74aa32f300474381c098f930eb1e9973a"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz"; + name = "escodegen-1.3.2.tgz"; + sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = [ - self.by-version."esprima"."1.0.4" - self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" + self.by-version."estraverse"."1.5.0" + self.by-version."esprima"."1.1.1" self.by-version."source-map"."0.1.33" ]; peerDependencies = [ @@ -5420,7 +5655,9 @@ self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.4" = self.by-version."esprima"."1.0.4"; - by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" = + by-spec."esprima"."~1.1.1" = + self.by-version."esprima"."1.1.1"; + by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage { name = "esprima-fb-3001.1.0-dev-harmony-fb"; @@ -5439,27 +5676,10 @@ ]; passthru.names = [ "esprima-fb" ]; }; - by-spec."esprima-six"."0.0.3" = - self.by-version."esprima-six"."0.0.3"; - by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "esprima-six-0.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz"; - name = "esprima-six-0.0.3.tgz"; - sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f"; - }) - ]; - buildInputs = - (self.nativeDeps."esprima-six" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "esprima-six" ]; - }; - by-spec."esprima-six"."~0.0.3" = - self.by-version."esprima-six"."0.0.3"; + by-spec."esprima-fb"."^3001.1.0-dev-harmony-fb" = + self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; + by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" = + self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; by-spec."esrefactor"."~0.1.0" = self.by-version."esrefactor"."0.1.0"; by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -5737,7 +5957,7 @@ self.by-version."oauth"."0.9.11" self.by-version."request"."2.9.203" self.by-version."connect"."2.3.9" - self.by-version."openid"."0.5.5" + self.by-version."openid"."0.5.8" self.by-version."xml2js"."0.4.2" self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" @@ -5790,14 +6010,14 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."4.0.0-rc4"; - by-version."express"."4.0.0-rc4" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.0.0-rc4"; + self.by-version."express"."4.0.0"; + by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0-rc4.tgz"; - name = "express-4.0.0-rc4.tgz"; - sha1 = "1cedc8790f47b776b9d100f5388e5fb652ea4388"; + url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; + name = "express-4.0.0.tgz"; + sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; }) ]; buildInputs = @@ -5819,13 +6039,13 @@ self.by-version."qs"."0.6.6" self.by-version."serve-static"."1.0.1" self.by-version."path-to-regexp"."0.1.2" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.0.0-rc4"; + "express" = self.by-version."express"."4.0.0"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -5873,7 +6093,7 @@ self.by-version."methods"."0.0.1" self.by-version."send"."0.1.0" self.by-version."cookie-signature"."1.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -5903,7 +6123,7 @@ self.by-version."methods"."0.1.0" self.by-version."send"."0.1.4" self.by-version."cookie-signature"."1.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -5934,12 +6154,14 @@ self.by-version."send"."0.2.0" self.by-version."cookie-signature"."1.0.3" self.by-version."merge-descriptors"."0.0.2" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; + by-spec."express".">=3.0.0" = + self.by-version."express"."4.0.0"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -5964,54 +6186,25 @@ self.by-version."methods"."0.0.1" self.by-version."send"."0.1.0" self.by-version."cookie-signature"."1.0.0" - self.by-version."debug"."0.8.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; - by-spec."express"."~3.4" = - self.by-version."express"."3.4.8"; - by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; - name = "express-3.4.8.tgz"; - sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = [ - self.by-version."connect"."2.12.0" - self.by-version."commander"."1.3.2" - self.by-version."range-parser"."0.0.4" - self.by-version."mkdirp"."0.3.5" - self.by-version."cookie"."0.1.0" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.0" - self.by-version."methods"."0.1.0" - self.by-version."send"."0.1.4" - self.by-version."cookie-signature"."1.0.1" - self.by-version."merge-descriptors"."0.0.1" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~3.4.8" = - self.by-version."express"."3.4.8"; + by-spec."express"."~3.5" = + self.by-version."express"."3.5.1"; + by-spec."express"."~4.0.0-rc4" = + self.by-version."express"."4.0.0"; by-spec."express-form"."*" = - self.by-version."express-form"."0.12.0"; - by-version."express-form"."0.12.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-form-0.12.0"; + self.by-version."express-form"."0.12.2"; + by-version."express-form"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "node-express-form-0.12.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.12.0.tgz"; - name = "express-form-0.12.0.tgz"; - sha1 = "0525ce1365760fd90fb785829a430122aceb893a"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.12.2.tgz"; + name = "express-form-0.12.2.tgz"; + sha1 = "c23ed4f233df09a1c61bcc698b8e4089dda54c1a"; }) ]; buildInputs = @@ -6022,11 +6215,11 @@ self.by-version."async"."0.2.10" ]; peerDependencies = [ - self.by-version."express"."3.5.1" + self.by-version."express"."4.0.0" ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.by-version."express-form"."0.12.0"; + "express-form" = self.by-version."express-form"."0.12.2"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -6071,6 +6264,50 @@ ]; passthru.names = [ "express-session" ]; }; + by-spec."express-session"."~1.0.2" = + self.by-version."express-session"."1.0.3"; + by-version."express-session"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-express-session-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz"; + name = "express-session-1.0.3.tgz"; + sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639"; + }) + ]; + buildInputs = + (self.nativeDeps."express-session" or []); + deps = [ + self.by-version."utils-merge"."1.0.0" + self.by-version."cookie"."0.1.2" + self.by-version."cookie-signature"."1.0.3" + self.by-version."uid2"."0.0.3" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."debug"."0.7.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express-session" ]; + }; + by-spec."ext-list"."^0.1.0" = + self.by-version."ext-list"."0.1.0"; + by-version."ext-list"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ext-list-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ext-list/-/ext-list-0.1.0.tgz"; + name = "ext-list-0.1.0.tgz"; + sha1 = "a266915887ed6b87056eeb76b8c29e61d84ebc39"; + }) + ]; + buildInputs = + (self.nativeDeps."ext-list" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ext-list" ]; + }; by-spec."extend"."*" = self.by-version."extend"."1.2.1"; by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -6093,6 +6330,28 @@ "extend" = self.by-version."extend"."1.2.1"; by-spec."extend"."~1.2.1" = self.by-version."extend"."1.2.1"; + by-spec."extname"."^0.1.1" = + self.by-version."extname"."0.1.2"; + by-version."extname"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "extname-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/extname/-/extname-0.1.2.tgz"; + name = "extname-0.1.2.tgz"; + sha1 = "de821aa0f01449d4b4043d4aeefa89a456bf3239"; + }) + ]; + buildInputs = + (self.nativeDeps."extname" or []); + deps = [ + self.by-version."ext-list"."0.1.0" + self.by-version."map-key"."0.1.1" + self.by-version."underscore.string"."2.3.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "extname" ]; + }; by-spec."extract-opts"."~2.2.0" = self.by-version."extract-opts"."2.2.0"; by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6229,7 +6488,7 @@ deps = [ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.3.1" + self.by-version."bower"."1.3.2" self.by-version."glob"."3.2.9" ]; peerDependencies = [ @@ -6330,14 +6589,14 @@ passthru.names = [ "findit" ]; }; by-spec."findup"."~0.1.3" = - self.by-version."findup"."0.1.4"; - by-version."findup"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "findup-0.1.4"; + self.by-version."findup"."0.1.5"; + by-version."findup"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "findup-0.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findup/-/findup-0.1.4.tgz"; - name = "findup-0.1.4.tgz"; - sha1 = "28cd82e13eb629b40688f08f613f5cae5a29a0f5"; + url = "http://registry.npmjs.org/findup/-/findup-0.1.5.tgz"; + name = "findup-0.1.5.tgz"; + sha1 = "8ad929a3393bac627957a7e5de4623b06b0e2ceb"; }) ]; buildInputs = @@ -6440,14 +6699,14 @@ passthru.names = [ "forEachAsync" ]; }; by-spec."forever"."*" = - self.by-version."forever"."0.10.11"; - by-version."forever"."0.10.11" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.10.11"; + self.by-version."forever"."0.11.0"; + by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.10.11.tgz"; - name = "forever-0.10.11.tgz"; - sha1 = "925cae528c074a29c0119809ca08e382ef194ad0"; + url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz"; + name = "forever-0.11.0.tgz"; + sha1 = "97de678915c64dacce2ccbfb94620723b308d44f"; }) ]; buildInputs = @@ -6470,7 +6729,7 @@ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.10.11"; + "forever" = self.by-version."forever"."0.11.0"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6606,6 +6865,26 @@ ]; passthru.names = [ "form-data" ]; }; + by-spec."formatio"."~1.0" = + self.by-version."formatio"."1.0.2"; + by-version."formatio"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-formatio-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz"; + name = "formatio-1.0.2.tgz"; + sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef"; + }) + ]; + buildInputs = + (self.nativeDeps."formatio" or []); + deps = [ + self.by-version."samsam"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "formatio" ]; + }; by-spec."formidable"."1.0.11" = self.by-version."formidable"."1.0.11"; by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -6780,7 +7059,7 @@ buildInputs = (self.nativeDeps."fs-walk" or []); deps = [ - self.by-version."async"."0.6.2" + self.by-version."async"."0.7.0" ]; peerDependencies = [ ]; @@ -6975,14 +7254,14 @@ passthru.names = [ "generator-mocha" ]; }; by-spec."generator-webapp"."*" = - self.by-version."generator-webapp"."0.4.8"; - by-version."generator-webapp"."0.4.8" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-webapp-0.4.8"; + self.by-version."generator-webapp"."0.4.9"; + by-version."generator-webapp"."0.4.9" = lib.makeOverridable self.buildNodePackage { + name = "node-generator-webapp-0.4.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.8.tgz"; - name = "generator-webapp-0.4.8.tgz"; - sha1 = "d0dc7e8040ec41fe6cf42ec43291157a3bd515be"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.9.tgz"; + name = "generator-webapp-0.4.9.tgz"; + sha1 = "df8aa10af9bac7fd59f4072b9cdf0f120e8bb611"; }) ]; buildInputs = @@ -6998,7 +7277,45 @@ ]; passthru.names = [ "generator-webapp" ]; }; - "generator-webapp" = self.by-version."generator-webapp"."0.4.8"; + "generator-webapp" = self.by-version."generator-webapp"."0.4.9"; + by-spec."get-stdin"."^0.1.0" = + self.by-version."get-stdin"."0.1.0"; + by-version."get-stdin"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-get-stdin-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz"; + name = "get-stdin-0.1.0.tgz"; + sha1 = "5998af24aafc802d15c82c685657eeb8b10d4a91"; + }) + ]; + buildInputs = + (self.nativeDeps."get-stdin" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "get-stdin" ]; + }; + by-spec."get-urls"."^0.1.1" = + self.by-version."get-urls"."0.1.1"; + by-version."get-urls"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "get-urls-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz"; + name = "get-urls-0.1.1.tgz"; + sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59"; + }) + ]; + buildInputs = + (self.nativeDeps."get-urls" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "get-urls" ]; + }; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -7055,13 +7372,13 @@ self.by-version."async"."0.2.10" self.by-version."cli-color"."0.2.3" self.by-version."cli-log"."0.0.8" - self.by-version."github"."0.1.15" + self.by-version."github"."0.1.16" self.by-version."copy-paste"."0.2.0" self.by-version."handlebars"."1.3.0" self.by-version."inquirer"."0.4.1" self.by-version."moment"."2.5.1" self.by-version."nopt"."2.2.0" - self.by-version."open"."0.0.4" + self.by-version."open"."0.0.5" self.by-version."truncate"."1.0.2" self.by-version."update-notifier"."0.1.8" self.by-version."userhome"."0.1.0" @@ -7074,14 +7391,14 @@ }; "gh" = self.by-version."gh"."1.9.1"; by-spec."github"."~0.1.15" = - self.by-version."github"."0.1.15"; - by-version."github"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "node-github-0.1.15"; + self.by-version."github"."0.1.16"; + by-version."github"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "node-github-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/github/-/github-0.1.15.tgz"; - name = "github-0.1.15.tgz"; - sha1 = "3df037442518fe800c75b1a243a13154d334069c"; + url = "http://registry.npmjs.org/github/-/github-0.1.16.tgz"; + name = "github-0.1.16.tgz"; + sha1 = "895d2a85b0feb7980d89ac0ce4f44dcaa03f17b5"; }) ]; buildInputs = @@ -7464,20 +7781,20 @@ }; "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0"; by-spec."grunt-contrib-jshint"."*" = - self.by-version."grunt-contrib-jshint"."0.9.2"; - by-version."grunt-contrib-jshint"."0.9.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-jshint-0.9.2"; + self.by-version."grunt-contrib-jshint"."0.10.0"; + by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-jshint-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.9.2.tgz"; - name = "grunt-contrib-jshint-0.9.2.tgz"; - sha1 = "d6301597bcc3611e95f5f35ff582a7b3d73d20fb"; + url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.10.0.tgz"; + name = "grunt-contrib-jshint-0.10.0.tgz"; + sha1 = "57ebccca87e8f327af6645d8a3c586d4845e4d81"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.4.4" + self.by-version."jshint"."2.5.0" self.by-version."hooker"."0.2.3" ]; peerDependencies = [ @@ -7485,7 +7802,7 @@ ]; passthru.names = [ "grunt-contrib-jshint" ]; }; - "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.9.2"; + "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0"; by-spec."grunt-contrib-less"."*" = self.by-version."grunt-contrib-less"."0.11.0"; by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage { @@ -7576,7 +7893,7 @@ ]; peerDependencies = [ self.by-version."grunt"."0.4.4" - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "grunt-karma" ]; }; @@ -7644,10 +7961,10 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.7.1" - self.by-version."jade"."1.3.0" + self.by-version."jade"."1.3.1" self.by-version."q"."2.0.1" self.by-version."xml2js"."0.4.2" - self.by-version."msgpack"."0.2.2" + self.by-version."msgpack"."0.2.3" ]; peerDependencies = [ ]; @@ -7655,20 +7972,20 @@ }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; by-spec."gzip-size"."^0.1.0" = - self.by-version."gzip-size"."0.1.0"; - by-version."gzip-size"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "gzip-size-0.1.0"; + self.by-version."gzip-size"."0.1.1"; + by-version."gzip-size"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "gzip-size-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.0.tgz"; - name = "gzip-size-0.1.0.tgz"; - sha1 = "2beaecdaf4917bd151fe9a9d43ae199392d6c32a"; + url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.1.tgz"; + name = "gzip-size-0.1.1.tgz"; + sha1 = "ae33483b6fc8224e8342296de108ef93757f76e0"; }) ]; buildInputs = (self.nativeDeps."gzip-size" or []); deps = [ - self.by-version."concat-stream"."1.4.4" + self.by-version."concat-stream"."1.4.5" self.by-version."zlib-browserify"."0.0.3" ]; peerDependencies = [ @@ -7743,14 +8060,14 @@ by-spec."handlebars"."~1.3.0" = self.by-version."handlebars"."1.3.0"; by-spec."has-color"."~0.1.0" = - self.by-version."has-color"."0.1.4"; - by-version."has-color"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-has-color-0.1.4"; + self.by-version."has-color"."0.1.7"; + by-version."has-color"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-has-color-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/has-color/-/has-color-0.1.4.tgz"; - name = "has-color-0.1.4.tgz"; - sha1 = "d1dadeea5b9e8b446bf08603532333710c95a290"; + url = "http://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; + name = "has-color-0.1.7.tgz"; + sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; }) ]; buildInputs = @@ -7889,20 +8206,19 @@ passthru.names = [ "he" ]; }; by-spec."hipache"."*" = - self.by-version."hipache"."0.2.4"; - by-version."hipache"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "hipache-0.2.4"; + self.by-version."hipache"."0.2.9"; + by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "hipache-0.2.9"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/hipache/-/hipache-0.2.4.tgz"; - name = "hipache-0.2.4.tgz"; - sha1 = "1d6a06bf88cac084b5fcd01959392c8b4889ec65"; + url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz"; + name = "hipache-0.2.9.tgz"; + sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a"; }) ]; buildInputs = (self.nativeDeps."hipache" or []); deps = [ - self.by-version."read-installed"."0.2.2" self.by-version."http-proxy"."0.10.3" self.by-version."redis"."0.8.6" self.by-version."lru-cache"."2.2.4" @@ -7912,7 +8228,7 @@ ]; passthru.names = [ "hipache" ]; }; - "hipache" = self.by-version."hipache"."0.2.4"; + "hipache" = self.by-version."hipache"."0.2.9"; by-spec."hiredis"."*" = self.by-version."hiredis"."0.1.16"; by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage { @@ -7927,7 +8243,7 @@ buildInputs = (self.nativeDeps."hiredis" or []); deps = [ - self.by-version."bindings"."1.1.1" + self.by-version."bindings"."1.2.0" ]; peerDependencies = [ ]; @@ -8026,7 +8342,7 @@ self.by-version."domhandler"."2.0.3" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -8049,7 +8365,7 @@ self.by-version."domhandler"."2.1.0" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -8072,7 +8388,7 @@ self.by-version."domhandler"."2.2.0" self.by-version."domutils"."1.3.0" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.1.12" + self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ ]; @@ -8113,20 +8429,20 @@ buildInputs = (self.nativeDeps."http-browserify" or []); deps = [ - self.by-version."Base64"."0.2.0" + self.by-version."Base64"."0.2.1" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "http-browserify" ]; }; - by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" = + by-spec."http-proxy"."git+https://github.com/samalba/node-http-proxy.git" = self.by-version."http-proxy"."0.10.3"; by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { name = "http-proxy-0.10.3"; src = [ (fetchgit { - url = "git://github.com/samalba/node-http-proxy"; + url = "https://github.com/samalba/node-http-proxy.git"; rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5"; sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f"; }) @@ -8268,14 +8584,14 @@ passthru.names = [ "i" ]; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.1"; - by-version."i18next"."1.7.1" = lib.makeOverridable self.buildNodePackage { - name = "node-i18next-1.7.1"; + self.by-version."i18next"."1.7.3"; + by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage { + name = "node-i18next-1.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz"; - name = "i18next-1.7.1.tgz"; - sha1 = "39616a1fe88258edbdd0da918b9ee49a1bd1e124"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz"; + name = "i18next-1.7.3.tgz"; + sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894"; }) ]; buildInputs = @@ -8287,7 +8603,7 @@ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.by-version."i18next"."1.7.1"; + "i18next" = self.by-version."i18next"."1.7.3"; by-spec."ibrik"."~1.1.1" = self.by-version."ibrik"."1.1.1"; by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -8416,8 +8732,6 @@ }; by-spec."inherits"."2.0.1" = self.by-version."inherits"."2.0.1"; - by-spec."inherits"."^2.0.1" = - self.by-version."inherits"."2.0.1"; by-spec."inherits"."~1.0.0" = self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = @@ -8543,25 +8857,25 @@ }; by-spec."inquirer"."~0.4.1" = self.by-version."inquirer"."0.4.1"; - by-spec."insert-module-globals"."~3.2.0" = - self.by-version."insert-module-globals"."3.2.0"; - by-version."insert-module-globals"."3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "insert-module-globals-3.2.0"; + by-spec."insert-module-globals"."~5.0.1" = + self.by-version."insert-module-globals"."5.0.1"; + by-version."insert-module-globals"."5.0.1" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-5.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.2.0.tgz"; - name = "insert-module-globals-3.2.0.tgz"; - sha1 = "5692a834207adebb3effa9f9def7cf314890a63b"; + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-5.0.1.tgz"; + name = "insert-module-globals-5.0.1.tgz"; + sha1 = "eec9c0dfad30380e8eda313a094165dc2f2350d2"; }) ]; buildInputs = (self.nativeDeps."insert-module-globals" or []); deps = [ - self.by-version."lexical-scope"."0.1.0" - self.by-version."process"."0.5.2" + self.by-version."JSONStream"."0.7.2" + self.by-version."concat-stream"."1.4.5" + self.by-version."lexical-scope"."1.1.0" + self.by-version."process"."0.6.0" self.by-version."through"."2.3.4" - self.by-version."JSONStream"."0.7.1" - self.by-version."concat-stream"."1.4.4" ]; peerDependencies = [ ]; @@ -8630,9 +8944,9 @@ self.by-version."winston"."0.7.3" self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" - self.by-version."async"."0.6.2" - self.by-version."express"."4.0.0-rc4" - self.by-version."jade"."1.3.0" + self.by-version."async"."0.7.0" + self.by-version."express"."4.0.0" + self.by-version."jade"."1.3.1" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."3.0.2" @@ -8760,16 +9074,16 @@ (self.nativeDeps."istanbul" or []); deps = [ self.by-version."esprima"."1.1.1" - self.by-version."escodegen"."1.3.0" + self.by-version."escodegen"."1.3.2" self.by-version."handlebars"."1.3.0" self.by-version."mkdirp"."0.3.5" self.by-version."nopt"."2.2.0" self.by-version."fileset"."0.1.5" self.by-version."which"."1.0.5" self.by-version."async"."0.2.10" - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" self.by-version."wordwrap"."0.0.2" - self.by-version."resolve"."0.6.2" + self.by-version."resolve"."0.6.3" self.by-version."js-yaml"."3.0.2" ]; peerDependencies = [ @@ -8782,14 +9096,14 @@ by-spec."istanbul"."~0.2.4" = self.by-version."istanbul"."0.2.7"; by-spec."jade"."*" = - self.by-version."jade"."1.3.0"; - by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.3.0"; + self.by-version."jade"."1.3.1"; + by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.3.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.3.0.tgz"; - name = "jade-1.3.0.tgz"; - sha1 = "776cae93f1ad5af6b61eff2340fcdc19a3225d48"; + url = "http://registry.npmjs.org/jade/-/jade-1.3.1.tgz"; + name = "jade-1.3.1.tgz"; + sha1 = "7483d848b8714dc50a40da98b0409790b374216b"; }) ]; buildInputs = @@ -8807,7 +9121,7 @@ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.3.0"; + "jade" = self.by-version."jade"."1.3.1"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -8877,7 +9191,7 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.3.0"; + self.by-version."jade"."1.3.1"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -8905,26 +9219,26 @@ passthru.names = [ "jade" ]; }; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.6"; - by-version."jayschema"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.6"; + self.by-version."jayschema"."0.2.7"; + by-version."jayschema"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.6.tgz"; - name = "jayschema-0.2.6.tgz"; - sha1 = "c160e767cef66babda76b0fc34a06d4adc44965d"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.7.tgz"; + name = "jayschema-0.2.7.tgz"; + sha1 = "99d653a0c6ceec4f2c5932c5d73c835bb8911062"; }) ]; buildInputs = (self.nativeDeps."jayschema" or []); deps = [ - self.by-version."when"."2.8.0" + self.by-version."when"."3.1.0" ]; peerDependencies = [ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.6"; + "jayschema" = self.by-version."jayschema"."0.2.7"; by-spec."js-yaml"."*" = self.by-version."js-yaml"."3.0.2"; by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage { @@ -9082,32 +9396,8 @@ passthru.names = [ "jshint" ]; }; "jshint" = self.by-version."jshint"."2.5.0"; - by-spec."jshint"."~2.4.0" = - self.by-version."jshint"."2.4.4"; - by-version."jshint"."2.4.4" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.4.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz"; - name = "jshint-2.4.4.tgz"; - sha1 = "4162238314c649f987752651e8e064e30a68706e"; - }) - ]; - buildInputs = - (self.nativeDeps."jshint" or []); - deps = [ - self.by-version."shelljs"."0.1.4" - self.by-version."underscore"."1.4.4" - self.by-version."cli"."0.4.5" - self.by-version."minimatch"."0.2.14" - self.by-version."htmlparser2"."3.3.0" - self.by-version."console-browserify"."0.1.6" - self.by-version."exit"."0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "jshint" ]; - }; + by-spec."jshint"."~2.5.0" = + self.by-version."jshint"."2.5.0"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -9223,14 +9513,14 @@ passthru.names = [ "jsonparse" ]; }; by-spec."jsontool"."*" = - self.by-version."jsontool"."7.0.1"; - by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage { - name = "jsontool-7.0.1"; + self.by-version."jsontool"."7.0.2"; + by-version."jsontool"."7.0.2" = lib.makeOverridable self.buildNodePackage { + name = "jsontool-7.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.1.tgz"; - name = "jsontool-7.0.1.tgz"; - sha1 = "d5a705e46e305d7377ede769707c072e6d957977"; + url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; + name = "jsontool-7.0.2.tgz"; + sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }) ]; buildInputs = @@ -9241,7 +9531,7 @@ ]; passthru.names = [ "jsontool" ]; }; - "jsontool" = self.by-version."jsontool"."7.0.1"; + "jsontool" = self.by-version."jsontool"."7.0.2"; by-spec."jsprim"."0.3.0" = self.by-version."jsprim"."0.3.0"; by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -9306,14 +9596,14 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.12.3"; - by-version."karma"."0.12.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.12.3"; + self.by-version."karma"."0.12.9"; + by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.12.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.12.3.tgz"; - name = "karma-0.12.3.tgz"; - sha1 = "2599e3e8797de991cf68ed80290e7462c1e8483d"; + url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz"; + name = "karma-0.12.9.tgz"; + sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998"; }) ]; buildInputs = @@ -9331,7 +9621,7 @@ self.by-version."colors"."0.6.2" self.by-version."lodash"."2.4.1" self.by-version."mime"."1.2.11" - self.by-version."log4js"."0.6.12" + self.by-version."log4js"."0.6.14" self.by-version."useragent"."2.0.8" self.by-version."graceful-fs"."2.0.3" self.by-version."connect"."2.12.0" @@ -9341,15 +9631,15 @@ ]; passthru.names = [ "karma" ]; }; - "karma" = self.by-version."karma"."0.12.3"; + "karma" = self.by-version."karma"."0.12.9"; by-spec."karma".">=0.11.11" = - self.by-version."karma"."0.12.3"; + self.by-version."karma"."0.12.9"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.12.3"; + self.by-version."karma"."0.12.9"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.12.3"; + self.by-version."karma"."0.12.9"; by-spec."karma"."~0.12.0" = - self.by-version."karma"."0.12.3"; + self.by-version."karma"."0.12.9"; by-spec."karma-chrome-launcher"."*" = self.by-version."karma-chrome-launcher"."0.1.3"; by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -9366,7 +9656,7 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-chrome-launcher" ]; }; @@ -9390,20 +9680,20 @@ self.by-version."dateformat"."1.0.7-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-coverage" ]; }; "karma-coverage" = self.by-version."karma-coverage"."0.2.1"; by-spec."karma-junit-reporter"."*" = - self.by-version."karma-junit-reporter"."0.2.1"; - by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-junit-reporter-0.2.1"; + self.by-version."karma-junit-reporter"."0.2.2"; + by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-junit-reporter-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz"; - name = "karma-junit-reporter-0.2.1.tgz"; - sha1 = "ae125962683a0d1286dc7768fbf66a8f02e448fc"; + url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz"; + name = "karma-junit-reporter-0.2.2.tgz"; + sha1 = "4cdd4e21affd3e090e7ba73e3c766ea9e13c45ba"; }) ]; buildInputs = @@ -9412,11 +9702,11 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-junit-reporter" ]; }; - "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.1"; + "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2"; by-spec."karma-mocha"."*" = self.by-version."karma-mocha"."0.1.3"; by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -9433,7 +9723,7 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" self.by-version."mocha"."1.18.2" ]; passthru.names = [ "karma-mocha" ]; @@ -9455,37 +9745,37 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" self.by-version."requirejs"."2.1.11" ]; passthru.names = [ "karma-requirejs" ]; }; "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.2.5"; - by-version."karma-sauce-launcher"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-sauce-launcher-0.2.5"; + self.by-version."karma-sauce-launcher"."0.2.7"; + by-version."karma-sauce-launcher"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-sauce-launcher-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.5.tgz"; - name = "karma-sauce-launcher-0.2.5.tgz"; - sha1 = "d1fe0c0dbc104e5be04a2050a61f13ab7ae8ca04"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.7.tgz"; + name = "karma-sauce-launcher-0.2.7.tgz"; + sha1 = "a87a0b2e3612b298f3f6c2a96839940af85ac849"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.14" - self.by-version."sauce-connect-launcher"."0.3.3" + self.by-version."wd"."0.2.19" + self.by-version."sauce-connect-launcher"."0.4.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.12.3" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.5"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.7"; by-spec."keen.io"."~0.0.4" = self.by-version."keen.io"."0.0.4"; by-version."keen.io"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -9604,15 +9894,15 @@ }; by-spec."keypress"."~0.1.0" = self.by-version."keypress"."0.1.0"; - by-spec."knockout"."~3.0.0" = - self.by-version."knockout"."3.0.0"; - by-version."knockout"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-knockout-3.0.0"; + by-spec."knockout"."~3.1.0" = + self.by-version."knockout"."3.1.0"; + by-version."knockout"."3.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-knockout-3.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/knockout/-/knockout-3.0.0.tgz"; - name = "knockout-3.0.0.tgz"; - sha1 = "fd8d43ee446237cde7df650f5c7dbcf68ae49a80"; + url = "http://registry.npmjs.org/knockout/-/knockout-3.1.0.tgz"; + name = "knockout-3.1.0.tgz"; + sha1 = "8960ecfafa20e1d5795badfbf6256693f17b7bf5"; }) ]; buildInputs = @@ -9706,7 +9996,7 @@ buildInputs = (self.nativeDeps."lazystream" or []); deps = [ - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -9752,7 +10042,7 @@ passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."^1.7.0" = + by-spec."less"."*" = self.by-version."less"."1.7.0"; by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { name = "less-1.7.0"; @@ -9776,23 +10066,26 @@ ]; passthru.names = [ "less" ]; }; + "less" = self.by-version."less"."1.7.0"; + by-spec."less"."^1.7.0" = + self.by-version."less"."1.7.0"; by-spec."less"."~1.7.0" = self.by-version."less"."1.7.0"; - by-spec."lexical-scope"."~0.1.0" = - self.by-version."lexical-scope"."0.1.0"; - by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-lexical-scope-0.1.0"; + by-spec."lexical-scope"."~1.1.0" = + self.by-version."lexical-scope"."1.1.0"; + by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lexical-scope-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz"; - name = "lexical-scope-0.1.0.tgz"; - sha1 = "8f30004c80234ffac083b990079d7b267e18441b"; + url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz"; + name = "lexical-scope-1.1.0.tgz"; + sha1 = "899f36c4ec9c5af19736361aae290a6ef2af0800"; }) ]; buildInputs = (self.nativeDeps."lexical-scope" or []); deps = [ - self.by-version."astw"."0.1.0" + self.by-version."astw"."1.1.0" ]; peerDependencies = [ ]; @@ -9857,6 +10150,8 @@ ]; passthru.names = [ "lockfile" ]; }; + by-spec."lockfile"."~0.4.2" = + self.by-version."lockfile"."0.4.2"; by-spec."lodash"."^2.4.1" = self.by-version."lodash"."2.4.1"; by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -9994,6 +10289,25 @@ }; by-spec."lodash"."~2.4.1" = self.by-version."lodash"."2.4.1"; + by-spec."lodash-node"."~2.4.1" = + self.by-version."lodash-node"."2.4.1"; + by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash-node-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"; + name = "lodash-node-2.4.1.tgz"; + sha1 = "ea82f7b100c733d1a42af76801e506105e2a80ec"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash-node" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash-node" ]; + }; by-spec."lodash._isnative"."~2.4.1" = self.by-version."lodash._isnative"."2.4.1"; by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -10196,14 +10510,14 @@ passthru.names = [ "log-driver" ]; }; by-spec."log4js"."~0.6.3" = - self.by-version."log4js"."0.6.12"; - by-version."log4js"."0.6.12" = lib.makeOverridable self.buildNodePackage { - name = "node-log4js-0.6.12"; + self.by-version."log4js"."0.6.14"; + by-version."log4js"."0.6.14" = lib.makeOverridable self.buildNodePackage { + name = "node-log4js-0.6.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/log4js/-/log4js-0.6.12.tgz"; - name = "log4js-0.6.12.tgz"; - sha1 = "ef806ec669ea3fc7bf5be92a95891fb67517e642"; + url = "http://registry.npmjs.org/log4js/-/log4js-0.6.14.tgz"; + name = "log4js-0.6.14.tgz"; + sha1 = "7c26a0a25536b42bafa17fd937b87536fad3b229"; }) ]; buildInputs = @@ -10211,7 +10525,7 @@ deps = [ self.by-version."async"."0.1.15" self.by-version."semver"."1.1.4" - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -10391,21 +10705,21 @@ passthru.names = [ "lsmod" ]; }; by-spec."mailcomposer".">= 0.1.27" = - self.by-version."mailcomposer"."0.2.8"; - by-version."mailcomposer"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-mailcomposer-0.2.8"; + self.by-version."mailcomposer"."0.2.9"; + by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-mailcomposer-0.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.8.tgz"; - name = "mailcomposer-0.2.8.tgz"; - sha1 = "bcb4d84aea08ea6f4c007f927c0ad214986370cc"; + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz"; + name = "mailcomposer-0.2.9.tgz"; + sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e"; }) ]; buildInputs = (self.nativeDeps."mailcomposer" or []); deps = [ self.by-version."mimelib"."0.2.14" - self.by-version."mime"."1.2.9" + self.by-version."mime"."1.2.11" self.by-version."he"."0.3.6" self.by-version."punycode"."1.2.4" self.by-version."follow-redirects"."0.0.3" @@ -10415,26 +10729,46 @@ ]; passthru.names = [ "mailcomposer" ]; }; - by-spec."map-key"."^0.1.0" = - self.by-version."map-key"."0.1.0"; - by-version."map-key"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-map-key-0.1.0"; + by-spec."map-key"."^0.1.1" = + self.by-version."map-key"."0.1.1"; + by-version."map-key"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-map-key-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/map-key/-/map-key-0.1.0.tgz"; - name = "map-key-0.1.0.tgz"; - sha1 = "7ce8f677ba4051e23ddab5ce0d19c256cbf701fc"; + url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz"; + name = "map-key-0.1.1.tgz"; + sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b"; }) ]; buildInputs = (self.nativeDeps."map-key" or []); deps = [ - self.by-version."mout"."0.9.0" + self.by-version."mout"."0.9.1" ]; peerDependencies = [ ]; passthru.names = [ "map-key" ]; }; + by-spec."marked"."*" = + self.by-version."marked"."0.3.2"; + by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "marked-0.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz"; + name = "marked-0.3.2.tgz"; + sha1 = "015db158864438f24a64bdd61a0428b418706d09"; + }) + ]; + buildInputs = + (self.nativeDeps."marked" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "marked" ]; + }; + "marked" = self.by-version."marked"."0.3.2"; by-spec."maxmin"."^0.1.0" = self.by-version."maxmin"."0.1.0"; by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10449,7 +10783,7 @@ buildInputs = (self.nativeDeps."maxmin" or []); deps = [ - self.by-version."gzip-size"."0.1.0" + self.by-version."gzip-size"."0.1.1" self.by-version."pretty-bytes"."0.1.0" self.by-version."chalk"."0.4.0" ]; @@ -10507,25 +10841,6 @@ ]; passthru.names = [ "memoizee" ]; }; - by-spec."merge-descriptors"."0.0.1" = - self.by-version."merge-descriptors"."0.0.1"; - by-version."merge-descriptors"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-merge-descriptors-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz"; - name = "merge-descriptors-0.0.1.tgz"; - sha1 = "2ff0980c924cf81d0b5d1fb601177cb8bb56c0d0"; - }) - ]; - buildInputs = - (self.nativeDeps."merge-descriptors" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "merge-descriptors" ]; - }; by-spec."merge-descriptors"."0.0.2" = self.by-version."merge-descriptors"."0.0.2"; by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -10624,6 +10939,8 @@ ]; passthru.names = [ "mime" ]; }; + by-spec."mime"."1.2.11" = + self.by-version."mime"."1.2.11"; by-spec."mime"."1.2.4" = self.by-version."mime"."1.2.4"; by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -10950,7 +11267,7 @@ self.by-version."growl"."1.7.0" self.by-version."jade"."0.26.3" self.by-version."diff"."1.0.7" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -10959,6 +11276,55 @@ passthru.names = [ "mocha" ]; }; "mocha" = self.by-version."mocha"."1.18.2"; + by-spec."mocha"."1.13.x" = + self.by-version."mocha"."1.13.0"; + by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.13.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz"; + name = "mocha-1.13.0.tgz"; + sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c"; + }) + ]; + buildInputs = + (self.nativeDeps."mocha" or []); + deps = [ + self.by-version."commander"."0.6.1" + self.by-version."growl"."1.7.0" + self.by-version."jade"."0.26.3" + self.by-version."diff"."1.0.7" + self.by-version."debug"."0.8.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."glob"."3.2.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mocha" ]; + }; + by-spec."mocha-phantomjs"."*" = + self.by-version."mocha-phantomjs"."3.3.2"; + by-version."mocha-phantomjs"."3.3.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz"; + name = "mocha-phantomjs-3.3.2.tgz"; + sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722"; + }) + ]; + buildInputs = + (self.nativeDeps."mocha-phantomjs" or []); + deps = [ + self.by-version."mocha"."1.13.0" + self.by-version."commander"."1.2.0" + self.by-version."which"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mocha-phantomjs" ]; + }; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -10983,28 +11349,55 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; - by-spec."module-deps"."~1.7.0" = - self.by-version."module-deps"."1.7.1"; - by-version."module-deps"."1.7.1" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-1.7.1"; + by-spec."module-deps"."~1.10.0" = + self.by-version."module-deps"."1.10.0"; + by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-1.7.1.tgz"; - name = "module-deps-1.7.1.tgz"; - sha1 = "1e9a6809727282323abf1d5eee5ce8860b2e7bbf"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz"; + name = "module-deps-1.10.0.tgz"; + sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6"; }) ]; buildInputs = (self.nativeDeps."module-deps" or []); deps = [ + self.by-version."JSONStream"."0.7.2" + self.by-version."browser-resolve"."1.2.4" + self.by-version."concat-stream"."1.4.5" + self.by-version."detective"."3.1.0" + self.by-version."minimist"."0.0.8" + self.by-version."parents"."0.0.2" + self.by-version."resolve"."0.6.3" self.by-version."through"."2.3.4" - self.by-version."JSONStream"."0.7.1" - self.by-version."browser-resolve"."1.2.2" - self.by-version."resolve"."0.6.2" - self.by-version."concat-stream"."1.4.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; + by-spec."module-deps"."~1.8.0" = + self.by-version."module-deps"."1.8.1"; + by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.8.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.8.1.tgz"; + name = "module-deps-1.8.1.tgz"; + sha1 = "9d603b286f87cf62aad9e3f7b65a2f8bfa21de5b"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = [ + self.by-version."JSONStream"."0.7.2" + self.by-version."browser-resolve"."1.2.4" + self.by-version."concat-stream"."1.4.5" + self.by-version."detective"."3.1.0" self.by-version."minimist"."0.0.8" self.by-version."parents"."0.0.2" - self.by-version."detective"."2.4.1" + self.by-version."resolve"."0.6.3" + self.by-version."through"."2.3.4" ]; peerDependencies = [ ]; @@ -11068,14 +11461,14 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc9"; - by-version."mongodb"."1.4.0-rc9" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.0-rc9"; + self.by-version."mongodb"."1.4.2"; + by-version."mongodb"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc9.tgz"; - name = "mongodb-1.4.0-rc9.tgz"; - sha1 = "1b3887e9b2846de7557a009e1702f7dbc70d4c12"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz"; + name = "mongodb-1.4.2.tgz"; + sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa"; }) ]; buildInputs = @@ -11088,7 +11481,7 @@ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc9"; + "mongodb" = self.by-version."mongodb"."1.4.2"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -11268,7 +11661,7 @@ buildInputs = (self.nativeDeps."mongoose-schema-extend" or []); deps = [ - self.by-version."owl-deepcopy"."0.0.2" + self.by-version."owl-deepcopy"."0.0.4" ]; peerDependencies = [ ]; @@ -11336,14 +11729,14 @@ passthru.names = [ "morgan" ]; }; by-spec."mout"."^0.9.0" = - self.by-version."mout"."0.9.0"; - by-version."mout"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mout-0.9.0"; + self.by-version."mout"."0.9.1"; + by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-mout-0.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mout/-/mout-0.9.0.tgz"; - name = "mout-0.9.0.tgz"; - sha1 = "4b6ef8cae5099151d9a7ddb6ebb9a56f9de6aaeb"; + url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; + name = "mout-0.9.1.tgz"; + sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477"; }) ]; buildInputs = @@ -11393,7 +11786,7 @@ passthru.names = [ "mout" ]; }; by-spec."mout"."~0.9.0" = - self.by-version."mout"."0.9.0"; + self.by-version."mout"."0.9.1"; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -11494,14 +11887,14 @@ passthru.names = [ "ms" ]; }; by-spec."msgpack".">= 0.0.1" = - self.by-version."msgpack"."0.2.2"; - by-version."msgpack"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "msgpack-0.2.2"; + self.by-version."msgpack"."0.2.3"; + by-version."msgpack"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "msgpack-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.2.tgz"; - name = "msgpack-0.2.2.tgz"; - sha1 = "e7aec9bea24d9b07940dee6cfa536c469cd1776c"; + url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.3.tgz"; + name = "msgpack-0.2.3.tgz"; + sha1 = "0739ab7eaa0a5ba0ff7da2061c72ab806b6afe5f"; }) ]; buildInputs = @@ -11526,7 +11919,7 @@ buildInputs = (self.nativeDeps."multiparty" or []); deps = [ - self.by-version."readable-stream"."1.1.12" + self.by-version."readable-stream"."1.1.13-1" self.by-version."stream-counter"."0.2.0" ]; peerDependencies = [ @@ -11989,25 +12382,25 @@ by-spec."node-gyp"."~0.13.0" = self.by-version."node-gyp"."0.13.0"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.2"; - by-version."node-inspector"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.2"; + self.by-version."node-inspector"."0.7.3"; + by-version."node-inspector"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.2.tgz"; - name = "node-inspector-0.7.2.tgz"; - sha1 = "b9f1a1bbec7960d504edbfbc4bf191841794aab8"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz"; + name = "node-inspector-0.7.3.tgz"; + sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = [ - self.by-version."express"."3.4.8" - self.by-version."async"."0.2.10" + self.by-version."express"."3.5.1" + self.by-version."async"."0.4.1" self.by-version."glob"."3.2.9" - self.by-version."rc"."0.3.4" + self.by-version."rc"."0.3.5" self.by-version."strong-data-uri"."0.1.1" - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.1" self.by-version."ws"."0.4.31" self.by-version."opener"."1.3.0" self.by-version."yargs"."1.1.3" @@ -12017,7 +12410,7 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.2"; + "node-inspector" = self.by-version."node-inspector"."0.7.3"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.0.10"; by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -12227,8 +12620,8 @@ buildInputs = (self.nativeDeps."nodemailer" or []); deps = [ - self.by-version."mailcomposer"."0.2.8" - self.by-version."simplesmtp"."0.3.24" + self.by-version."mailcomposer"."0.2.9" + self.by-version."simplesmtp"."0.3.25" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -12292,7 +12685,7 @@ buildInputs = (self.nativeDeps."nopt" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" ]; peerDependencies = [ ]; @@ -12312,7 +12705,7 @@ buildInputs = (self.nativeDeps."nopt" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" ]; peerDependencies = [ ]; @@ -12320,6 +12713,8 @@ }; by-spec."nopt"."2.2.x" = self.by-version."nopt"."2.2.0"; + by-spec."nopt"."^2.2.0" = + self.by-version."nopt"."2.2.0"; by-spec."nopt"."~1.0.10" = self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -12334,7 +12729,7 @@ buildInputs = (self.nativeDeps."nopt" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" ]; peerDependencies = [ ]; @@ -12354,7 +12749,7 @@ buildInputs = (self.nativeDeps."nopt" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" ]; peerDependencies = [ ]; @@ -12387,20 +12782,20 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.4.6"; - by-version."npm"."1.4.6" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.4.6"; + self.by-version."npm"."1.4.7"; + by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.4.6.tgz"; - name = "npm-1.4.6.tgz"; - sha1 = "0e151bce38e72cf2206a6299fa5164123f04256e"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz"; + name = "npm-1.4.7.tgz"; + sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0"; }) ]; buildInputs = (self.nativeDeps."npm" or []); deps = [ - self.by-version."abbrev"."1.0.4" + self.by-version."abbrev"."1.0.5" self.by-version."ansi"."0.2.1" self.by-version."ansicolors"."0.3.2" self.by-version."ansistyles"."0.1.3" @@ -12427,9 +12822,9 @@ self.by-version."node-gyp"."0.13.0" self.by-version."nopt"."2.2.0" self.by-version."npm-install-checks"."1.0.0" - self.by-version."npm-registry-client"."0.4.6" + self.by-version."npm-registry-client"."0.4.7" self.by-version."npm-user-validate"."0.0.3" - self.by-version."npmconf"."0.1.13" + self.by-version."npmconf"."0.1.14" self.by-version."npmlog"."0.0.6" self.by-version."once"."1.3.0" self.by-version."opener"."1.3.0" @@ -12454,7 +12849,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.4.6"; + "npm" = self.by-version."npm"."1.4.7"; by-spec."npm-install-checks"."~1.0.0" = self.by-version."npm-install-checks"."1.0.0"; by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -12505,15 +12900,15 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.4.4" = - self.by-version."npm-registry-client"."0.4.6"; - by-version."npm-registry-client"."0.4.6" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.4.6"; + by-spec."npm-registry-client"."~0.4.7" = + self.by-version."npm-registry-client"."0.4.7"; + by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-registry-client-0.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.6.tgz"; - name = "npm-registry-client-0.4.6.tgz"; - sha1 = "657f69a79543fc4cc264c3b2de958bd15f7140fe"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.7.tgz"; + name = "npm-registry-client-0.4.7.tgz"; + sha1 = "f4369b59890da7882527eb7c427dd95d43707afb"; }) ]; buildInputs = @@ -12533,8 +12928,6 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.4.5" = - self.by-version."npm-registry-client"."0.4.6"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -12637,14 +13030,14 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.13" = - self.by-version."npmconf"."0.1.13"; - by-version."npmconf"."0.1.13" = lib.makeOverridable self.buildNodePackage { - name = "node-npmconf-0.1.13"; + self.by-version."npmconf"."0.1.14"; + by-version."npmconf"."0.1.14" = lib.makeOverridable self.buildNodePackage { + name = "node-npmconf-0.1.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.13.tgz"; - name = "npmconf-0.1.13.tgz"; - sha1 = "d47241b5b074f554ced90cd888d0dc96e4b1a4da"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz"; + name = "npmconf-0.1.14.tgz"; + sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7"; }) ]; buildInputs = @@ -12663,8 +13056,10 @@ ]; passthru.names = [ "npmconf" ]; }; + by-spec."npmconf"."~0.1.14" = + self.by-version."npmconf"."0.1.14"; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.13"; + self.by-version."npmconf"."0.1.14"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -12925,9 +13320,26 @@ passthru.names = [ "open" ]; }; by-spec."open"."~0.0.3" = - self.by-version."open"."0.0.4"; + self.by-version."open"."0.0.5"; + by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-open-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz"; + name = "open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + }) + ]; + buildInputs = + (self.nativeDeps."open" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "open" ]; + }; by-spec."open"."~0.0.4" = - self.by-version."open"."0.0.4"; + self.by-version."open"."0.0.5"; by-spec."opener"."~1.3.0" = self.by-version."opener"."1.3.0"; by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12948,14 +13360,14 @@ passthru.names = [ "opener" ]; }; by-spec."openid".">=0.2.0" = - self.by-version."openid"."0.5.5"; - by-version."openid"."0.5.5" = lib.makeOverridable self.buildNodePackage { - name = "node-openid-0.5.5"; + self.by-version."openid"."0.5.8"; + by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage { + name = "node-openid-0.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz"; - name = "openid-0.5.5.tgz"; - sha1 = "a4ce534ca82d68f81ccf45109fc92b4547b2cdd1"; + url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz"; + name = "openid-0.5.8.tgz"; + sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85"; }) ]; buildInputs = @@ -13162,14 +13574,14 @@ by-spec."osenv"."~0.0.3" = self.by-version."osenv"."0.0.3"; by-spec."owl-deepcopy"."*" = - self.by-version."owl-deepcopy"."0.0.2"; - by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-owl-deepcopy-0.0.2"; + self.by-version."owl-deepcopy"."0.0.4"; + by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-owl-deepcopy-0.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz"; - name = "owl-deepcopy-0.0.2.tgz"; - sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88"; + url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz"; + name = "owl-deepcopy-0.0.4.tgz"; + sha1 = "665f3aeafab74302d98ecaeeb7b3e764ae21f369"; }) ]; buildInputs = @@ -13180,9 +13592,9 @@ ]; passthru.names = [ "owl-deepcopy" ]; }; - "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.2"; + "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4"; by-spec."owl-deepcopy"."~0.0.1" = - self.by-version."owl-deepcopy"."0.0.2"; + self.by-version."owl-deepcopy"."0.0.4"; by-spec."p-throttler"."~0.0.1" = self.by-version."p-throttler"."0.0.1"; by-version."p-throttler"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13203,6 +13615,25 @@ ]; passthru.names = [ "p-throttler" ]; }; + by-spec."pako"."~0.2.0" = + self.by-version."pako"."0.2.0"; + by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-pako-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz"; + name = "pako-0.2.0.tgz"; + sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5"; + }) + ]; + buildInputs = + (self.nativeDeps."pako" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pako" ]; + }; by-spec."parents"."0.0.2" = self.by-version."parents"."0.0.2"; by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -13265,7 +13696,7 @@ passthru.names = [ "passport" ]; }; "passport" = self.by-version."passport"."0.2.0"; - by-spec."passport"."~0.1.1" = + by-spec."passport"."~0.1.3" = self.by-version."passport"."0.1.18"; by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage { name = "node-passport-0.1.18"; @@ -13286,8 +13717,6 @@ ]; passthru.names = [ "passport" ]; }; - by-spec."passport"."~0.1.3" = - self.by-version."passport"."0.1.18"; by-spec."passport"."~0.2.0" = self.by-version."passport"."0.2.0"; by-spec."passport-http"."*" = @@ -13333,27 +13762,8 @@ passthru.names = [ "passport-local" ]; }; "passport-local" = self.by-version."passport-local"."1.0.0"; - by-spec."passport-local"."0.1.6" = - self.by-version."passport-local"."0.1.6"; - by-version."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-passport-local-0.1.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; - name = "passport-local-0.1.6.tgz"; - sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db"; - }) - ]; - buildInputs = - (self.nativeDeps."passport-local" or []); - deps = [ - self.by-version."pkginfo"."0.2.3" - self.by-version."passport"."0.1.18" - ]; - peerDependencies = [ - ]; - passthru.names = [ "passport-local" ]; - }; + by-spec."passport-local"."~1.0.0" = + self.by-version."passport-local"."1.0.0"; by-spec."passport-strategy"."1.x.x" = self.by-version."passport-strategy"."1.0.0"; by-version."passport-strategy"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13449,15 +13859,15 @@ ]; passthru.names = [ "pause" ]; }; - by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.7-1"; - by-version."phantomjs"."1.9.7-1" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.7-1"; + by-spec."phantomjs"."*" = + self.by-version."phantomjs"."1.9.7-4"; + by-version."phantomjs"."1.9.7-4" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.7-4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-1.tgz"; - name = "phantomjs-1.9.7-1.tgz"; - sha1 = "57a191c908de74d27ac4948bd66100ae88222f47"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz"; + name = "phantomjs-1.9.7-4.tgz"; + sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd"; }) ]; buildInputs = @@ -13475,6 +13885,9 @@ ]; passthru.names = [ "phantomjs" ]; }; + "phantomjs" = self.by-version."phantomjs"."1.9.7-4"; + by-spec."phantomjs"."~1.9.1-2" = + self.by-version."phantomjs"."1.9.7-4"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -13634,6 +14047,25 @@ ]; passthru.names = [ "process" ]; }; + by-spec."process"."~0.6.0" = + self.by-version."process"."0.6.0"; + by-version."process"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-process-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz"; + name = "process-0.6.0.tgz"; + sha1 = "7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f"; + }) + ]; + buildInputs = + (self.nativeDeps."process" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "process" ]; + }; by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13670,7 +14102,7 @@ deps = [ self.by-version."pkginfo"."0.3.0" self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.6" + self.by-version."revalidator"."0.1.7" self.by-version."utile"."0.2.1" self.by-version."winston"."0.6.2" ]; @@ -13778,7 +14210,7 @@ ]; passthru.names = [ "ps-tree" ]; }; - by-spec."punycode".">=0.2.0" = + by-spec."punycode"."1.2.4" = self.by-version."punycode"."1.2.4"; by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage { name = "node-punycode-1.2.4"; @@ -13797,6 +14229,8 @@ ]; passthru.names = [ "punycode" ]; }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.2.4"; by-spec."punycode".">=1.0.0 <1.1.0" = self.by-version."punycode"."1.0.0"; by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13818,6 +14252,26 @@ }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; + by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" = + self.by-version."pure-css"."0.5.0-rc-1"; + by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage { + name = "node-pure-0.5.0-rc-1"; + src = [ + (fetchgit { + url = "git://github.com/yui/pure.git"; + rev = "f5ce3ae4b48ce252adac7b6ddac50c9518729a2d"; + sha256 = "049ac2ef812771852978d11cd5aecac2dd561e97bb16ad89c79eb1e10aa57672"; + }) + ]; + buildInputs = + (self.nativeDeps."pure" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pure" ]; + }; + "pure-css" = self.by-version."pure-css"."0.5.0-rc-1"; by-spec."q".">= 0.0.1" = self.by-version."q"."2.0.1"; by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13881,6 +14335,8 @@ ]; passthru.names = [ "q" ]; }; + by-spec."q"."~1.0.1" = + self.by-version."q"."1.0.1"; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -14022,6 +14478,8 @@ self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; + by-spec."qs"."~0.6.6" = + self.by-version."qs"."0.6.6"; by-spec."querystring".">=0.1.0 <0.2.0" = self.by-version."querystring"."0.1.0"; by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -14119,15 +14577,15 @@ }; by-spec."range-parser"."~1.0.0" = self.by-version."range-parser"."1.0.0"; - by-spec."raven"."~0.6.2" = - self.by-version."raven"."0.6.2"; - by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "raven-0.6.2"; + by-spec."raven"."~0.6.3" = + self.by-version."raven"."0.6.3"; + by-version."raven"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "raven-0.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raven/-/raven-0.6.2.tgz"; - name = "raven-0.6.2.tgz"; - sha1 = "391a7395b6088518a01697f639f21ce6ea9841a3"; + url = "http://registry.npmjs.org/raven/-/raven-0.6.3.tgz"; + name = "raven-0.6.3.tgz"; + sha1 = "3e7c72d45e0dff93ecc54978661331755c637320"; }) ]; buildInputs = @@ -14201,6 +14659,26 @@ ]; passthru.names = [ "raw-body" ]; }; + by-spec."raw-body"."~1.1.2" = + self.by-version."raw-body"."1.1.4"; + by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-raw-body-1.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; + name = "raw-body-1.1.4.tgz"; + sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-body" or []); + deps = [ + self.by-version."bytes"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raw-body" ]; + }; by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -14241,14 +14719,14 @@ }; "rbytes" = self.by-version."rbytes"."1.0.0"; by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.4"; - by-version."rc"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.4"; + self.by-version."rc"."0.3.5"; + by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.3.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.4.tgz"; - name = "rc-0.3.4.tgz"; - sha1 = "01101660fb38363c22afbddfad46ecdb92b42df9"; + url = "http://registry.npmjs.org/rc/-/rc-0.3.5.tgz"; + name = "rc-0.3.5.tgz"; + sha1 = "fce2220593be57aa1296685a7e37ed003dfcc728"; }) ]; buildInputs = @@ -14263,7 +14741,7 @@ passthru.names = [ "rc" ]; }; by-spec."rc"."~0.3.4" = - self.by-version."rc"."0.3.4"; + self.by-version."rc"."0.3.5"; by-spec."react"."*" = self.by-version."react"."0.10.0"; by-version."react"."0.10.0" = lib.makeOverridable self.buildNodePackage { @@ -14311,29 +14789,6 @@ self.by-version."read"."1.0.5"; by-spec."read"."~1.0.4" = self.by-version."read"."1.0.5"; - by-spec."read-installed"."0.2.2" = - self.by-version."read-installed"."0.2.2"; - by-version."read-installed"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-read-installed-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; - name = "read-installed-0.2.2.tgz"; - sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab"; - }) - ]; - buildInputs = - (self.nativeDeps."read-installed" or []); - deps = [ - self.by-version."semver"."2.2.1" - self.by-version."slide"."1.1.5" - self.by-version."read-package-json"."1.1.8" - self.by-version."graceful-fs"."1.2.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read-installed" ]; - }; by-spec."read-installed"."~2.0.1" = self.by-version."read-installed"."2.0.2"; by-version."read-installed"."2.0.2" = lib.makeOverridable self.buildNodePackage { @@ -14384,34 +14839,37 @@ by-spec."read-package-json"."~1.1.8" = self.by-version."read-package-json"."1.1.8"; by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.26"; - by-version."readable-stream"."1.0.26" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.0.26"; + self.by-version."readable-stream"."1.0.27-1"; + by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.0.27-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26.tgz"; - name = "readable-stream-1.0.26.tgz"; - sha1 = "12a9c4415f6a85374abe18b7831ba52d43105766"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + name = "readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; }) ]; buildInputs = (self.nativeDeps."readable-stream" or []); deps = [ + self.by-version."core-util-is"."1.0.1" + self.by-version."isarray"."0.0.1" self.by-version."string_decoder"."0.10.25" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.12"; - by-version."readable-stream"."1.1.12" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.12"; + self.by-version."readable-stream"."1.1.13-1"; + by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.13-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.12.tgz"; - name = "readable-stream-1.1.12.tgz"; - sha1 = "960d442bbf5f6690b6b20550413931021af8e506"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz"; + name = "readable-stream-1.1.13-1.tgz"; + sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46"; }) ]; buildInputs = @@ -14427,15 +14885,15 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."~1.0.17" = - self.by-version."readable-stream"."1.0.26"; + self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.26"; + self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.0.24" = - self.by-version."readable-stream"."1.0.26"; + self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.1.8" = - self.by-version."readable-stream"."1.1.12"; + self.by-version."readable-stream"."1.1.13-1"; by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.12"; + self.by-version."readable-stream"."1.1.13-1"; by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -14794,6 +15252,8 @@ }; by-spec."request".">=2.33.0" = self.by-version."request"."2.34.0"; + by-spec."request"."^2.34.0" = + self.by-version."request"."2.34.0"; by-spec."request"."~2" = self.by-version."request"."2.34.0"; by-spec."request"."~2.27.0" = @@ -14889,8 +15349,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.34.0" = - self.by-version."request"."2.34.0"; by-spec."request-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -14952,15 +15410,15 @@ }; by-spec."requirejs"."~2.1.0" = self.by-version."requirejs"."2.1.11"; - by-spec."resolve"."0.6.1" = - self.by-version."resolve"."0.6.1"; - by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-resolve-0.6.1"; + by-spec."resolve"."0.6.3" = + self.by-version."resolve"."0.6.3"; + by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "node-resolve-0.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz"; - name = "resolve-0.6.1.tgz"; - sha1 = "b7fc874a8fe240b44de2c92b7f885a2e8598b652"; + url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz"; + name = "resolve-0.6.3.tgz"; + sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46"; }) ]; buildInputs = @@ -14972,24 +15430,7 @@ passthru.names = [ "resolve" ]; }; by-spec."resolve"."0.6.x" = - self.by-version."resolve"."0.6.2"; - by-version."resolve"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-resolve-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-0.6.2.tgz"; - name = "resolve-0.6.2.tgz"; - sha1 = "7404e59e3c02980aa172272186521db3cf0a15f5"; - }) - ]; - buildInputs = - (self.nativeDeps."resolve" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "resolve" ]; - }; + self.by-version."resolve"."0.6.3"; by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -15012,9 +15453,9 @@ by-spec."resolve"."~0.3.1" = self.by-version."resolve"."0.3.1"; by-spec."resolve"."~0.6.0" = - self.by-version."resolve"."0.6.2"; + self.by-version."resolve"."0.6.3"; by-spec."resolve"."~0.6.1" = - self.by-version."resolve"."0.6.2"; + self.by-version."resolve"."0.6.3"; by-spec."response-time"."1.0.0" = self.by-version."response-time"."1.0.0"; by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15113,14 +15554,14 @@ by-spec."retry"."~0.6.0" = self.by-version."retry"."0.6.0"; by-spec."revalidator"."0.1.x" = - self.by-version."revalidator"."0.1.6"; - by-version."revalidator"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-revalidator-0.1.6"; + self.by-version."revalidator"."0.1.7"; + by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-revalidator-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz"; - name = "revalidator-0.1.6.tgz"; - sha1 = "0af2bab68d7d0e766fc4249660ebc2be28b594ba"; + url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz"; + name = "revalidator-0.1.7.tgz"; + sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db"; }) ]; buildInputs = @@ -15295,15 +15736,34 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.by-version."s3http"."0.0.5"; - by-spec."sauce-connect-launcher"."~0.3.0" = - self.by-version."sauce-connect-launcher"."0.3.3"; - by-version."sauce-connect-launcher"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-sauce-connect-launcher-0.3.3"; + by-spec."samsam"."~1.1" = + self.by-version."samsam"."1.1.1"; + by-version."samsam"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-samsam-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/samsam/-/samsam-1.1.1.tgz"; + name = "samsam-1.1.1.tgz"; + sha1 = "48d64ee2a7aecaaeccebe2f0a68a49687d3a49b1"; + }) + ]; + buildInputs = + (self.nativeDeps."samsam" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "samsam" ]; + }; + by-spec."sauce-connect-launcher"."~0.4.0" = + self.by-version."sauce-connect-launcher"."0.4.2"; + by-version."sauce-connect-launcher"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-sauce-connect-launcher-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.3.3.tgz"; - name = "sauce-connect-launcher-0.3.3.tgz"; - sha1 = "6c8b59d16b795ffc9439f162d5abd24387cdc23d"; + url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.4.2.tgz"; + name = "sauce-connect-launcher-0.4.2.tgz"; + sha1 = "a24b9fde59e3b29ca2011174c5c08ef8f74e44b9"; }) ]; buildInputs = @@ -15375,6 +15835,25 @@ ]; passthru.names = [ "sax" ]; }; + by-spec."scmp"."~0.0.3" = + self.by-version."scmp"."0.0.3"; + by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-scmp-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz"; + name = "scmp-0.0.3.tgz"; + sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073"; + }) + ]; + buildInputs = + (self.nativeDeps."scmp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "scmp" ]; + }; by-spec."selenium-webdriver"."*" = self.by-version."selenium-webdriver"."2.41.0"; by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage { @@ -15521,7 +16000,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.2" self.by-version."range-parser"."1.0.0" @@ -15544,7 +16023,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -15567,7 +16046,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -15590,7 +16069,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.0" self.by-version."range-parser"."0.0.4" @@ -15683,6 +16162,48 @@ ]; passthru.names = [ "serve-static" ]; }; + by-spec."serve-static"."1.0.4" = + self.by-version."serve-static"."1.0.4"; + by-version."serve-static"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz"; + name = "serve-static-1.0.4.tgz"; + sha1 = "426fedebe77bad21f373f1efcae09746639fba06"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = [ + self.by-version."parseurl"."1.0.1" + self.by-version."send"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "serve-static" ]; + }; + by-spec."serve-static"."~1.0.3" = + self.by-version."serve-static"."1.0.4"; + by-spec."setimmediate"."1.0.1" = + self.by-version."setimmediate"."1.0.1"; + by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-setimmediate-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; + name = "setimmediate-1.0.1.tgz"; + sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; + }) + ]; + buildInputs = + (self.nativeDeps."setimmediate" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "setimmediate" ]; + }; by-spec."sha"."~1.2.1" = self.by-version."sha"."1.2.3"; by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -15698,7 +16219,7 @@ (self.nativeDeps."sha" or []); deps = [ self.by-version."graceful-fs"."2.0.3" - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -15765,15 +16286,15 @@ ]; passthru.names = [ "shell-quote" ]; }; - by-spec."shelljs"."0.1.x" = - self.by-version."shelljs"."0.1.4"; - by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "shelljs-0.1.4"; + by-spec."shelljs"."*" = + self.by-version."shelljs"."0.2.6"; + by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "shelljs-0.2.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; - name = "shelljs-0.1.4.tgz"; - sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; + url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"; + name = "shelljs-0.2.6.tgz"; + sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378"; }) ]; buildInputs = @@ -15784,15 +16305,16 @@ ]; passthru.names = [ "shelljs" ]; }; - by-spec."shelljs"."~0.2.6" = - self.by-version."shelljs"."0.2.6"; - by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "shelljs-0.2.6"; + "shelljs" = self.by-version."shelljs"."0.2.6"; + by-spec."shelljs"."0.1.x" = + self.by-version."shelljs"."0.1.4"; + by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "shelljs-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"; - name = "shelljs-0.2.6.tgz"; - sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378"; + url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; + name = "shelljs-0.1.4.tgz"; + sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; }) ]; buildInputs = @@ -15803,15 +16325,17 @@ ]; passthru.names = [ "shelljs" ]; }; + by-spec."shelljs"."~0.2.6" = + self.by-version."shelljs"."0.2.6"; by-spec."should"."*" = - self.by-version."should"."3.2.0"; - by-version."should"."3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-should-3.2.0"; + self.by-version."should"."3.3.1"; + by-version."should"."3.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.3.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.2.0.tgz"; - name = "should-3.2.0.tgz"; - sha1 = "0dbbaec439c37eac010d4c0c2304815598be659f"; + url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz"; + name = "should-3.3.1.tgz"; + sha1 = "28c93a522ba001146af96078f0a88bf5ac929522"; }) ]; buildInputs = @@ -15822,7 +16346,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.2.0"; + "should" = self.by-version."should"."3.3.1"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15885,14 +16409,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.24"; - by-version."simplesmtp"."0.3.24" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.24"; + self.by-version."simplesmtp"."0.3.25"; + by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.25"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.24.tgz"; - name = "simplesmtp-0.3.24.tgz"; - sha1 = "7423226b0735a8dbf87c07c3888f33ba2135a0e7"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz"; + name = "simplesmtp-0.3.25.tgz"; + sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39"; }) ]; buildInputs = @@ -15905,6 +16429,28 @@ ]; passthru.names = [ "simplesmtp" ]; }; + by-spec."sinon"."*" = + self.by-version."sinon"."1.9.1"; + by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-sinon-1.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz"; + name = "sinon-1.9.1.tgz"; + sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69"; + }) + ]; + buildInputs = + (self.nativeDeps."sinon" or []); + deps = [ + self.by-version."formatio"."1.0.2" + self.by-version."util"."0.10.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sinon" ]; + }; + "sinon" = self.by-version."sinon"."1.9.1"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.3"; by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -16119,7 +16665,7 @@ ]; passthru.names = [ "socket.io" ]; }; - by-spec."socket.io"."0.9.16" = + by-spec."socket.io"."~0.9.13" = self.by-version."socket.io"."0.9.16"; by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { name = "node-socket.io-0.9.16"; @@ -16142,7 +16688,7 @@ ]; passthru.names = [ "socket.io" ]; }; - by-spec."socket.io"."~0.9.13" = + by-spec."socket.io"."~0.9.16" = self.by-version."socket.io"."0.9.16"; by-spec."socket.io-client"."0.9.11" = self.by-version."socket.io-client"."0.9.11"; @@ -16406,14 +16952,14 @@ passthru.names = [ "stack-trace" ]; }; by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.1.5"; - by-version."stackdriver-statsd-backend"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "node-stackdriver-statsd-backend-0.1.5"; + self.by-version."stackdriver-statsd-backend"."0.2.1"; + by-version."stackdriver-statsd-backend"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-stackdriver-statsd-backend-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.1.5.tgz"; - name = "stackdriver-statsd-backend-0.1.5.tgz"; - sha1 = "6f0cda0903fd149c6f69d0e50a9e8b4efd85141b"; + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.1.tgz"; + name = "stackdriver-statsd-backend-0.2.1.tgz"; + sha1 = "3109661288821e79259b4d750a25d7159265dd8e"; }) ]; buildInputs = @@ -16424,7 +16970,7 @@ ]; passthru.names = [ "stackdriver-statsd-backend" ]; }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5"; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.1"; by-spec."static-favicon"."1.0.0" = self.by-version."static-favicon"."1.0.0"; by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -16527,27 +17073,7 @@ ]; passthru.names = [ "stream-browserify" ]; }; - by-spec."stream-combiner"."^0.0.2" = - self.by-version."stream-combiner"."0.0.2"; - by-version."stream-combiner"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-stream-combiner-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz"; - name = "stream-combiner-0.0.2.tgz"; - sha1 = "dfe0e74675742565e76c6056788ea5c23bd97db4"; - }) - ]; - buildInputs = - (self.nativeDeps."stream-combiner" or []); - deps = [ - self.by-version."duplexer"."0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "stream-combiner" ]; - }; - by-spec."stream-combiner"."~0.0.2" = + by-spec."stream-combiner"."^0.0.4" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "node-stream-combiner-0.0.4"; @@ -16567,6 +17093,8 @@ ]; passthru.names = [ "stream-combiner" ]; }; + by-spec."stream-combiner"."~0.0.2" = + self.by-version."stream-combiner"."0.0.4"; by-spec."stream-counter"."~0.1.0" = self.by-version."stream-counter"."0.1.0"; by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -16581,7 +17109,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -16601,7 +17129,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.1.12" + self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ ]; @@ -16782,14 +17310,14 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.42.3"; - by-version."stylus"."0.42.3" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.42.3"; + self.by-version."stylus"."0.44.0-beta3"; + by-version."stylus"."0.44.0-beta3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.44.0-beta3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.42.3.tgz"; - name = "stylus-0.42.3.tgz"; - sha1 = "23e8b3e71eb7f60bc4a657de498c8feb9c366c32"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz"; + name = "stylus-0.44.0-beta3.tgz"; + sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff"; }) ]; buildInputs = @@ -16797,15 +17325,16 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."sax"."0.5.8" self.by-version."glob"."3.2.9" + self.by-version."circular-json"."0.1.6" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.42.3"; + "stylus" = self.by-version."stylus"."0.44.0-beta3"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { @@ -16822,7 +17351,7 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.8.0" + self.by-version."debug"."0.8.1" self.by-version."sax"."0.5.8" self.by-version."glob"."3.2.9" ]; @@ -16943,42 +17472,17 @@ ]; passthru.names = [ "superagent" ]; }; - by-spec."superagent"."~0.16.0" = - self.by-version."superagent"."0.16.0"; - by-version."superagent"."0.16.0" = lib.makeOverridable self.buildNodePackage { - name = "node-superagent-0.16.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.16.0.tgz"; - name = "superagent-0.16.0.tgz"; - sha1 = "f38df4a476565dffdbaa07764b81a19f0ab38a4e"; - }) - ]; - buildInputs = - (self.nativeDeps."superagent" or []); - deps = [ - self.by-version."qs"."0.6.5" - self.by-version."formidable"."1.0.14" - self.by-version."mime"."1.2.5" - self.by-version."emitter-component"."1.0.0" - self.by-version."methods"."0.0.1" - self.by-version."cookiejar"."1.3.0" - self.by-version."debug"."0.7.4" - self.by-version."reduce-component"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "superagent" ]; - }; + by-spec."superagent"."~0.17.0" = + self.by-version."superagent"."0.17.0"; by-spec."supertest"."*" = - self.by-version."supertest"."0.10.0"; - by-version."supertest"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-supertest-0.10.0"; + self.by-version."supertest"."0.11.0"; + by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "node-supertest-0.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.10.0.tgz"; - name = "supertest-0.10.0.tgz"; - sha1 = "5ba821b5f4e9e643292fcf87268dfd2688bdbb58"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz"; + name = "supertest-0.11.0.tgz"; + sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460"; }) ]; buildInputs = @@ -16991,7 +17495,7 @@ ]; passthru.names = [ "supertest" ]; }; - "supertest" = self.by-version."supertest"."0.10.0"; + "supertest" = self.by-version."supertest"."0.11.0"; by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { @@ -17034,21 +17538,21 @@ }; by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; - by-spec."syntax-error"."~0.1.0" = - self.by-version."syntax-error"."0.1.0"; - by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-syntax-error-0.1.0"; + by-spec."syntax-error"."~1.1.0" = + self.by-version."syntax-error"."1.1.0"; + by-version."syntax-error"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-syntax-error-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz"; - name = "syntax-error-0.1.0.tgz"; - sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65"; + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.0.tgz"; + name = "syntax-error-1.1.0.tgz"; + sha1 = "8bc3b08141b4e5084dfc66c74e15928db9f34e85"; }) ]; buildInputs = (self.nativeDeps."syntax-error" or []); deps = [ - self.by-version."esprima-six"."0.0.3" + self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb" ]; peerDependencies = [ ]; @@ -17253,15 +17757,15 @@ ]; passthru.names = [ "throttleit" ]; }; - by-spec."through"."~2.2.7" = - self.by-version."through"."2.2.7"; - by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage { - name = "node-through-2.2.7"; + by-spec."through".">=2.2.7 <3" = + self.by-version."through"."2.3.4"; + by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-through-2.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; - name = "through-2.2.7.tgz"; - sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; + name = "through-2.3.4.tgz"; + sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; }) ]; buildInputs = @@ -17272,15 +17776,15 @@ ]; passthru.names = [ "through" ]; }; - by-spec."through"."~2.3.4" = - self.by-version."through"."2.3.4"; - by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { - name = "node-through-2.3.4"; + by-spec."through"."~2.2.7" = + self.by-version."through"."2.2.7"; + by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-through-2.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; - name = "through-2.3.4.tgz"; - sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; + url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; + name = "through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; }) ]; buildInputs = @@ -17291,7 +17795,9 @@ ]; passthru.names = [ "through" ]; }; - by-spec."through2"."~0.4.0" = + by-spec."through"."~2.3.4" = + self.by-version."through"."2.3.4"; + by-spec."through2"."^0.4.0" = self.by-version."through2"."0.4.1"; by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage { name = "node-through2-0.4.1"; @@ -17305,13 +17811,15 @@ buildInputs = (self.nativeDeps."through2" or []); deps = [ - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" self.by-version."xtend"."2.1.2" ]; peerDependencies = [ ]; passthru.names = [ "through2" ]; }; + by-spec."through2"."~0.4.1" = + self.by-version."through2"."0.4.1"; by-spec."timers-browserify"."~1.0.1" = self.by-version."timers-browserify"."1.0.1"; by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -17660,6 +18168,26 @@ ]; passthru.names = [ "type-is" ]; }; + by-spec."type-is"."~1.1.0" = + self.by-version."type-is"."1.1.0"; + by-version."type-is"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.1.0.tgz"; + name = "type-is-1.1.0.tgz"; + sha1 = "d0245ec8b2676668d59dd0cf3255060676a57db6"; + }) + ]; + buildInputs = + (self.nativeDeps."type-is" or []); + deps = [ + self.by-version."mime"."1.2.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "type-is" ]; + }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -17698,6 +18226,30 @@ ]; passthru.names = [ "typedarray" ]; }; + by-spec."uglify-js"."*" = + self.by-version."uglify-js"."2.4.13"; + by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.13"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz"; + name = "uglify-js-2.4.13.tgz"; + sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."source-map"."0.1.33" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-to-browserify"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; + "uglify-js" = self.by-version."uglify-js"."2.4.13"; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { @@ -17742,27 +18294,6 @@ }; by-spec."uglify-js"."^2.4.0" = self.by-version."uglify-js"."2.4.13"; - by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.13"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz"; - name = "uglify-js-2.4.13.tgz"; - sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.33" - self.by-version."optimist"."0.3.7" - self.by-version."uglify-to-browserify"."1.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { @@ -17941,8 +18472,6 @@ self.by-version."underscore"."1.6.0"; by-spec."underscore".">=1.5.0" = self.by-version."underscore"."1.6.0"; - by-spec."underscore".">=1.5.x" = - self.by-version."underscore"."1.6.0"; by-spec."underscore"."~1.4" = self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.3" = @@ -18033,31 +18562,31 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.7.2"; - by-version."ungit"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.7.2"; + self.by-version."ungit"."0.8.0"; + by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.7.2.tgz"; - name = "ungit-0.7.2.tgz"; - sha1 = "fc4d6943c407ca4ed08b7c48841419050e3ce52a"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz"; + name = "ungit-0.8.0.tgz"; + sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4"; }) ]; buildInputs = (self.nativeDeps."ungit" or []); deps = [ - self.by-version."express"."3.4.8" - self.by-version."superagent"."0.16.0" + self.by-version."express"."4.0.0" + self.by-version."superagent"."0.17.0" self.by-version."lodash"."2.4.1" self.by-version."temp"."0.7.0" self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.5.1" - self.by-version."async"."0.2.10" - self.by-version."rc"."0.3.4" + self.by-version."async"."0.6.2" + self.by-version."rc"."0.3.5" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.3" self.by-version."passport"."0.2.0" - self.by-version."passport-local"."0.1.6" + self.by-version."passport-local"."1.0.0" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -18070,19 +18599,23 @@ self.by-version."keen.io"."0.0.4" self.by-version."getmac"."1.0.6" self.by-version."deep-extend"."0.2.8" - self.by-version."raven"."0.6.2" - self.by-version."knockout"."3.0.0" - self.by-version."npm-registry-client"."0.4.6" - self.by-version."npmconf"."0.1.13" + self.by-version."raven"."0.6.3" + self.by-version."knockout"."3.1.0" + self.by-version."npm-registry-client"."0.4.7" + self.by-version."npmconf"."0.1.14" self.by-version."mkdirp"."0.3.5" self.by-version."less"."1.7.0" - self.by-version."browserify"."3.32.1" + self.by-version."browserify"."3.38.1" + self.by-version."body-parser"."1.0.2" + self.by-version."cookie-parser"."1.0.1" + self.by-version."express-session"."1.0.3" + self.by-version."serve-static"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.7.2"; + "ungit" = self.by-version."ungit"."0.8.0"; by-spec."update-notifier"."~0.1.3" = self.by-version."update-notifier"."0.1.8"; by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -18108,6 +18641,26 @@ }; by-spec."update-notifier"."~0.1.7" = self.by-version."update-notifier"."0.1.8"; + by-spec."url"."~0.10.1" = + self.by-version."url"."0.10.1"; + by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "node-url-0.10.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/url/-/url-0.10.1.tgz"; + name = "url-0.10.1.tgz"; + sha1 = "d8eba8f267cec7645ddd93d2cdcf2320c876d25b"; + }) + ]; + buildInputs = + (self.nativeDeps."url" or []); + deps = [ + self.by-version."punycode"."1.2.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "url" ]; + }; by-spec."url"."~0.7.9" = self.by-version."url"."0.7.9"; by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage { @@ -18208,7 +18761,7 @@ ]; passthru.names = [ "util" ]; }; - by-spec."util"."~0.10.1" = + by-spec."util".">=0.10.3 <1" = self.by-version."util"."0.10.3"; by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage { name = "node-util-0.10.3"; @@ -18228,6 +18781,8 @@ ]; passthru.names = [ "util" ]; }; + by-spec."util"."~0.10.1" = + self.by-version."util"."0.10.3"; by-spec."util-extend"."^1.0.1" = self.by-version."util-extend"."1.0.1"; by-version."util-extend"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -18624,14 +19179,14 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.12" = - self.by-version."wd"."0.2.14"; - by-version."wd"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.14"; + self.by-version."wd"."0.2.19"; + by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.14.tgz"; - name = "wd-0.2.14.tgz"; - sha1 = "834dfc756e03a68013ff3a3f62aea0cb1302f879"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz"; + name = "wd-0.2.19.tgz"; + sha1 = "347ae75adebc15ad642baec118742344d749f169"; }) ]; buildInputs = @@ -18685,8 +19240,8 @@ self.by-version."adm-zip"."0.4.4" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.13" - self.by-version."phantomjs"."1.9.7-1" + self.by-version."npmconf"."0.1.14" + self.by-version."phantomjs"."1.9.7-4" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; @@ -18716,15 +19271,15 @@ }; by-spec."websocket-driver".">=0.3.1" = self.by-version."websocket-driver"."0.3.2"; - by-spec."when"."~2.8.0" = - self.by-version."when"."2.8.0"; - by-version."when"."2.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-when-2.8.0"; + by-spec."when"."~3.1.0" = + self.by-version."when"."3.1.0"; + by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-when-3.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/when/-/when-2.8.0.tgz"; - name = "when-2.8.0.tgz"; - sha1 = "a15eda8b6998ce74c6f4e220dbda18ce2ab3b026"; + url = "http://registry.npmjs.org/when/-/when-3.1.0.tgz"; + name = "when-3.1.0.tgz"; + sha1 = "a2479659ca15f725541ecf52ebae091b781ee134"; }) ]; buildInputs = @@ -18862,6 +19417,8 @@ }; by-spec."winston"."~0.7.2" = self.by-version."winston"."0.7.3"; + by-spec."winston"."~0.7.3" = + self.by-version."winston"."0.7.3"; by-spec."wiredep"."~1.0.0" = self.by-version."wiredep"."1.0.0"; by-version."wiredep"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -19007,6 +19564,25 @@ }; by-spec."wrench"."~1.5.4" = self.by-version."wrench"."1.5.8"; + by-spec."wru".">= 0.0.0" = + self.by-version."wru"."0.2.7"; + by-version."wru"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "wru-0.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wru/-/wru-0.2.7.tgz"; + name = "wru-0.2.7.tgz"; + sha1 = "f6fa4fc7d54f44bec19d55c66c4667078d73062d"; + }) + ]; + buildInputs = + (self.nativeDeps."wru" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "wru" ]; + }; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -19127,7 +19703,7 @@ (self.nativeDeps."xml2js" or []); deps = [ self.by-version."sax"."0.5.8" - self.by-version."xmlbuilder"."2.1.0" + self.by-version."xmlbuilder"."2.2.1" ]; peerDependencies = [ ]; @@ -19155,20 +19731,20 @@ passthru.names = [ "xmlbuilder" ]; }; by-spec."xmlbuilder".">=0.4.2" = - self.by-version."xmlbuilder"."2.1.0"; - by-version."xmlbuilder"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-xmlbuilder-2.1.0"; + self.by-version."xmlbuilder"."2.2.1"; + by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-xmlbuilder-2.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.1.0.tgz"; - name = "xmlbuilder-2.1.0.tgz"; - sha1 = "6ddae31683b6df12100b29fc8a0d4f46349abbed"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz"; + name = "xmlbuilder-2.2.1.tgz"; + sha1 = "9326430f130d87435d4c4086643aa2926e105a32"; }) ]; buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ - self.by-version."underscore"."1.6.0" + self.by-version."lodash-node"."2.4.1" ]; peerDependencies = [ ]; @@ -19305,7 +19881,7 @@ self.by-version."findup-sync"."0.1.3" self.by-version."chalk"."0.3.0" self.by-version."text-table"."0.2.0" - self.by-version."download"."0.1.12" + self.by-version."download"."0.1.16" self.by-version."request"."2.27.0" self.by-version."file-utils"."0.1.5" ]; @@ -19345,7 +19921,7 @@ self.by-version."findup-sync"."0.1.3" self.by-version."chalk"."0.4.0" self.by-version."text-table"."0.2.0" - self.by-version."download"."0.1.12" + self.by-version."download"."0.1.16" self.by-version."request"."2.30.0" self.by-version."file-utils"."0.1.5" self.by-version."class-extend"."0.1.1" @@ -19377,12 +19953,12 @@ self.by-version."async"."0.2.10" self.by-version."open"."0.0.4" self.by-version."chalk"."0.4.0" - self.by-version."findup"."0.1.4" + self.by-version."findup"."0.1.5" self.by-version."shelljs"."0.2.6" ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.13" - self.by-version."bower"."1.3.1" + self.by-version."bower"."1.3.2" ]; passthru.names = [ "yo" ]; }; @@ -19424,7 +20000,7 @@ buildInputs = (self.nativeDeps."zip-stream" or []); deps = [ - self.by-version."readable-stream"."1.0.26" + self.by-version."readable-stream"."1.0.27-1" self.by-version."lodash.defaults"."2.4.1" ]; peerDependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 025c636b7379..57eab330ce21 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -121,4 +121,13 @@ , "deepmerge" , "slasp" , "react" +, { "pure-css": "git://github.com/yui/pure.git#v0.5.0-rc-1" } +, "marked" +, "browserify" +, "uglify-js" +, "less" +, "mocha-phantomjs" +, "phantomjs" +, "sinon" +, "shelljs" ] diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a6bd4c82e6e0..9949682d337f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -206,6 +206,10 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.09.tar.gz; sha256 = "1cf8k5zjykdbc1mn8lixlkij6jklwn6divzyq2grycj3rpd36g5c"; }; + meta = { + description = "Module for manipulations of cpio archives"; + platforms = stdenv.lib.platforms.linux; + }; }; ArchiveZip = buildPerlPackage { @@ -2305,6 +2309,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08250.tar.gz; sha256 = "0nsqvj34klc9pf4l5kj3nqkq7agbsn11ys4115100awf7gxjbad6"; }; + patches = [ ../development/perl-modules/dbix-class-fix-tests.patch ]; buildInputs = [ DBDSQLite PackageStash TestException TestWarn TestDeep ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; meta = { @@ -3314,10 +3319,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsMakeMaker = buildPerlPackage rec{ - name = "ExtUtils-MakeMaker-6.84"; + name = "ExtUtils-MakeMaker-6.98"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1s3fn1fkm9l6pjhz7dbzsc6nhw1jm2hpf08fqhsqh1h50nj5pv5b"; + sha256 = "1vv3v9rc2dnx8amwa7lpdywg3lakx7yv2n38qvfbk9jzkqc27c1f"; }; propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta @@ -3667,11 +3672,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestScript ]; }; - FinanceQuote = buildPerlPackage { - name = "Finance-Quote-1.19"; + FinanceQuote = buildPerlPackage rec { + name = "Finance-Quote-1.29"; src = fetchurl { - url = mirror://sourceforge/finance-quote/1.19/Finance-Quote-1.19.tar.gz; - sha256 = "0z1dqxw4by7rkwm113qp2mlhl5r0znr22kzinvr1p82svn0zvm2d"; + url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; + sha256 = "0rx8whixbhwq2imd3ffx3vcqdgfbjj6y1s01m38b52x3bjn9hw0f"; }; propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ]; meta = { @@ -4390,17 +4395,19 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; - IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-1.81"; + IOSocketSSL = buildPerlPackage { + name = "IO-Socket-SSL-1.981"; src = fetchurl { - url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "1vg7jpn7vz3a2j3fxjjkaxiiqg7azqmy7afrpghiqkjcr8b6zs9y"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.981.tar.gz; + sha256 = "d78f3aac72888a350962c2da87b2b459513a175d7ac641cb1482bacbb81e76eb"; }; propagatedBuildInputs = [ URI NetSSLeay ]; meta = { + homepage = https://github.com/noxxi/p5-io-socket-ssl; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; license = "perl"; }; + doCheck = false; # tries to connect to facebook.com etc. }; IOString = buildPerlPackage rec { @@ -5135,6 +5142,23 @@ let self = _self // overrides; _self = with self; { }; }; + MHonArc = buildPerlPackage rec { + name = "MHonArc-2.6.18"; + + src = fetchurl { + url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/${name}.tar.gz"; + sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2"; + }; + propagatedBuildInputs = [ ]; + meta = with stdenv.lib; { + homepage = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html; + description = "A mail-to-HTML converter"; + maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; + }; + MIMEBase64 = buildPerlPackage rec { name = "MIME-Base64-3.14"; src = fetchurl { @@ -5190,6 +5214,20 @@ let self = _self // overrides; _self = with self; { }; }; + ModernPerl = buildPerlPackage { + name = "Modern-Perl-1.20140107"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20140107.tar.gz; + sha256 = "9cf66b2f93340dfe1cd7162262a47e7c4ba82475a52dc2a036c2fdc8a65298b8"; + }; + propagatedBuildInputs = [ perl ]; + meta = { + homepage = https://github.com/chromatic/Modern-Perl; + description = "Enable all of the features of Modern Perl with one import"; + license = "perl"; + }; + }; + ModuleBuild = buildPerlPackage { name = "Module-Build-0.4005"; src = fetchurl { @@ -7436,7 +7474,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48"; }; meta = { - homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; + #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; license = "perl"; }; @@ -9062,6 +9100,18 @@ let self = _self // overrides; _self = with self; { }; }; + TieHashIndexed = buildPerlPackage { + name = "Tie-Hash-Indexed-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz; + sha256 = "a8862a4763d58a8c785e34b8b18e5db4ce5c3e36b9b5cf565a3088584eab361e"; + }; + meta = { + description = "Ordered hashes for Perl"; + license = "perl"; + }; + }; + TieToObject = buildPerlPackage { name = "Tie-ToObject-0.03"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 654a071a182b..7ee050314049 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -32,4 +32,12 @@ let self = with self; { buildInputs = [ pkgs.cyrus_sasl ]; }; + + xdebug = buildPecl rec { + name = "xdebug-2.2.5"; + src = pkgs.fetchurl { + url = "http://pecl.php.net/get/${name}.tgz"; + sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; + }; + }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fe14a3bbe22..2f2d5f8d823a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -460,6 +460,15 @@ rec { }; }); + astroid = buildPythonPackage (rec { + name = "astroid-1.1.1"; + propagatedBuildInputs = [ logilab_common ]; + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz"; + sha256 = "1x7103mlzndgg66yas6xrfwkwpihcq4bi9m8py1fjnhz8p5ka1vq"; + }; + }); + autopep8 = buildPythonPackage (rec { name = "autopep8-1.0"; @@ -483,6 +492,36 @@ rec { }; }); + avro = buildPythonPackage (rec { + name = "avro-1.7.6"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz"; + md5 = "7f4893205e5ad69ac86f6b44efb7df72"; + }; + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = "https://pypi.python.org/pypi/avro/"; + }; + }); + + avro3k = pkgs.lowPrio (buildPythonPackage (rec { + name = "avro3k-1.7.7-SNAPSHOT"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz"; + sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; + }; + + doCheck = false; # No such file or directory: './run_tests.py + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = "https://pypi.python.org/pypi/avro3k/"; + }; + })); + backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec { name = "backports.ssl_match_hostname-3.4.0.2"; @@ -581,6 +620,34 @@ rec { }; + bedup = buildPythonPackage rec { + name = "bedup-20140206"; + + src = fetchgit { + url = "https://github.com/g2p/bedup.git"; + rev = "80cb217d4819a03e159e42850a9a3f14e2b278a3"; + sha256 = "1rik7a62v708ivfcy0pawhfnrb84b7gm3qr54x6jsxl0iqz078h6"; + }; + + buildInputs = [ pkgs.btrfsProgs ]; + propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy pyxdg pycparser cffi alembic ]; + + meta = { + description = "Deduplication for Btrfs"; + longDescription = '' + Deduplication for Btrfs. bedup looks for new and changed files, making sure that multiple + copies of identical files share space on disk. It integrates deeply with btrfs so that scans + are incremental and low-impact. + ''; + homepage = https://github.com/g2p/bedup; + license = stdenv.lib.licenses.gpl2; + + platforms = stdenv.lib.platforms.linux; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + }; + }; + beets = buildPythonPackage rec { name = "beets-1.0.0"; @@ -1142,6 +1209,15 @@ rec { }; + contextlib2 = buildPythonPackage rec { + name = "contextlib2-0.4.0"; + + src = fetchurl rec { + url = "https://pypi.python.org/packages/source/c/contextlib2/${name}.tar.gz"; + md5 = "ea687207db25f65552061db4a2c6727d"; + }; + }; + coverage = buildPythonPackage rec { name = "coverage-3.6"; @@ -1171,16 +1247,16 @@ rec { cython = buildPythonPackage rec { name = "Cython-0.20.1"; - + src = fetchurl { url = "http://www.cython.org/release/${name}.tar.gz"; sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i"; }; - + setupPyBuildFlags = ["--build-base=$out"]; - + buildInputs = [ pkgs.pkgconfig ]; - + meta = { description = "An interpreter to help writing C extensions for Python 2"; platforms = stdenv.lib.platforms.all; @@ -1312,6 +1388,7 @@ rec { ''; propagatedBuildInputs = [ py ] + ++ (optional isPy26 argparse) ++ stdenv.lib.optional pkgs.config.pythonPackages.pytest.selenium or false pythonPackages.selenium; @@ -1557,7 +1634,7 @@ rec { platforms = stdenv.lib.platforms.all; }; }; - + urllib3 = buildPythonPackage rec { name = "urllib3-1.8"; @@ -1565,11 +1642,11 @@ rec { url = "https://pypi.python.org/packages/source/u/urllib3/${name}.tar.gz"; sha256 = "0pdigfxkq8mhzxxsn6isx8c4h9azqywr1k18yanwyxyj8cdzm28s"; }; - + preConfigure = '' substituteInPlace test-requirements.txt --replace 'nose==1.3' 'nose' ''; - + checkPhase = '' nosetests --cover-min-percentage 70 ''; @@ -1583,7 +1660,7 @@ rec { }; }; - + dropbox = buildPythonPackage rec { name = "dropbox-2.0.0"; @@ -1843,6 +1920,20 @@ rec { }; }; + itsdangerous = buildPythonPackage rec { + name = "itsdangerous-0.24"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/i/itsdangerous/${name}.tar.gz"; + sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb"; + }; + + meta = with stdenv.lib; { + description = "helpers to pass trusted data to untrusted environments and back"; + homepage = "https://pypi.python.org/pypi/itsdangerous/"; + }; + }; + # TODO: this shouldn't use a buildPythonPackage koji = buildPythonPackage (rec { name = "koji-1.8"; @@ -1952,11 +2043,11 @@ rec { pyramid = buildPythonPackage rec { - name = "pyramid-1.4.5"; + name = "pyramid-1.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; - md5 = "321731aad69e9788b7819e257a50be1a"; + md5 = "8747658dcbab709a9c491e43d3b0d58b"; }; buildInputs = [ @@ -1968,8 +2059,6 @@ rec { ] ++ optional isPy26 unittest2; propagatedBuildInputs = [ - chameleon - Mako paste_deploy repoze_lru repoze_sphinx_autointerface @@ -2404,11 +2493,11 @@ rec { chameleon = buildPythonPackage rec { - name = "Chameleon-2.11"; + name = "Chameleon-2.15"; src = fetchurl { url = "http://pypi.python.org/packages/source/C/Chameleon/${name}.tar.gz"; - md5 = "df72458bf3dd26a744dcff5ad555c34b"; + md5 = "0214647152fcfcb9ce357624f8f9f203"; }; buildInputs = [] ++ optionals isPy26 [ ordereddict unittest2 ]; @@ -2505,11 +2594,11 @@ rec { django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.6"; + version = "1.6.3"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; - sha256 = "165bd5wmv2an9h365d12k0112z0l375dxsy7dlxa7r8kyg4gvnfk"; + sha256 = "1wdqb2x0w0c10annbyz7rrrgrv9mpa9f8pz8006lf2csix33r7bd"; }; # error: invalid command 'test' @@ -2523,11 +2612,11 @@ rec { django_1_5 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "07fp8ycx76q2nz96mxld1svvpfsrivjgpql0mr20r7gwzcfrrrka"; + sha256 = "1bxzz71sfvh0zgdzv4x3wdr4ffzd5cfnvq7iq2g1i282sacwnzwv"; }; # error: invalid command 'test' @@ -2541,11 +2630,11 @@ rec { django_1_4 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "1pi9mi14f19xlp29j2c8dz8rs749c1m41d9j1i0b3nlz0cy0h7rx"; + sha256 = "00f2jlls3fhddrg7q4sjkwj6dmclh28n0vqm1m7kzcq5fjrxh6a8"; }; # error: invalid command 'test' @@ -2855,11 +2944,11 @@ rec { flask = buildPythonPackage { - name = "flask-0.9"; + name = "flask-0.10.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.9.tar.gz"; - md5 = "4a89ef2b3ab0f151f781182bd0cc8933"; + url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.10.1.tar.gz"; + md5 = "378670fe456957eb3c27ddaef60b2b24"; }; propagatedBuildInputs = [ werkzeug jinja2 ]; @@ -3078,8 +3167,8 @@ rec { maintainers = [ maintainers.bjornfor ]; }; }; - - + + gevent-socketio = buildPythonPackage rec { name = "gevent-socketio-0.3.6"; @@ -3092,7 +3181,7 @@ rec { propagatedBuildInputs = [ gevent ]; }; - + gevent-websocket = buildPythonPackage rec { name = "gevent-websocket-0.9.3"; @@ -3208,6 +3297,24 @@ rec { propagatedBuildInputs = [ gdata hcs_utils keyring simplejson ]; }; + google_api_python_client = buildPythonPackage rec { + name = "google-api-python-client-1.2"; + + src = fetchurl { + url = "https://google-api-python-client.googlecode.com/files/google-api-python-client-1.2.tar.gz"; + sha256 = "0xd619w71xk4ldmikxqhaaqn985rc2hy4ljgwfp50jb39afg7crw"; + }; + + propagatedBuildInputs = [ httplib2 ]; + + meta = with stdenv.lib; { + description = "The core Python library for accessing Google APIs"; + homepage = "https://code.google.com/p/google-api-python-client/"; + license = licenses.asl20; + platforms = platforms.unix; + }; + }; + greenlet = buildPythonPackage rec { name = "greenlet-0.3.1"; @@ -3252,7 +3359,7 @@ rec { url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz"; md5 = "c7138b9ac7515a42066922d2b6120fbe"; }; - + buildInputs = [ pytest ]; meta = { @@ -4468,6 +4575,30 @@ rec { }; }; + livestreamer = if isPy34 then null else (buildPythonPackage { + #version = "1.8.0"; + name = "livestreamer-1.8.0"; + + src = fetchurl { + url = "https://github.com/chrippa/livestreamer/archive/v1.8.0.tar.gz"; + sha256 = "0fzpznbnhzrqawxdljvyml5251wbr3nifdrvnmh2b8vz356js4l8"; + }; + + buildInputs = [ pkgs.makeWrapper ]; + propagatedBuildInputs = [ requests ]; + postInstall = '' + wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin + ''; + + meta = { + homepage = http://livestreamer.tanuki.se; + description = '' + Livestreamer is CLI program that extracts streams from various + services and pipes them into a video player of choice. + ''; + license = "bsd"; + }; + }); oauth2 = buildPythonPackage (rec { name = "oauth2-1.5.211"; @@ -5051,12 +5182,9 @@ rec { meta = { description = "ASN.1 tools for Python"; - homepage = http://pyasn1.sourceforge.net/; - license = "mBSD"; - - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }); @@ -5159,6 +5287,29 @@ rec { }; }; + pycapnp = buildPythonPackage rec { + name = "pycapnp-0.4.4"; + homepage = "http://jparyani.github.io/pycapnp/index.html"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pycapnp/${name}.tar.gz"; + sha256 = "33b2b79438bb9bf37097966e1c90403c34ab49be1eb647ee251b62f362ee3537"; + }; + + buildInputs = with pkgs; [ capnproto cython ]; + + # import setuptools as soon as possible, to minimize monkeypatching mayhem. + postConfigure = '' + sed -i '2iimport setuptools' setup.py + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ cstrahan ]; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + }; + }; + pycryptopp = buildPythonPackage (rec { name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958"; @@ -5658,7 +5809,6 @@ rec { }; }; - pyopengl = let version = "3.0.2"; in @@ -5707,6 +5857,23 @@ rec { propagatedBuildInputs = [ cssselect lxml ]; }; + pyrax = buildPythonPackage rec { + name = "pyrax-1.7.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyrax/${name}.tar.gz"; + sha256 = "1br2kspw0sn7xgkk7z93h72s2v3qm88jvi4213zgz90jhzjj42bv"; + }; + + meta = { + homepage = "https://github.com/rackspace/pyrax"; + license = "MIT"; + description = "Python API to interface with Rackspace"; + }; + + doCheck = false; + }; + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; @@ -5917,7 +6084,7 @@ rec { }; buildInputs = with pkgs; [ - pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkit_gtk2 icu + pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkitgtk2 icu ]; meta = { @@ -6017,8 +6184,8 @@ rec { homepage = http://docs.python-requests.org/en/latest/; }; }; - - + + requests2 = buildPythonPackage rec { name = "requests-2.2.1"; @@ -6082,6 +6249,23 @@ rec { }; }; + redis = buildPythonPackage rec { + name = "redis-2.9.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/redis/${name}.tar.gz"; + sha256 = "1r7lrh4kxccyhr4pyp13ilymmvh22pi7aa9514dmnhi74zn4g5xg"; + }; + + doCheck = false; + + meta = { + description = "Python client for Redis key-value store"; + homepage = "https://pypi.python.org/pypi/redis/"; + }; + }; + + requests_oauth2 = buildPythonPackage rec { name = "requests-oauth2-0.1.1"; @@ -6560,6 +6744,34 @@ rec { }; }; + shapely = buildPythonPackage rec { + name = "Shapely-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/S/Shapely/${name}.tar.gz"; + sha256 = "099sc7ajpp6hbgrx3c0bl6hhkz1mhnr0ahvc7s4i3f3b7q1zfn7l"; + }; + + buildInputs = [ pkgs.geos ]; + + preConfigure = '' + export LANG="en_US.UTF-8"; + '' + stdenv.lib.optionalString stdenv.isLinux '' + export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"; + ''; + + patchPhase = '' + sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${pkgs.geos}/lib/libgeos_c.so'])|" shapely/geos.py + ''; + + doCheck = false; # won't suceed for unknown reasons that look harmless, though + + meta = with stdenv.lib; { + description = "Geometric objects, predicates, and operations"; + homepage = "https://pypi.python.org/pypi/Shapely/"; + }; + }; + pydns = buildPythonPackage rec { name = "pydns-2.3.6"; @@ -6919,7 +7131,7 @@ rec { md5 = "ecf0738eaf1229bae27ad2be0f9978a8"; }; }); - + sqlalchemy9 = buildPythonPackage rec { name = "SQLAlchemy-0.9.3"; @@ -6933,7 +7145,7 @@ rec { propagatedBuildInputs = [ modules.sqlite3 ]; checkPhase = '' - ${python.executable} sqla_nose.py + ${python.executable} sqla_nose.py ''; meta = { @@ -6958,7 +7170,7 @@ rec { checkPhase = '' cd tests - export LD_LIBRARY_PATH=${pkgs.imagemagick}/lib + export MAGICK_HOME="${pkgs.imagemagick}" export PYTHONPATH=$PYTHONPATH:../ py.test cd .. @@ -7624,13 +7836,17 @@ rec { werkzeug = buildPythonPackage { - name = "werkzeug-0.8.3"; + name = "werkzeug-0.9.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.3.tar.gz"; - md5 = "12aa03e302ce49da98703938f257347a"; + url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.9.4.tar.gz"; + md5 = "670fad41f57c13b71a6816765765a3dd"; }; + propagatedBuildInputs = [ itsdangerous ]; + + doCheck = false; # tests fail, not sure why + meta = { homepage = http://werkzeug.pocoo.org/; description = "A WSGI utility library for Python"; @@ -8564,6 +8780,51 @@ rec { }; }; + + pyusb = buildPythonPackage rec { + name = "pyusb-1.0.0b1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz"; + md5 = "5cc9c7dd77b4d12fcc22fee3b39844bc"; + }; + + # Fix the USB backend library lookup + postPatch = '' + libusb=${pkgs.libusb1}/lib/libusb-1.0.so + test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py + ''; + + meta = with stdenv.lib; { + description = "Python USB access module (wraps libusb 1.0)"; # can use other backends + homepage = http://pyusb.sourceforge.net/; + license = "BSD"; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + + usbtmc = buildPythonPackage rec { + name = "usbtmc-${version}"; + version = "0.5"; + + src = fetchurl { + url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; + sha256 = "0xn8whjcdn8wgs9j1gj7sw7fh425akdmq3hi448m36fywldbhryg"; + }; + + propagatedBuildInputs = [ pyusb ]; + + meta = { + description = "Python implementation of the USBTMC instrument control protocol"; + homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; + license = licenses.mit; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + txamqp = buildPythonPackage rec { name = "txamqp-${version}"; version = "0.3"; @@ -8581,7 +8842,7 @@ rec { maintainers = [ stdenv.lib.maintainers.rickynils ]; }; }; - + versiontools = buildPythonPackage rec { name = "versiontools-1.9.1"; @@ -8774,11 +9035,11 @@ rec { libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0fccpyppz79kbbnzwdgsiza3cxq7jlnnp1dqi33gc4305dk9vmwl"; + sha256 = "0zi1mxjcv9dz5hy54lwgk9j4i8r20hhijbxxn843h2w7p1ch1wx2"; }; buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ]; diff --git a/pkgs/top-level/r-packages.nix b/pkgs/top-level/r-packages.nix deleted file mode 100644 index f3759c14baac..000000000000 --- a/pkgs/top-level/r-packages.nix +++ /dev/null @@ -1,244 +0,0 @@ -/* This file defines the composition for CRAN (R) packages. */ - -{pkgs, overrides}: - -let self = _self // overrides; _self = with self; { - - inherit (pkgs) buildRPackage fetchurl stdenv R; - - inherit (stdenv.lib) maintainers; - - abind = buildRPackage rec { - name = "abind-1.4-0"; - src = fetchurl { - url = "mirror://cran/src/contrib/abind_1.4-0.tar.gz"; - sha256 = "1b9634bf6ad68022338d71a23a689f1af4afd9d6c12c0b982b88fc21363ff568"; - }; - }; - - chron = buildRPackage rec { - name = "chron-2.3-44"; - src = fetchurl { - url = "mirror://cran/src/contrib/chron_2.3-44.tar.gz"; - sha256 = "ba7d46223e615b4d09145a364a4c37ccff718384486ca154a6e025cf3ed91148"; - }; - }; - - colorspace = buildRPackage rec { - name = "colorspace-1.2-2"; - src = fetchurl { - url = "mirror://cran/src/contrib/colorspace_1.2-2.tar.gz"; - sha256 = "7f6ca98e5d005bc7d6e37b03577d65995809150d1d293ce68b6720e7a6b2054d"; - }; - }; - - DBI = buildRPackage rec { - name = "DBI-0.2-7"; - src = fetchurl { - url = "mirror://cran/src/contrib/DBI_0.2-7.tar.gz"; - sha256 = "e90a988740f99060d5c4aacb1f2b148b0eb81c5b468bafeadf3aaeccf563b5e3"; - }; - }; - - dichromat = buildRPackage rec { - name = "dichromat-2.0-0"; - src = fetchurl { - url = "mirror://cran/src/contrib/dichromat_2.0-0.tar.gz"; - sha256 = "31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1"; - }; - }; - - digest = buildRPackage rec { - name = "digest-0.6.3"; - src = fetchurl { - url = "mirror://cran/src/contrib/digest_0.6.3.tar.gz"; - sha256 = "5be8f1386c0c273fcc915df7b557393c5f3de43c44fd16614db9cc5ba6d1d57c"; - }; - }; - - ggplot2 = buildRPackage rec { - name = "ggplot2-0.9.3.1"; - src = fetchurl { - url = "mirror://cran/src/contrib/ggplot2_0.9.3.1.tar.gz"; - sha256 = "b4c97404fd44571f9980712af963949ed204b5d4e639d97df9ba9a17423a6601"; - }; - propagatedBuildInputs = [ digest plyr gtable reshape2 scales proto ]; - }; - - gtable = buildRPackage rec { - name = "gtable-0.1.2"; - src = fetchurl { - url = "mirror://cran/src/contrib/gtable_0.1.2.tar.gz"; - sha256 = "b08ba8e62e0ce05e7a4c07ba3ffa67719161db62438b04f14343f8928d74304d"; - }; - }; - - gtools = buildRPackage rec { - name = "gtools-3.0.0"; - src = fetchurl { - url = "mirror://cran/src/contrib/gtools_3.0.0.tar.gz"; - sha256 = "e35f08ac9df875b57dcf23028baa226372d7482d7814a011f9b1fdd0697ee73c"; - }; - }; - - gsubfn = buildRPackage rec { - name = "gsubfn-0.6-5"; - src = fetchurl { - url = "mirror://cran/src/contrib/gsubfn_0.6-5.tar.gz"; - sha256 = "9a7b51ae6aabd1c99e8633d3dc75232d8c4a175df750c7d1c359bd0f5fc197be"; - }; - propagatedBuildInputs = [ proto ]; - }; - - labeling = buildRPackage rec { - name = "labeling-0.2"; - src = fetchurl { - url = "mirror://cran/src/contrib/labeling_0.2.tar.gz"; - sha256 = "8aaa7f8b91923088da4e47ae42620fadcff7f2bc566064c63d138e2145e38aa4"; - }; - }; - - lars = buildRPackage rec { - name = "lars-1.2"; - src = fetchurl { - url = "mirror://cran/src/contrib/lars_1.2.tar.gz"; - sha256 = "64745b568f20b2cfdae3dad02fba92ebf78ffee466a71aaaafd4f48c3921922e"; - }; - }; - - LiblineaR = buildRPackage rec { - name = "LiblineaR-1.80-7"; - src = fetchurl { - url = "mirror://cran/src/contrib/LiblineaR_1.80-7.tar.gz"; - sha256 = "9ba0280c5165bf0bbd46cb5ec7c66fdece38fc3f73fce2ec800763923ae8e4bd"; - }; - }; - - linprog = buildRPackage rec { - name = "linprog-0.9-2"; - src = fetchurl { - url = "mirror://cran/src/contrib/linprog_0.9-2.tar.gz"; - sha256 = "8937b2e30692e38de1713f1513b78f505f73da6f5b4a576d151ad60bac2221ce"; - }; - propagatedBuildInputs = [ lpSolve ]; - }; - - lpSolve = buildRPackage rec { - name = "lpSolve-5.6.7"; - src = fetchurl { - url = "mirror://cran/src/contrib/lpSolve_5.6.7.tar.gz"; - sha256 = "16def9237f38c4d7a59651173fd87df3cd3c563f640c6952e13bdd2a084737ef"; - }; - }; - - munsell = buildRPackage rec { - name = "munsell-0.4.2"; - src = fetchurl { - url = "mirror://cran/src/contrib/munsell_0.4.2.tar.gz"; - sha256 = "84e787f58f626c52a1e3fc1201f724835dfa8023358bfed742e7001441f425ae"; - }; - propagatedBuildInputs = [ colorspace ]; - }; - - pamr = buildRPackage rec { - name = "pamr-1.54.1"; - src = fetchurl { - url = "mirror://cran/src/contrib/pamr_1.54.1.tar.gz"; - sha256 = "139dbc39b4eccd6a55b6a3c42a1c8be61dcce0613535a634c3e42731fc315516"; - }; - }; - - penalized = buildRPackage rec { - name = "penalized-0.9-42"; - src = fetchurl { - url = "mirror://cran/src/contrib/penalized_0.9-42.tar.gz"; - sha256 = "98e8e39b02ecbabaa7050211e34941c73e1e687f39250cf3cbacb7c5dcbb1e98"; - }; - }; - - plyr = buildRPackage rec { - name = "plyr-1.8"; - src = fetchurl { - url = "mirror://cran/src/contrib/plyr_1.8.tar.gz"; - sha256 = "0bd6861af241e6c5ce777ef3f1b0eb72b31cc026669a68f6250b8ecfadf71a66"; - }; - }; - - proto = buildRPackage rec { - name = "proto-0.3-10"; - src = fetchurl { - url = "mirror://cran/src/contrib/proto_0.3-10.tar.gz"; - sha256 = "d0d941bfbf247879b3510c8ef3e35853b1fbe83ff3ce952e93d3f8244afcbb0e"; - }; - }; - - randomForest = buildRPackage rec { - name = "randomForest-4.6-7"; - src = fetchurl { - url = "mirror://cran/src/contrib/randomForest_4.6-7.tar.gz"; - sha256 = "8206e88b242c07efc10f148d17dfcc265a31361e1bcf44bfe17aed95c357be0b"; - }; - propagatedBuildInputs = [ plyr stringr ]; - }; - - reshape2 = buildRPackage rec { - name = "reshape2-1.2.2"; - src = fetchurl { - url = "mirror://cran/src/contrib/reshape2_1.2.2.tar.gz"; - sha256 = "9131025b8f684e1629ab3e2748d4cf2b907b7c89cfbff667c925bc0fb5dfc103"; - }; - propagatedBuildInputs = [ plyr stringr ]; - }; - - RColorBrewer = buildRPackage rec { - name = "RColorBrewer-1.0-5"; - src = fetchurl { - url = "mirror://cran/src/contrib/RColorBrewer_1.0-5.tar.gz"; - sha256 = "5ac1c44c1a53f9521134e7ed7c148c72e49271cbd229c5263d2d7fd91c8b8e78"; - }; - }; - - RSQLite = buildRPackage rec { - name = "RSQlite-0.11.4"; - src = fetchurl { - url = "mirror://cran/src/contrib/RSQLite_0.11.4.tar.gz"; - sha256 = "bba0cbf2a1a3120d667a731da1ca5b9bd4db23b813e1abf6f51fb01540c2000c"; - }; - propagatedBuildInputs = [ DBI ]; - }; - - RSQLiteExtfuns = buildRPackage rec { - name = "RSQlite.extfuns-0.0.1"; - src = fetchurl { - url = "mirror://cran/src/contrib/RSQLite.extfuns_0.0.1.tar.gz"; - sha256 = "ca5c7947c041e17ba83bed3f5866f7eeb9b7f361e5c050c9b58eec5670f03d0e"; - }; - propagatedBuildInputs = [ RSQLite ]; - }; - - scales = buildRPackage rec { - name = "scales-0.2.3"; - src = fetchurl { - url = "mirror://cran/src/contrib/scales_0.2.3.tar.gz"; - sha256 = "46aef8eb261abc39f87b71184e5484bc8c2c94e01d3714ce4b2fd60727bc40d9"; - }; - propagatedBuildInputs = [ RColorBrewer stringr dichromat munsell plyr labeling ]; - }; - - stringr = buildRPackage rec { - name = "stringr-0.6.2"; - src = fetchurl { - url = "mirror://cran/src/contrib/stringr_0.6.2.tar.gz"; - sha256 = "c3fc9c71d060ad592d2cfc51c36ab2f8e5f8cf9a25dfe42c637447dd416b6737"; - }; - }; - - sqldf = buildRPackage rec { - name = "sqldf-0.4-6.4"; - src = fetchurl { - url = "mirror://cran/src/contrib/sqldf_0.4-6.4.tar.gz"; - sha256 = "6c51e4e48b93310f765c661a1756fe068629da775248d38a98c38f5b6f7511c4"; - }; - propagatedBuildInputs = [ DBI gsubfn proto chron RSQLite RSQLiteExtfuns ]; - }; -}; in self diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 6871567ca8d1..cef3d2dffbdb 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -140,11 +140,11 @@ in { crossUltraSparcLinux = mapTestOnCross crossSystem basic; }) // ( -/* Test some cross builds on mingw32 */ +/* Test some cross builds on 32 bit mingw-w64 */ let crossSystem = { - config = "i686-pc-mingw32"; - arch = "x86"; + config = "i686-w64-mingw32"; + arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; @@ -161,11 +161,10 @@ in { }; }) // ( -/* Test some cross builds on mingw-w64 */ +/* Test some cross builds on 64 bit mingw-w64 */ let crossSystem = { - # That's the triplet they use in the mingw-w64 docs, - # and it's relevant for nixpkgs conditions. + # That's the triplet they use in the mingw-w64 docs. config = "x86_64-w64-mingw32"; arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 8eb08d259834..dfdbb1db8bdf 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1724,7 +1724,6 @@ let wavesurfer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cb22983e6c37..fd990ebf17eb 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -311,7 +311,6 @@ let vice = linux; vim = linux; vimHugeX = linux; - VisualBoyAdvance = linux; vncrec = linux; vorbisTools = linux; vpnc = linux; @@ -333,7 +332,6 @@ let xineUI = linux; xkeyboard_config = linux; xlockmore = linux; - xmltv = linux; xpdf = linux; xscreensaver = linux; xsel = linux; @@ -423,7 +421,9 @@ let xf86videointel = linux; xf86videonv = linux; xf86videovesa = linux; + xf86videovmware = linux; xfs = linux; + xinput = linux; xkbcomp = linux; xlsclients = linux; xmessage = linux; |