diff options
930 files changed, 36980 insertions, 12153 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index f16043cf9a3e..960eebfc79b5 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -105,6 +105,7 @@ rec { let f = if builtins.isFunction fn then fn else import fn; in makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) autoArgs) // args); + /* Add attributes to each output of a derivation without changing the derivation itself */ addPassthru = drv: passthru: let @@ -122,4 +123,38 @@ rec { outputsList = map outputToAttrListElement outputs; in commonAttrs.${drv.outputName}; + + + /* Strip a derivation of all non-essential attributes, returning + only those needed by hydra-eval-jobs. Also strictly evaluate the + result to ensure that there are no thunks kept alive to prevent + garbage collection. */ + hydraJob = drv: + let + outputs = drv.outputs or ["out"]; + + commonAttrs = + { inherit (drv) name system meta; inherit outputs; } + // lib.optionalAttrs (drv._hydraAggregate or false) { + _hydraAggregate = true; + constituents = map hydraJob (lib.flatten drv.constituents); + } + // (lib.listToAttrs outputsList); + + makeOutput = outputName: + let output = drv.${outputName}; in + { name = outputName; + value = commonAttrs // { + outPath = output.outPath; + drvPath = output.drvPath; + type = "derivation"; + inherit outputName; + }; + }; + + outputsList = map makeOutput outputs; + + drv' = (lib.head outputsList).value; + in lib.deepSeq drv' drv'; + } diff --git a/lib/licenses.nix b/lib/licenses.nix index 9b3acf8653b6..d4810d412b1d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -100,6 +100,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Creative Commons Attribution 4.0"; }; + cc-by-sa-40 = spdx { + spdxId = "CC-BY-SA-4.0"; + fullName = "Creative Commons Attribution Share Alike 4.0"; + }; + cddl = spdx { spdxId = "CDDL-1.0"; fullName = "Common Development and Distribution License 1.0"; diff --git a/lib/lists.nix b/lib/lists.nix index d57c4893daa8..fa8cbddfd943 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -233,4 +233,9 @@ rec { xs = unique (drop 1 list); in [x] ++ remove x xs; + # Intersects list 'e' and another list + intersectLists = e: filter (x: elem x e); + + # Subtracts list 'e' from another list + subtractLists = e: filter (x: !(elem x e)); } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index dc97f7e456a9..358cbda44e47 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -78,18 +78,24 @@ fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>"; garbas = "Rok Garbas <rok@garbas.si>"; + garrison = "Jim Garrison <jim@garrison.cc>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; + gebner = "Gabriel Ebner <gebner@gebner.org>"; + giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; + globin = "Robin Gloster <robin@glob.in>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; gridaphobe = "Eric Seidel <eric@seidel.io>"; guibert = "David Guibert <david.guibert@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; hinton = "Tom Hinton <t@larkery.com>"; hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>"; + iand675 = "Ian Duncan <ian@iankduncan.com>"; ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; iElectric = "Domen Kozar <domen@dev.si>"; iyzsong = "Song Wenwu <iyzsong@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; + jb55 = "William Casarin <bill@casarin.me>"; jcumming = "Jack Cummings <jack@mudshark.org>"; jgeerds = "Jascha Geerds <jg@ekby.de>"; jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>"; @@ -130,13 +136,16 @@ notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>"; nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>"; + obadz = "obadz <dav-nixos@odav.org>"; ocharles = "Oliver Charles <ollie@ocharles.org.uk>"; offline = "Jaka Hudoklin <jakahudoklin@gmail.com>"; olcai = "Erik Timan <dev@timan.info>"; orbitz = "Malcolm Matalka <mmatalka@gmail.com>"; page = "Carles Pagès <page@cubata.homelinux.net>"; paholg = "Paho Lurie-Gregg <paho@paholg.com>"; + pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>"; pashev = "Igor Pashev <pashev.igor@gmail.com>"; + phausmann = "Philipp Hausmann <nix@314.ch>"; phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>"; pierron = "Nicolas B. Pierron <nixos@nbp.name>"; piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>"; @@ -163,11 +172,13 @@ rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>"; rycee = "Robert Helgesson <robert@rycee.net>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; + schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>"; schristo = "Scott Christopher <schristopher@konputa.com>"; sepi = "Raffael Mancini <raffael@mancini.lu>"; shell = "Shell Turner <cam.turn@gmail.com>"; shlevy = "Shea Levy <shea@shealevy.com>"; simons = "Peter Simons <simons@cryp.to>"; + sjagoe = "Simon Jagoe <simon@simonjagoe.com>"; sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>"; skeidel = "Sven Keidel <svenkeidel@gmail.com>"; smironov = "Sergey Mironov <ierton@gmail.com>"; @@ -180,6 +191,7 @@ thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; + trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>"; tstrobel = "Thomas Strobel <ts468@cam.ac.uk>"; ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; tv = "Tomislav Viljetić <tv@shackspace.de>"; diff --git a/lib/strings.nix b/lib/strings.nix index 56d990de62da..39112407c570 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -208,4 +208,15 @@ rec { # standard GNU Autoconf scripts. enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}"; + # Create a fixed width string with additional prefix to match required width + fixedWidthString = width: filler: str: + let + strw = lib.stringLength str; + reqWidth = width - (lib.stringLength filler); + in + assert strw <= width; + if strw == width then str else filler + fixedWidthString reqWidth filler str; + + # Format a number adding leading zeroes up to fixed width + fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); } diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh new file mode 100755 index 000000000000..58231a356369 --- /dev/null +++ b/lib/tests/modules.sh @@ -0,0 +1,94 @@ +#!/bin/sh +# +# This script is used to test that the module system is working as expected. +# By default it test the version of nixpkgs which is defined in the NIX_PATH. + +cd ./modules + +pass=0 +fail=0 + +evalConfig() { + local attr=$1 + shift; + local script="import ./default.nix { modules = [ $@ ];}" + nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only +} + +reportFailure() { + local attr=$1 + shift; + local script="import ./default.nix { modules = [ $@ ];}" + echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only" + evalConfig "$attr" "$@" + fail=$((fail + 1)) +} + +checkConfigOutput() { + local outputContains=$1 + shift; + if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then + pass=$((pass + 1)) + return 0; + else + echo 2>&1 "error: Expected result matching '$outputContains', while evaluating" + reportFailure "$@" + return 1 + fi +} + +checkConfigError() { + local errorContains=$1 + local err="" + shift; + if err==$(evalConfig "$@" 2>&1 >/dev/null); then + echo 2>&1 "error: Expected error code, got exit code 0, while evaluating" + reportFailure "$@" + return 1 + else + if echo "$err" | grep --silent "$errorContains" ; then + pass=$((pass + 1)) + return 0; + else + echo 2>&1 "error: Expected error matching '$errorContains', while evaluating" + reportFailure "$@" + return 1 + fi + fi +} + +checkConfigOutput "false" config.enable ./declare-enable.nix +checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix +set -- config.enable ./declare-enable.nix ./define-enable.nix +checkConfigOutput "true" "$@" +checkConfigOutput "false" "$@" ./define-force-enable.nix +checkConfigOutput "false" "$@" ./define-enable-force.nix + +checkConfigError 'attribute .*foo.* .* not found' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix +checkConfigOutput 'false' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix +set -- config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo-enable.nix +checkConfigOutput 'true' "$@" +checkConfigOutput 'false' "$@" ./define-force-loaOfSub-foo-enable.nix +checkConfigOutput 'false' "$@" ./define-loaOfSub-force-foo-enable.nix +checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-force-enable.nix +checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-enable-force.nix + +checkConfigError 'attribute .*bar.* .* not found' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix +checkConfigOutput 'false' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar.nix +set -- config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar-enable.nix +checkConfigOutput 'true' "$@" +checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-force-loaOfSub-foo-enable.nix +checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-loaOfSub-force-foo-enable.nix +checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-force-enable.nix +checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-enable-force.nix + +cat <<EOF +====== module tests ====== +$pass Pass +$fail Fail +EOF + +if test $fail -ne 0; then + exit 1 +fi +exit 0 diff --git a/lib/tests/modules/declare-enable.nix b/lib/tests/modules/declare-enable.nix new file mode 100644 index 000000000000..ebee243c7568 --- /dev/null +++ b/lib/tests/modules/declare-enable.nix @@ -0,0 +1,14 @@ +{ lib, ... }: + +{ + options = { + enable = lib.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = '' + Some descriptive text + ''; + }; + }; +} diff --git a/lib/tests/modules/declare-loaOfSub-any-enable.nix b/lib/tests/modules/declare-loaOfSub-any-enable.nix new file mode 100644 index 000000000000..71dad1c91359 --- /dev/null +++ b/lib/tests/modules/declare-loaOfSub-any-enable.nix @@ -0,0 +1,29 @@ +{ lib, ... }: + +let + submod = { ... }: { + options = { + enable = lib.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = '' + Some descriptive text + ''; + }; + }; + }; +in + +{ + options = { + loaOfSub = lib.mkOption { + default = {}; + example = {}; + type = lib.types.loaOf (lib.types.submodule [ submod ]); + description = '' + Some descriptive text + ''; + }; + }; +} diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix new file mode 100644 index 000000000000..5df7d9751eab --- /dev/null +++ b/lib/tests/modules/default.nix @@ -0,0 +1,7 @@ +{ lib ? import <nixpkgs/lib>, modules ? [] }: + +{ + inherit (lib.evalModules { + inherit modules; + }) config options; +} diff --git a/lib/tests/modules/define-enable-force.nix b/lib/tests/modules/define-enable-force.nix new file mode 100644 index 000000000000..f4990a328631 --- /dev/null +++ b/lib/tests/modules/define-enable-force.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + enable = lib.mkForce false; +} diff --git a/lib/tests/modules/define-enable.nix b/lib/tests/modules/define-enable.nix new file mode 100644 index 000000000000..7dc26010ae59 --- /dev/null +++ b/lib/tests/modules/define-enable.nix @@ -0,0 +1,3 @@ +{ + enable = true; +} diff --git a/lib/tests/modules/define-force-enable.nix b/lib/tests/modules/define-force-enable.nix new file mode 100644 index 000000000000..978caa2a8c07 --- /dev/null +++ b/lib/tests/modules/define-force-enable.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +lib.mkForce { + enable = false; +} diff --git a/lib/tests/modules/define-force-loaOfSub-foo-enable.nix b/lib/tests/modules/define-force-loaOfSub-foo-enable.nix new file mode 100644 index 000000000000..bfd8e084b590 --- /dev/null +++ b/lib/tests/modules/define-force-loaOfSub-foo-enable.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +lib.mkForce { + loaOfSub.foo.enable = false; +} diff --git a/lib/tests/modules/define-loaOfSub-bar-enable.nix b/lib/tests/modules/define-loaOfSub-bar-enable.nix new file mode 100644 index 000000000000..422bb0a600bf --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-bar-enable.nix @@ -0,0 +1,3 @@ +{ + loaOfSub.bar.enable = true; +} diff --git a/lib/tests/modules/define-loaOfSub-bar.nix b/lib/tests/modules/define-loaOfSub-bar.nix new file mode 100644 index 000000000000..c24315e09b6e --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-bar.nix @@ -0,0 +1,3 @@ +{ + loaOfSub.bar = {}; +} diff --git a/lib/tests/modules/define-loaOfSub-foo-enable-force.nix b/lib/tests/modules/define-loaOfSub-foo-enable-force.nix new file mode 100644 index 000000000000..c1d7b198be54 --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-foo-enable-force.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + loaOfSub.foo.enable = lib.mkForce false; +} diff --git a/lib/tests/modules/define-loaOfSub-foo-enable.nix b/lib/tests/modules/define-loaOfSub-foo-enable.nix new file mode 100644 index 000000000000..822425c71bb9 --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-foo-enable.nix @@ -0,0 +1,3 @@ +{ + loaOfSub.foo.enable = true; +} diff --git a/lib/tests/modules/define-loaOfSub-foo-force-enable.nix b/lib/tests/modules/define-loaOfSub-foo-force-enable.nix new file mode 100644 index 000000000000..dce0ef547b31 --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-foo-force-enable.nix @@ -0,0 +1,7 @@ +{ lib, ... }: + +{ + loaOfSub.foo = lib.mkForce { + enable = false; + }; +} diff --git a/lib/tests/modules/define-loaOfSub-foo.nix b/lib/tests/modules/define-loaOfSub-foo.nix new file mode 100644 index 000000000000..e9b2e631f2ec --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-foo.nix @@ -0,0 +1,3 @@ +{ + loaOfSub.foo = {}; +} diff --git a/lib/tests/modules/define-loaOfSub-force-foo-enable.nix b/lib/tests/modules/define-loaOfSub-force-foo-enable.nix new file mode 100644 index 000000000000..df5722274ee5 --- /dev/null +++ b/lib/tests/modules/define-loaOfSub-force-foo-enable.nix @@ -0,0 +1,7 @@ +{ lib, ... }: + +{ + loaOfSub = lib.mkForce { + foo.enable = false; + }; +} diff --git a/lib/tests/release.nix b/lib/tests/release.nix new file mode 100644 index 000000000000..e7fb52f67665 --- /dev/null +++ b/lib/tests/release.nix @@ -0,0 +1,31 @@ +{ nixpkgs }: + +with import ./../.. { }; +with lib; + +stdenv.mkDerivation { + name = "nixpkgs-lib-tests"; + buildInputs = [ nix ]; + NIX_PATH="nixpkgs=${nixpkgs}"; + + buildCommand = '' + datadir="${nix}/share" + export TEST_ROOT=$(pwd)/test-tmp + export NIX_STORE_DIR=$TEST_ROOT/store + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_DB_DIR=$TEST_ROOT/db + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests + export NIX_BUILD_HOOK= + export PAGER=cat + cacheDir=$TEST_ROOT/binary-cache + nix-store --init + + cd ${nixpkgs}/lib/tests + ./modules.sh + + touch $out + ''; +} diff --git a/lib/trivial.nix b/lib/trivial.nix index ed59eff48473..8addde1b86cd 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,8 +1,3 @@ -with { - inherit (import ./lists.nix) deepSeqList; - inherit (import ./attrsets.nix) deepSeqAttrs; -}; - rec { # Identity function. @@ -23,23 +18,11 @@ rec { # Flip the order of the arguments of a binary function. flip = f: a: b: f b a; - # `seq x y' evaluates x, then returns y. That is, it forces strict - # evaluation of its first argument. - seq = x: y: if x == null then y else y; - - # Like `seq', but recurses into lists and attribute sets to force evaluation - # of all list elements/attributes. - deepSeq = x: y: - if builtins.isList x - then deepSeqList x y - else if builtins.isAttrs x - then deepSeqAttrs x y - else seq x y; - # Pull in some builtins not included elsewhere. inherit (builtins) pathExists readFile isBool isFunction - isInt add sub lessThan; + isInt add sub lessThan + seq deepSeq; # Return the Nixpkgs version number. nixpkgsVersion = diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 9efadab18c01..3c3f9151d837 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -33,8 +33,8 @@ elif [[ $1 == build ]]; then echo "=== Checking PR" nox-review pr ${TRAVIS_PULL_REQUEST} fi - echo "=== Checking tarball creation" - nix-build pkgs/top-level/release.nix -A tarball + # echo "=== Checking tarball creation" + # nix-build pkgs/top-level/release.nix -A tarball else echo "$0: Unknown option $1" >&2 false diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 177ebdd8db17..228c45b0c1fe 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -49,4 +49,8 @@ on container networking.)</para> switch</literal>. Note that this will not delete the root directory of the container in <literal>/var/lib/containers</literal>.</para> -</section> \ No newline at end of file +<para>Declarative containers can be started and stopped using the +corresponding systemd service, e.g. <literal>systemctl start +container@database</literal>.</para> + +</section> diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 2a58ff25941c..b613c7f06cc8 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -68,7 +68,7 @@ instance, if you try to define an option that doesn’t exist (that is, doesn’t have a corresponding <emphasis>option declaration</emphasis>), <command>nixos-rebuild</command> will give an error like: <screen> -The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist. +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. </screen> Likewise, values in option definitions must have a correct type. For instance, <option>services.httpd.enable</option> must be a Boolean diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index ceac40b7a1f6..b7e47b8729f3 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -10,7 +10,7 @@ use NetworkManager. You can enable NetworkManager by setting: <programlisting> -services.networkmanager.enable = true; +networking.networkmanager.enable = true; </programlisting> some desktop managers (e.g., GNOME) enable NetworkManager @@ -19,8 +19,8 @@ automatically for you.</para> <para>All users that should have permission to change network settings must belong to the <code>networkmanager</code> group.</para> -<note><para><code>services.networkmanager</code> and -<code>services.wireless</code> can not be enabled at the same time: +<note><para><code>networking.networkmanager</code> and +<code>networking.wireless</code> can not be enabled at the same time: you can still connect to the wireless networks using NetworkManager.</para></note> diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index afc159dbd5d7..c529737c3bf3 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -1,7 +1,7 @@ <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> - + <refmeta> <refentrytitle><command>nixos-rebuild</command></refentrytitle> <manvolnum>8</manvolnum> @@ -22,7 +22,8 @@ <arg choice='plain'><option>boot</option></arg> <arg choice='plain'><option>test</option></arg> <arg choice='plain'><option>build</option></arg> - <arg choice='plain'><option>dry-run</option></arg> + <arg choice='plain'><option>dry-build</option></arg> + <arg choice='plain'><option>dry-activate</option></arg> <arg choice='plain'><option>build-vm</option></arg> <arg choice='plain'><option>build-vm-with-bootloader</option></arg> </group> @@ -114,10 +115,22 @@ $ nix-build /path/to/nixpkgs/nixos -A system </varlistentry> <varlistentry> - <term><option>dry-run</option></term> + <term><option>dry-build</option></term> + <listitem> + <para>Show what store paths would be built or downloaded by any + of the operations above, but otherwise do nothing.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>dry-activate</option></term> <listitem> - <para>Simply show what store paths would be built or downloaded - by any of the operations above.</para> + <para>Build the new configuration, but instead of activating it, + show what changes would be performed by the activation (i.e. by + <command>nixos-rebuild test</command>). For + instance, this command will print which systemd units would be + restarted. The list of changes is not guaranteed to be + complete.</para> </listitem> </varlistentry> diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 549e731f3b08..a39c2895bf84 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -8,6 +8,7 @@ let inherit (config.services.avahi) nssmdns; inherit (config.services.samba) nsswins; + ldap = config.users.ldap.enable; in @@ -40,9 +41,9 @@ in # should define an option used by this module. environment.etc."nsswitch.conf".text = '' - passwd: files ldap - group: files ldap - shadow: files ldap + passwd: files ${optionalString ldap "ldap"} + group: files ${optionalString ldap "ldap"} + shadow: files ${optionalString ldap "ldap"} hosts: files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines networks: files dns ethers: files diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 8b38489a8c19..c41e4ea604d5 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -124,9 +124,7 @@ in { } (mkIf cfg.enable { - environment.systemPackages = [ - cfg.package - ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ]; + environment.systemPackages = [ cfg.package ]; environment.etc = singleton { target = "asound.conf"; diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index d35ecb754bdb..de73de91629b 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -174,12 +174,12 @@ foreach my $u (@{$spec->{users}}) { } elsif (defined $u->{initialHashedPassword}) { $u->{hashedPassword} = $u->{initialHashedPassword}; } + } - # Create a home directory. - if ($u->{createHome}) { - make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home}; - chown $u->{uid}, $u->{gid}, $u->{home}; - } + # Create a home directory. + if ($u->{createHome} && ! -e $u->{home}) { + make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home}; + chown $u->{uid}, $u->{gid}, $u->{home}; } if (defined $u->{passwordFile}) { diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index f585a2774799..db87f9fd0b1a 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -489,6 +489,7 @@ in { utmp.gid = ids.gids.utmp; adm.gid = ids.gids.adm; grsecurity.gid = ids.gids.grsecurity; + input.gid = ids.gids.input; }; system.activationScripts.users = stringAfter [ "etc" ] diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2b20dc7395af..209310bec999 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -47,6 +47,15 @@ in boot.extraModulePackages = [ nvidia_x11 ]; + # nvidia-uvm is required by CUDA applications. + boot.kernelModules = [ "nvidia-uvm" ]; + + # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. + services.udev.extraRules = + '' + KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + ''; + boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ]; services.acpid.enable = true; diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index bfb42d40b06e..8f3de10c6133 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -128,7 +128,7 @@ mkdir -m 0755 -p \ $mountPoint/nix/var/nix/db \ $mountPoint/nix/var/log/nix/drvs -mkdir -m 1775 -p $mountPoint/nix/store +mkdir -m 1735 -p $mountPoint/nix/store chown root:nixbld $mountPoint/nix/store diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 8157f8fc7da5..1d6df8cb3f71 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -26,7 +26,8 @@ while [ "$#" -gt 0 ]; do --help) showSyntax ;; - switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader) + switch|boot|test|build|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader) + if [ "$i" = dry-run ]; then i=dry-build; fi action="$i" ;; --install-grub) @@ -137,7 +138,7 @@ fi # First build Nix, since NixOS may require a newer version than the # current one. -if [ -n "$rollback" -o "$action" = dry-run ]; then +if [ -n "$rollback" -o "$action" = dry-build ]; then buildNix= fi @@ -180,7 +181,7 @@ if [ -n "$canRun" ]; then fi -if [ "$action" = dry-run ]; then +if [ "$action" = dry-build ]; then extraBuildFlags+=(--dry-run) fi @@ -193,7 +194,7 @@ if [ -z "$rollback" ]; then if [ "$action" = switch -o "$action" = boot ]; then nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixpkgs/nixos>' --set -A system pathToConfig="$profile" - elif [ "$action" = test -o "$action" = build -o "$action" = dry-run ]; then + elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then nix-build '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}" > /dev/null pathToConfig=./result elif [ "$action" = build-vm ]; then @@ -224,7 +225,7 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. -if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then +if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then if ! $pathToConfig/bin/switch-to-configuration "$action"; then echo "warning: error(s) occured while switching to the new configuration" >&2 exit 1 diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0c863ec8de1c..eec2f1bb6f68 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -27,28 +27,38 @@ ids.uids = { root = 0; - nscd = 1; - sshd = 2; - ntp = 3; + #wheel = 1; # unused + #kmem = 2; # unused + #tty = 3; # unused messagebus = 4; # D-Bus haldaemon = 5; - nagios = 6; + #disk = 6; # unused vsftpd = 7; ftp = 8; bitlbee = 9; avahi = 10; + nagios = 11; atd = 12; - zabbix = 13; - postfix = 14; + postfix = 13; + #postdrop = 14; # unused dovecot = 15; tomcat = 16; + #audio = 17; # unused + #floppy = 18; # unused + #uucp = 19; # unused + #lp = 20; # unused pulseaudio = 22; # must match `pulseaudio' GID gpsd = 23; + #cdrom = 24; # unused + #tape = 25; # unused + #video = 26; # unused + #dialout = 27; # unused polkituser = 28; - uptimed = 29; + #utmp = 29; # unused ddclient = 30; davfs2 = 31; privoxy = 32; + #disnix = 33; # unused osgi = 34; tor = 35; cups = 36; @@ -70,18 +80,25 @@ fprot = 52; bind = 53; wwwrun = 54; + #adm = 55; # unused spamd = 56; + #networkmanager = 57; # unused nslcd = 58; + #scanner = 59; # unused nginx = 60; chrony = 61; + #systemd-journal = 62; # unused smtpd = 63; smtpq = 64; supybot = 65; iodined = 66; + #libvirtd = 67; # unused graphite = 68; statsd = 69; transmission = 70; postgres = 71; + #vboxusers = 72; # unused + #vboxsf = 73; # unused smbguest = 74; # unused varnish = 75; datadog = 76; @@ -102,13 +119,13 @@ minidlna = 91; elasticsearch = 92; tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. - zope2 = 94; + #connman = 94; # unused firebird = 95; - redis = 96; + #keys = 96; # unused haproxy = 97; mongodb = 98; openldap = 99; - memcached = 100; + #users = 100; # unused cgminer = 101; munin = 102; logcheck = 103; @@ -129,6 +146,7 @@ foundationdb = 118; newrelic = 119; starbound = 120; + #grsecurity = 121; # unused hydra = 122; spiped = 123; teamspeak = 124; @@ -138,7 +156,7 @@ znc = 128; polipo = 129; mopidy = 130; - unifi = 131; + #docker = 131; # unused gdm = 132; dhcpd = 133; siproxd = 134; @@ -180,6 +198,19 @@ panamax = 170; marathon = 171; exim = 172; + #fleet = 173; # unused + #input = 174; # unused + sddm = 175; + tss = 176; + memcached = 177; + nscd = 178; + ntp = 179; + zabbix = 180; + redis = 181; + sshd = 182; + unifi = 183; + uptimed = 184; + zope2 = 185; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -199,15 +230,16 @@ ftp = 8; bitlbee = 9; avahi = 10; + #nagios = 11; # unused atd = 12; postfix = 13; postdrop = 14; dovecot = 15; + tomcat = 16; audio = 17; floppy = 18; uucp = 19; lp = 20; - tomcat = 21; pulseaudio = 22; # must match `pulseaudio' UID gpsd = 23; cdrom = 24; @@ -216,21 +248,30 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; + #ddclient = 30; # unused davfs2 = 31; privoxy = 32; disnix = 33; osgi = 34; tor = 35; - ghostOne = 40; + #cups = 36; # unused + #foldingathome = 37; # unused + #sabnzd = 38; # unused + #kdm = 39; # unused + ghostone = 40; git = 41; fourstore = 42; - fourstorehttpd = 43; + fourstorehttp = 43; virtuoso = 44; + #rtkit = 45; # unused dovecot2 = 46; + #dovenull = 47; # unused + #unbound = 48; # unused prayer = 49; mpd = 50; clamav = 51; fprot = 52; + #bind = 53; # unused wwwrun = 54; adm = 55; spamd = 56; @@ -238,6 +279,7 @@ nslcd = 58; scanner = 59; nginx = 60; + #chrony = 61; # unused systemd-journal = 62; smtpd = 63; smtpq = 64; @@ -245,6 +287,7 @@ iodined = 66; libvirtd = 67; graphite = 68; + #statsd = 69; # unused transmission = 70; postgres = 71; vboxusers = 72; @@ -267,11 +310,17 @@ quassel = 89; amule = 90; minidlna = 91; - haproxy = 92; - openldap = 93; + #elasticsearch = 92; # unused + #tcpcryptd = 93; # unused connman = 94; - munin = 95; + firebird = 95; keys = 96; + haproxy = 97; + #mongodb = 98; # unused + openldap = 99; + munin = 102; + #logcheck = 103; # unused + #nix-ssh = 104; # unused dictd = 105; couchdb = 106; searx = 107; @@ -279,8 +328,12 @@ jenkins = 109; systemd-journal-gateway = 110; notbit = 111; + #ngircd = 112; # unused btsync = 113; + #minecraft = 114; # unused monetdb = 115; + #ripped = 116; # unused + #murmur = 117; # unused foundationdb = 118; newrelic = 119; starbound = 120; @@ -290,37 +343,62 @@ teamspeak = 124; influxdb = 125; nsd = 126; - firebird = 127; + #gitolite = 127; # unused znc = 128; polipo = 129; mopidy = 130; docker = 131; gdm = 132; - tss = 133; + #dhcpcd = 133; # unused siproxd = 134; mlmmj = 135; + #neo4j = 136; # unused riemann = 137; riemanndash = 138; - hbase = 139; - opentsdb = 140; + #radvd = 139; # unused + #zookeeper = 140; # unused + #dnsmasq = 141; # unused uhub = 142; + #yandexdisk = 143; # unused + #collectd = 144; # unused + #consul = 145; # unused mailpile = 146; redmine = 147; seeks = 148; prosody = 149; i2pd = 150; + #dnscrypt-proxy = 151; # unused systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; - fleet = 159; + #etcd = 156; # unused + #docker-registry = 157; # unused + hbase = 158; + opentsdb = 159; scollector = 160; bosun = 161; kubernetes = 162; + #peerflix = 163; # unused + #chronos = 164; # unused gitlab = 165; - nylon = 166; + nylon = 168; panamax = 170; + #marathon = 171; # unused exim = 172; + fleet = 173; + input = 174; + sddm = 175; + tss = 176; + #memcached = 177; # unused + #nscd = 178; # unused + #ntp = 179; # unused + #zabbix = 180; # unused + #redis = 181; # unused + #sshd = 182; # unused + #unifi = 183; # unused + #uptimed = 184; # unused + #zope2 = 185; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c41ae69c1ace..71915a0d3eb7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -60,6 +60,7 @@ ./programs/dconf.nix ./programs/environment.nix ./programs/info.nix + ./programs/ibus.nix ./programs/light.nix ./programs/nano.nix ./programs/screen.nix @@ -90,8 +91,9 @@ ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix - # Disabled as fuppes it does no longer builds. + # Disabled as fuppes no longer builds. # ./services/audio/fuppes.nix + ./services/audio/icecast.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix @@ -108,6 +110,7 @@ ./services/cluster/panamax.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix + ./services/computing/slurm/slurm.nix ./services/continuous-integration/jenkins/default.nix ./services/continuous-integration/jenkins/slave.nix ./services/databases/4store-endpoint.nix @@ -158,6 +161,7 @@ ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thermald.nix + ./services/logging/fluentd.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix ./services/logging/logrotate.nix @@ -228,7 +232,9 @@ ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/diod.nix + ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix + ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix @@ -325,6 +331,7 @@ ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/haveged.nix + ./services/security/munge.nix ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix @@ -352,12 +359,14 @@ ./services/web-servers/varnish/default.nix ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix + ./services/x11/unclutter.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix ./services/x11/display-managers/gdm.nix ./services/x11/display-managers/kdm.nix ./services/x11/display-managers/lightdm.nix + ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix ./services/x11/hardware/multitouch.nix ./services/x11/hardware/synaptics.nix @@ -432,5 +441,5 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/virtualbox-guest.nix - #./virtualisation/xen-dom0.nix + ./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/programs/ibus.nix b/nixos/modules/programs/ibus.nix new file mode 100644 index 000000000000..b8702a743d8a --- /dev/null +++ b/nixos/modules/programs/ibus.nix @@ -0,0 +1,51 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.ibus; +in +{ + options = { + + programs.ibus = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable IBus input method"; + }; + plugins = mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + IBus plugin packages + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ibus ]; + + gtkPlugins = [ pkgs.ibus ]; + qtPlugins = [ pkgs.ibus-qt ]; + + environment.variables = + let + env = pkgs.buildEnv { + name = "ibus-env"; + paths = [ pkgs.ibus ] ++ cfg.plugins; + }; + in { + GTK_IM_MODULE = "ibus"; + QT_IM_MODULE = "ibus"; + XMODIFIERS = "@im=ibus"; + + IBUS_COMPONENT_PATH = "${env}/share/ibus/component"; + }; + + services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon --daemonize --xim --cache=none"; + }; +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 796740ea636a..6ca73eea5f6f 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -4,8 +4,19 @@ with lib; -let cfg = config.programs.ssh; - cfgd = config.services.openssh; +let + + cfg = config.programs.ssh; + cfgd = config.services.openssh; + + askPassword = cfg.askPassword; + + askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper" + '' + #! ${pkgs.stdenv.shell} -e + export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')" + exec ${askPassword} + ''; in { @@ -15,6 +26,12 @@ in programs.ssh = { + askPassword = mkOption { + type = types.string; + default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + description = ''Program used by SSH to ask for passwords.''; + }; + forwardX11 = mkOption { type = types.bool; default = false; @@ -117,6 +134,11 @@ in Restart = "on-failure"; SuccessExitStatus = "0 2"; }; + # Allow ssh-agent to ask for confirmation. This requires the + # unit to know about the user's $DISPLAY (via ‘systemctl + # import-environment’). + environment.SSH_ASKPASS = optionalString config.services.xserver.enable askPasswordWrapper; + environment.DISPLAY = "fake"; # required to make ssh-agent start $SSH_ASKPASS }; environment.extraInit = optionalString cfg.startAgent @@ -126,5 +148,10 @@ in fi ''; + environment.interactiveShellInit = optionalString config.services.xserver.enable + '' + export SSH_ASKPASS=${askPassword} + ''; + }; } diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix index fc25ba6f9694..4bf2f9a17571 100644 --- a/nixos/modules/programs/uim.nix +++ b/nixos/modules/programs/uim.nix @@ -7,14 +7,16 @@ let in { options = { + uim = { enable = mkOption { type = types.bool; default = false; example = true; - description = "enable UIM input method"; + description = "Enable UIM input method"; }; }; + }; config = mkIf cfg.enable { diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1efc278aeb22..e820b2cb9ce4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -112,6 +112,9 @@ in zipModules ([] # VirtualBox ++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ] +# Tarsnap +++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ] + # proxy ++ obsolete [ "nix" "proxy" ] [ "networking" "proxy" "default" ] diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index f29e7a5ad818..4fef62cbffd7 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,43 +1,49 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption types concatMapStrings; cfg = config.security.apparmor; in + { - options = { - security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; + options = { + security.apparmor = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the AppArmor Mandatory Access Control system."; + }; + profiles = mkOption { + type = types.listOf types.path; + default = []; + description = "List of files containing AppArmor profiles."; + }; + }; + }; - profiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of files containing AppArmor profiles."; - }; - }; - }; + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.apparmor-utils ]; - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.apparmor ]; - systemd.services.apparmor = { - wantedBy = [ "local-fs.target" ]; - path = [ pkgs.apparmor ]; + systemd.services.apparmor = { + wantedBy = [ "local-fs.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; '' + ) cfg.profiles; + ExecStop = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; '' + ) cfg.profiles; + }; + }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - ExecStop = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -Rv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - }; - }; - }; + security.pam.services.apparmor.text = '' + ## AppArmor changes hats according to `order`: first try user, then + ## group, and finally fall back to a hat called "DEFAULT" + ## + ## For now, enable debugging as this is an experimental feature. + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + ''; + }; } diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index d0c7fa6ec288..8cd400933487 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Enable the testing grsecurity patch, based on Linux 3.18. + Enable the testing grsecurity patch, based on Linux 3.19. ''; }; @@ -245,7 +245,7 @@ in message = '' If grsecurity is enabled, you must select either the stable patch (with kernel 3.14), or the testing patch (with - kernel 3.18) to continue. + kernel 3.19) to continue. ''; } { assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable); @@ -286,10 +286,11 @@ in systemd.services.grsec-lock = mkIf cfg.config.sysctl { description = "grsecurity sysctl-lock Service"; - requires = [ "sysctl.service" ]; + requires = [ "systemd-sysctl.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = "yes"; + unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel/grsecurity/grsec_lock"; script = '' locked=`cat /proc/sys/kernel/grsecurity/grsec_lock` if [ "$locked" == "0" ]; then diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index dcb2d5494754..e81278a95d5c 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -211,11 +211,13 @@ let ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"} + "auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"} + ${optionalString config.security.pam.enableEcryptfs + "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} ${optionalString cfg.oathAuth - "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath + "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"} ${optionalString config.users.ldap.enable "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} ${optionalString config.krb5.enable '' @@ -223,9 +225,11 @@ let auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass ''} - auth required pam_deny.so + ${optionalString (! config.security.pam.enableEcryptfs) "auth required pam_deny.so"} # Password management. + ${optionalString config.security.pam.enableEcryptfs + "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} password requisite pam_unix.so nullok sha512 ${optionalString config.users.ldap.enable "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"} @@ -245,6 +249,8 @@ let "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"} ${optionalString cfg.updateWtmp "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} + ${optionalString config.security.pam.enableEcryptfs + "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} ${optionalString config.users.ldap.enable "session optional ${pam_ldap}/lib/security/pam_ldap.so"} ${optionalString config.krb5.enable @@ -252,7 +258,7 @@ let ${optionalString cfg.otpwAuth "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"} ${optionalString cfg.oathAuth - "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath + "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"} ${optionalString cfg.startSession "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"} ${optionalString cfg.forwardXAuth @@ -357,6 +363,13 @@ in ''; }; + security.pam.enableEcryptfs = mkOption { + default = false; + description = '' + Enable eCryptfs PAM module (mounting ecryptfs home directory on login). + ''; + }; + users.motd = mkOption { default = null; example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178."; @@ -377,7 +390,11 @@ in ++ optional config.users.ldap.enable pam_ldap ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] - ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ]; + ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ] + ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ]; + + security.setuidPrograms = + optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ]; environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix new file mode 100644 index 000000000000..6a8a0f9975b3 --- /dev/null +++ b/nixos/modules/services/audio/icecast.nix @@ -0,0 +1,130 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.icecast; + configFile = pkgs.writeText "icecast.xml" '' + <icecast> + <hostname>${cfg.hostname}</hostname> + + <authentication> + <admin-user>${cfg.admin.user}</admin-user> + <admin-password>${cfg.admin.password}</admin-password> + </authentication> + + <paths> + <logdir>${cfg.logDir}</logdir> + <adminroot>${pkgs.icecast}/share/icecast/admin</adminroot> + <webroot>${pkgs.icecast}/share/icecast/web</webroot> + <alias source="/" dest="/status.xsl"/> + </paths> + + <listen-socket> + <port>${toString cfg.listen.port}</port> + <bind-address>${cfg.listen.address}</bind-address> + </listen-socket> + + <security> + <chroot>0</chroot> + <changeowner> + <user>${cfg.user}</user> + <group>${cfg.group}</group> + </changeowner> + </security> + + ${cfg.extraConf} + </icecast> + ''; +in { + + ###### interface + + options = { + + services.icecast = { + + enable = mkEnableOption "Icecast server"; + + hostname = mkOption { + type = types.str; + description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; + default = config.networking.domain; + }; + + admin = { + user = mkOption { + type = types.str; + description = "Username used for all administration functions."; + default = "admin"; + }; + + password = mkOption { + type = types.str; + description = "Password used for all administration functions."; + }; + }; + + logDir = mkOption { + type = types.path; + description = "Base directory used for logging."; + default = "/var/log/icecast"; + }; + + listen = { + port = mkOption { + type = types.int; + description = "TCP port that will be used to accept client connections."; + default = 8000; + }; + + address = mkOption { + type = types.str; + description = "Address Icecast will listen on."; + default = "::"; + }; + }; + + user = mkOption { + type = types.str; + description = "User privileges for the server."; + default = "nobody"; + }; + + group = mkOption { + type = types.str; + description = "Group privileges for the server."; + default = "nogroup"; + }; + + extraConf = mkOption { + type = types.lines; + description = "icecast.xml content."; + default = ""; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.icecast = { + after = [ "network.target" ]; + description = "Icecast Network Audio Streaming Server"; + wantedBy = [ "multi-user.target" ]; + + preStart = "mkdir -p ${cfg.logDir} && chown ${cfg.user}:${cfg.group} ${cfg.logDir}"; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.icecast}/bin/icecast -c ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index b79052337597..d9b5bf7b5e6f 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -15,10 +15,12 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" - ${if cfg.network.host != "any" then - "bind_to_address ${cfg.network.host}" else ""} - ${if cfg.network.port != 6600 then - "port ${toString cfg.network.port}" else ""} + user "${cfg.user}" + group "${cfg.group}" + + ${optionalString (cfg.network.host != "any") ''bind_to_address "${cfg.network.host}"''} + ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${cfg.extraConfig} ''; @@ -40,8 +42,7 @@ in { musicDirectory = mkOption { default = "${cfg.dataDir}/music"; description = '' - Extra configuration added to the end of MPD's - configuration file, mpd.conf. + The directory where mpd reads music from. ''; }; @@ -62,6 +63,16 @@ in { ''; }; + user = mkOption { + default = "mpd"; + description = "User account under which MPD runs."; + }; + + group = mkOption { + default = "mpd"; + description = "Group account under which MPD runs."; + }; + network = { host = mkOption { @@ -96,7 +107,7 @@ in { description = "Music Player Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.mpd ]; - preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd ${cfg.dataDir}"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}"; script = "exec mpd --no-daemon ${mpdConf}"; serviceConfig = { User = "mpd"; @@ -104,16 +115,19 @@ in { }; }; - users.extraUsers.mpd = { + users.extraUsers = optionalAttrs (cfg.user == "mpd") (singleton { inherit uid; - group = "mpd"; + name = "mpd"; + group = cfg.group; extraGroups = [ "audio" ]; description = "Music Player Daemon user"; home = "${cfg.dataDir}"; - }; - - users.extraGroups.mpd.gid = gid; + }); + users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton { + name = "mpd"; + gid = gid; + }); }; } diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 1b0bcadca151..155161945cd9 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -12,6 +12,7 @@ let keyfile ${config.services.tarsnap.keyfile} ${optionalString cfg.nodump "nodump"} ${optionalString cfg.printStats "print-stats"} + ${optionalString cfg.printStats "humanize-numbers"} ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes} ${optionalString cfg.aggressiveNetworking "aggressive-networking"} ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} @@ -27,46 +28,39 @@ in type = types.bool; default = false; description = '' - If enabled, NixOS will periodically create backups of the - specified directories using the <literal>tarsnap</literal> - backup service. This installs a <literal>systemd</literal> - service called <literal>tarsnap-backup</literal> which is - periodically run by cron, or you may run it on-demand. - - See the Tarsnap <link - xlink:href='http://www.tarsnap.com/gettingstarted.html'>Getting - Started</link> page. + Enable periodic tarsnap backups. ''; }; keyfile = mkOption { - type = types.path; + type = types.str; default = "/root/tarsnap.key"; description = '' - Path to the keyfile which identifies the machine - associated with your Tarsnap account. This file can - be created using the - <literal>tarsnap-keygen</literal> utility, and - providing your Tarsnap login credentials. + The keyfile which associates this machine with your tarsnap + account. + Create the keyfile with <command>tarsnap-keygen</command>. + + The keyfile name should be given as a string and not a path, to + avoid the key being copied into the Nix store. ''; }; cachedir = mkOption { - type = types.path; + type = types.nullOr types.path; default = "/var/cache/tarsnap"; description = '' - Tarsnap operations use a "cache directory" which - allows Tarsnap to identify which blocks of data have - been previously stored; this directory is specified - via the <literal>cachedir</literal> option. If the - cache directory is lost or out of date, tarsnap - creation/deletion operations will exit with an error - message instructing you to run <literal>tarsnap - --fsck</literal> to regenerate the cache directory. + The cache allows tarsnap to identify previously stored data + blocks, reducing archival time and bandwidth usage. + + Should the cache become desynchronized or corrupted, tarsnap + will refuse to run until you manually rebuild the cache with + <command>tarsnap --fsck</command>. + + Set to <literal>null</literal> to disable caching. ''; }; - config = mkOption { + archives = mkOption { type = types.attrsOf (types.submodule ( { options = { @@ -74,41 +68,44 @@ in type = types.bool; default = true; description = '' - If set to <literal>true</literal>, then don't - archive files which have the - <literal>nodump</literal> flag set. + Exclude files with the <literal>nodump</literal> flag. ''; }; printStats = mkOption { type = types.bool; default = true; - description = "Print statistics when creating archives."; + description = '' + Print global archive statistics upon completion. + The output is available via + <command>systemctl status tarsnap@archive-name</command>. + ''; }; checkpointBytes = mkOption { type = types.nullOr types.str; - default = "1G"; + default = "1GB"; description = '' - Create a checkpoint per a particular amount of - uploaded data. By default, Tarsnap will create - checkpoints once per GB of data uploaded. At - minimum, <literal>checkpointBytes</literal> must be - 1GB. - - Can also be set to <literal>null</literal> to - disable checkpointing. + Create a checkpoint every <literal>checkpointBytes</literal> + of uploaded data (optionally specified using an SI prefix). + + 1GB is the minimum value. A higher value is recommended, + as checkpointing is expensive. + + Set to <literal>null</literal> to disable checkpointing. ''; }; period = mkOption { type = types.str; - default = "15 01 * * *"; + default = "01:15"; + example = "hourly"; description = '' - This option defines (in the format used by cron) - when tarsnap is run for backups. The default is to - backup the specified paths at 01:15 at night every - day. + Create archive at this interval. + + The format is described in + <citerefentry><refentrytitle>systemd.time</refentrytitle> + <manvolnum>7</manvolnum></citerefentry>. ''; }; @@ -116,11 +113,11 @@ in type = types.bool; default = false; description = '' - Aggressive network behaviour: Use multiple TCP - connections when writing archives. Use of this - option is recommended only in cases where TCP - congestion control is known to be the limiting - factor in upload performance. + Upload data over multiple TCP connections, potentially + increasing tarsnap's bandwidth utilisation at the cost + of slowing down all other network traffic. Not + recommended unless TCP congestion is the dominant + limiting factor. ''; }; @@ -134,8 +131,7 @@ in type = types.listOf types.str; default = []; description = '' - Exclude files and directories matching the specified - patterns. + Exclude files and directories matching these patterns. ''; }; @@ -143,12 +139,10 @@ in type = types.listOf types.str; default = []; description = '' - Include only files and directories matching the - specified patterns. + Include only files and directories matching these + patterns (the empty list includes everything). - Note that exclusions specified via - <literal>excludes</literal> take precedence over - inclusions. + Exclusions have precedence over inclusions. ''; }; @@ -156,10 +150,10 @@ in type = types.bool; default = false; description = '' - Attempt to reduce tarsnap memory consumption. This - option will slow down the process of creating - archives, but may help on systems where the average - size of files being backed up is less than 1 MB. + Reduce memory consumption by not caching small files. + Possibly beneficial if the average file size is smaller + than 1 MB and the number of files is lower than the + total amount of RAM in KB. ''; }; @@ -167,11 +161,9 @@ in type = types.bool; default = false; description = '' - Try even harder to reduce tarsnap memory - consumption. This can significantly slow down - tarsnap, but reduces its memory usage by an - additional factor of 2 beyond what the - <literal>lowmem</literal> option does. + Reduce memory consumption by a factor of 2 beyond what + <literal>lowmem</literal> does, at the cost of significantly + slowing down the archiving process. ''; }; }; @@ -188,25 +180,22 @@ in gamedata = { directories = [ "/var/lib/minecraft "]; - period = "*/30 * * * *"; + period = "*:30"; }; } ''; description = '' - Configuration of a Tarsnap archive. In the example, your - machine will have two tarsnap archives: - <literal>gamedata</literal> (backed up every 30 minutes) and - <literal>nixos</literal> (backed up at 1:15 AM every night by - default). You can control individual archive backups using - <literal>systemctl</literal>, using the - <literal>tarsnap@nixos</literal> or - <literal>tarsnap@gamedata</literal> units. For example, - <literal>systemctl start tarsnap@nixos</literal> will - immediately create a new NixOS archive. By default, archives - are suffixed with the timestamp of when they were started, - down to second resolution. This means you can use GNU - <literal>sort</literal> to sort output easily. + Tarsnap archive configurations. Each attribute names an archive + to be created at a given time interval, according to the options + associated with it. When uploading to the tarsnap server, + archive names are suffixed by a 1 second resolution timestamp. + + For each member of the set is created a timer which triggers the + instanced <literal>tarsnap@</literal> service unit. You may use + <command>systemctl start tarsnap@archive-name</command> to + manually trigger creation of <literal>archive-name</literal> at + any time. ''; }; }; @@ -216,38 +205,45 @@ in assertions = (mapAttrsToList (name: cfg: { assertion = cfg.directories != []; - message = "Must specify directories for Tarsnap to back up"; - }) cfg.config) ++ + message = "Must specify paths for tarsnap to back up"; + }) cfg.archives) ++ (mapAttrsToList (name: cfg: - { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem); + { assertion = !(cfg.lowmem && cfg.verylowmem); message = "You cannot set both lowmem and verylowmem"; - }) cfg.config); + }) cfg.archives); systemd.services."tarsnap@" = { - description = "Tarsnap Backup of '%i'"; + description = "Tarsnap archive '%i'"; requires = [ "network.target" ]; path = [ pkgs.tarsnap pkgs.coreutils ]; scriptArgs = "%i"; script = '' - mkdir -p -m 0755 $(dirname ${cfg.cachedir}) - mkdir -p -m 0600 ${cfg.cachedir} + mkdir -p -m 0755 ${dirOf cfg.cachedir} + mkdir -p -m 0700 ${cfg.cachedir} DIRS=`cat /etc/tarsnap/$1.dirs` exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS ''; + + serviceConfig = { + IOSchedulingClass = "idle"; + NoNewPrivileges = "true"; + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH"; + }; }; - services.cron.systemCronJobs = mapAttrsToList (name: cfg: - "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap@${name}" - ) cfg.config; + systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}" + { timerConfig.OnCalendar = cfg.period; + wantedBy = [ "timers.target" ]; + }) cfg.archives; environment.etc = (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" { text = configFile cfg; - }) cfg.config) // + }) cfg.archives) // (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs" { text = concatStringsSep " " cfg.directories; - }) cfg.config); + }) cfg.archives); environment.systemPackages = [ pkgs.tarsnap ]; }; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 7fd2d77aa825..d9ae0454ba5e 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -44,6 +44,12 @@ in { type = types.path; }; + dockerCfg = mkOption { + description = "Kubernetes contents of dockercfg file."; + default = ""; + type = types.lines; + }; + apiserver = { enable = mkOption { description = "Whether to enable kubernetes apiserver."; @@ -217,13 +223,13 @@ in { }; machines = mkOption { - description = "Kubernetes apiserver list of machines to schedule to schedule onto"; + description = "Kubernetes controller list of machines to schedule to schedule onto"; default = []; type = types.listOf types.str; }; extraOpts = mkOption { - description = "Kubernetes scheduler extra command line options."; + description = "Kubernetes controller extra command line options."; default = ""; type = types.str; }; @@ -260,6 +266,30 @@ in { type = types.bool; }; + apiServers = mkOption { + description = "Kubernetes kubelet list of Kubernetes API servers for publishing events, and reading pods and services."; + default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"]; + type = types.listOf types.str; + }; + + cadvisorPort = mkOption { + description = "Kubernetes kubelet local cadvisor port."; + default = config.services.cadvisor.port; + type = types.int; + }; + + clusterDns = mkOption { + description = "Use alternative dns."; + default = ""; + type = types.str; + }; + + clusterDomain = mkOption { + description = "Use alternative domain."; + default = ""; + type = types.str; + }; + extraOpts = mkOption { description = "Kubernetes kubelet extra command line options."; default = ""; @@ -295,6 +325,7 @@ in { systemd.services.kubernetes-apiserver = { description = "Kubernetes Api Server"; wantedBy = [ "multi-user.target" ]; + requires = ["kubernetes-setup.service"]; after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = let @@ -306,26 +337,25 @@ in { (concatImapStringsSep "\n" (i: v: v + "," + (toString i)) (mapAttrsToList (name: token: token + "," + name) cfg.apiserver.tokenAuth)); in ''${cfg.package}/bin/kube-apiserver \ - -etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ - -address=${cfg.apiserver.address} \ - -port=${toString cfg.apiserver.port} \ - -read_only_port=${toString cfg.apiserver.readOnlyPort} \ - -public_address_override=${cfg.apiserver.publicAddress} \ - -allow_privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ + --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ + --address=${cfg.apiserver.address} \ + --port=${toString cfg.apiserver.port} \ + --read_only_port=${toString cfg.apiserver.readOnlyPort} \ + --public_address_override=${cfg.apiserver.publicAddress} \ + --allow_privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ ${optionalString (cfg.apiserver.tlsCertFile!="") - "-tls_cert_file=${cfg.apiserver.tlsCertFile}"} \ + "--tls_cert_file=${cfg.apiserver.tlsCertFile}"} \ ${optionalString (cfg.apiserver.tlsPrivateKeyFile!="") - "-tls_private_key_file=${cfg.apiserver.tlsPrivateKeyFile}"} \ + "--tls_private_key_file=${cfg.apiserver.tlsPrivateKeyFile}"} \ ${optionalString (cfg.apiserver.tokenAuth!=[]) - "-token_auth_file=${tokenAuthFile}"} \ - -authorization_mode=${cfg.apiserver.authorizationMode} \ + "--token_auth_file=${tokenAuthFile}"} \ + --authorization_mode=${cfg.apiserver.authorizationMode} \ ${optionalString (cfg.apiserver.authorizationMode == "ABAC") - "-authorization_policy_file=${authorizationPolicyFile}"} \ - ${optionalString (cfg.apiserver.tlsCertFile!="" && cfg.apiserver.tlsCertFile!="") - "-secure_port=${toString cfg.apiserver.securePort}"} \ - -portal_net=${cfg.apiserver.portalNet} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + "--authorization_policy_file=${authorizationPolicyFile}"} \ + --secure_port=${toString cfg.apiserver.securePort} \ + --portal_net=${cfg.apiserver.portalNet} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; User = "kubernetes"; @@ -345,11 +375,11 @@ in { after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-scheduler \ - -address=${cfg.scheduler.address} \ - -port=${toString cfg.scheduler.port} \ - -master=${cfg.scheduler.master} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + --address=${cfg.scheduler.address} \ + --port=${toString cfg.scheduler.port} \ + --master=${cfg.scheduler.master} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.scheduler.extraOpts} ''; User = "kubernetes"; @@ -364,13 +394,12 @@ in { after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-controller-manager \ - -address=${cfg.controllerManager.address} \ - -port=${toString cfg.controllerManager.port} \ - -master=${cfg.controllerManager.master} \ - ${optionalString (cfg.controllerManager.machines != []) - "-machines=${concatStringsSep "," cfg.controllerManager.machines}"} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + --address=${cfg.controllerManager.address} \ + --port=${toString cfg.controllerManager.port} \ + --master=${cfg.controllerManager.master} \ + --machines=${concatStringsSep "," cfg.controllerManager.machines} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.controllerManager.extraOpts} ''; User = "kubernetes"; @@ -382,23 +411,28 @@ in { systemd.services.kubernetes-kubelet = { description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; + requires = ["kubernetes-setup.service"]; after = [ "network-interfaces.target" "etcd.service" "docker.service" ]; - serviceConfig = { - ExecStart = ''${cfg.package}/bin/kubelet \ - -etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ - -address=${cfg.kubelet.address} \ - -port=${toString cfg.kubelet.port} \ - -hostname_override=${cfg.kubelet.hostname} \ - -allow_privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ - -root_dir=${cfg.dataDir} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + script = '' + export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" + exec ${cfg.package}/bin/kubelet \ + --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ + --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ + --address=${cfg.kubelet.address} \ + --port=${toString cfg.kubelet.port} \ + --hostname_override=${cfg.kubelet.hostname} \ + --allow_privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ + --root_dir=${cfg.dataDir} \ + --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ + ${optionalString (cfg.kubelet.clusterDns != "") + ''--cluster_dns=${cfg.kubelet.clusterDns}''} \ + ${optionalString (cfg.kubelet.clusterDomain != "") + ''--cluster_domain=${cfg.kubelet.clusterDomain}''} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.kubelet.extraOpts} ''; - User = "kubernetes"; - PermissionsStartOnly = true; - WorkingDirectory = cfg.dataDir; - }; + serviceConfig.WorkingDirectory = cfg.dataDir; }; }) @@ -409,10 +443,10 @@ in { after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ - -etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ - -bind_address=${cfg.proxy.address} \ - -logtostderr=true \ - ${optionalString cfg.verbose "-v=6 -log_flush_frequency=1s"} \ + --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ + --bind_address=${cfg.proxy.address} \ + --logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.proxy.extraOpts} ''; }; @@ -427,6 +461,8 @@ in { (mkIf (any (el: el == "node") cfg.roles) { virtualisation.docker.enable = mkDefault true; + services.cadvisor.enable = mkDefault true; + services.cadvisor.port = mkDefault 4194; services.kubernetes.kubelet.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true; }) @@ -442,6 +478,16 @@ in { cfg.kubelet.enable || cfg.proxy.enable ) { + systemd.services.kubernetes-setup = { + description = "Kubernetes setup."; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p /var/run/kubernetes + chown kubernetes /var/run/kubernetes + ln -fs ${pkgs.writeText "kubernetes-dockercfg" cfg.dockerCfg} /var/run/kubernetes/.dockercfg + ''; + }; + services.kubernetes.package = mkDefault pkgs.kubernetes; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix index a7233f23c913..b47ff744fc27 100644 --- a/nixos/modules/services/cluster/panamax.nix +++ b/nixos/modules/services/cluster/panamax.nix @@ -124,14 +124,15 @@ in { }; preStart = '' - rm -rf ${cfg.dataDir}/state/tmp mkdir -p ${cfg.dataDir}/ui/state/{log,tmp} + chown -R panamax:panamax ${cfg.dataDir} ''; serviceConfig = { ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}"; User = "panamax"; Group = "panamax"; + PermissionsStartOnly = true; }; }; @@ -145,6 +146,8 @@ in { services.journald.enableHttpGateway = mkDefault true; services.fleet.enable = mkDefault true; + services.cadvisor.enable = mkDefault true; + services.cadvisor.port = mkDefault 3002; virtualisation.docker.enable = mkDefault true; environment.systemPackages = [ panamax_api panamax_ui ]; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix new file mode 100644 index 000000000000..019d7fbb16cd --- /dev/null +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -0,0 +1,130 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.slurm; + # configuration file can be generated by http://slurm.schedmd.com/configurator.html + configFile = pkgs.writeText "slurm.conf" + '' + ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} + ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} + ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} + ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} + ${cfg.extraConfig} + ''; +in + +{ + + ###### interface + + options = { + + services.slurm = { + + server = { + enable = mkEnableOption "slurm control daemon"; + + }; + + client = { + enable = mkEnableOption "slurm rlient daemon"; + + }; + + controlMachine = mkOption { + type = types.nullOr types.str; + default = null; + example = null; + description = '' + The short hostname of the machine where SLURM control functions are + executed (i.e. the name returned by the command "hostname -s", use "tux001" + rather than "tux001.my.com"). + ''; + }; + + controlAddr = mkOption { + type = types.nullOr types.str; + default = cfg.controlMachine; + example = null; + description = '' + Name that ControlMachine should be referred to in establishing a + communications path. + ''; + }; + + nodeName = mkOption { + type = types.nullOr types.str; + default = null; + example = "linux[1-32] CPUs=1 State=UNKNOWN"; + description = '' + Name that SLURM uses to refer to a node (or base partition for BlueGene + systems). Typically this would be the string that "/bin/hostname -s" + returns. Note that now you have to write node's parameters after the name. + ''; + }; + + partitionName = mkOption { + type = types.nullOr types.str; + default = null; + example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP"; + description = '' + Name by which the partition may be referenced. Note that now you have + to write patrition's parameters after the name. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra configuration options that will be added verbatim at + the end of the slurm configuration file. + ''; + }; + }; + + }; + + + ###### implementation + + config = mkIf (cfg.client.enable || cfg.server.enable) { + + environment.systemPackages = [ pkgs.slurm-llnl ]; + + systemd.services.slurmd = mkIf (cfg.client.enable) { + path = with pkgs; [ slurm-llnl coreutils ]; + + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-tmpfiles-clean.service" ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.slurm-llnl}/bin/slurmd -f ${configFile}"; + PIDFile = "/run/slurmd.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + + systemd.services.slurmctld = mkIf (cfg.server.enable) { + path = with pkgs; [ slurm-llnl munge coreutils ]; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "auditd.service" "munged.service" "slurmdbd.service" ]; + requires = [ "munged.service" ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.slurm-llnl}/bin/slurmctld"; + PIDFile = "/run/slurmctld.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + environment = { SLURM_CONF = "${configFile}"; }; + }; + + }; + +} diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index e1fe6be6f6a3..2b1d07c355ef 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -131,8 +131,8 @@ in { type = types.string; default = "/var/lib/couchdb/couchdb.ini"; description = '' - Custom configuration file. File needs to be readable and writable - from couchdb user/group. + Configuration file for persisting runtime changes. File + needs to be readable and writable from couchdb user/group. ''; }; @@ -157,12 +157,15 @@ in { mkdir -p ${cfg.databaseDir}; mkdir -p ${cfg.viewIndexDir}; touch ${cfg.configFile} + touch -a ${cfg.logFile} if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} ${cfg.uriFile} + chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`; + (-f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} chown ${cfg.user}:${cfg.group} ${cfg.configFile} + chown ${cfg.user}:${cfg.group} ${cfg.logFile} fi ''; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 02e44ad88704..14ffdad9217d 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -120,6 +120,7 @@ in }; preStart = '' + rm ${cfg.dbpath}/mongod.lock || true if ! test -e ${cfg.dbpath}; then install -d -m0700 -o ${cfg.user} ${cfg.dbpath} fi diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d7f6c188feb8..220b154bd97a 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -128,12 +128,12 @@ in users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; - uid = config.ids.uids.nginx; + uid = config.ids.uids.tss; }); users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; - gid = config.ids.gids.nginx; + gid = config.ids.gids.tss; }); }; } diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix new file mode 100644 index 000000000000..61eeec504e0d --- /dev/null +++ b/nixos/modules/services/logging/fluentd.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fluentd; +in { + ###### interface + + options = { + + services.fluentd = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable fluentd."; + }; + + config = mkOption { + type = types.lines; + default = ""; + description = "Fluentd config."; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.fluentd = with pkgs; { + description = "Fluentd Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.fluentd}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 219c7ed95874..48bb9e4293e7 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -132,7 +132,7 @@ in restartIfChanged = false; - path = [ pkgs.nix pkgs.disnix dysnomia ]; + path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ]; environment = { HOME = "/root"; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f231998d8f47..2da84c031a78 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -20,6 +20,8 @@ let extraGroups = [ "nixbld" ]; }; + nixbldUsers = map makeNixBuildUser (range 1 cfg.nrBuildUsers); + nixConf = let # If we're using a chroot for builds, then provide /bin/sh in @@ -357,7 +359,9 @@ in nix.nrBuildUsers = mkDefault (lib.max 10 cfg.maxJobs); - users.extraUsers = map makeNixBuildUser (range 1 cfg.nrBuildUsers); + users.extraUsers = nixbldUsers; + + services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; system.activationScripts.nix = stringAfter [ "etc" "users" ] '' diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 2c1fec9f6d7c..85a1ed8ae9e3 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -1,5 +1,3 @@ -# configuration building is commented out until better tested. - { config, lib, pkgs, ... }: with lib; @@ -7,266 +5,366 @@ with lib; let cfg = config.services.rippled; - rippledStateCfgFile = "/var/lib/rippled/rippled.cfg"; + b2i = val: if val then "1" else "0"; + + dbCfg = db: '' + type=${db.type} + path=${db.path} + ${optionalString (db.compression != null) ("compression=${b2i db.compression}") } + ${optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} + ${optionalString (db.advisoryDelete != null) ("advisory_delete=${toString db.advisoryDelete}")} + ${db.extraOpts} + ''; rippledCfg = '' + [server] + ${concatMapStringsSep "\n" (n: "port_${n}") (attrNames cfg.ports)} + + ${concatMapStrings (p: '' + [port_${p.name}] + ip=${p.ip} + port=${toString p.port} + protocol=${concatStringsSep "," p.protocol} + ${optionalString (p.user != "") "user=${p.user}"} + ${optionalString (p.password != "") "user=${p.password}"} + admin=${if p.admin then "allow" else "no"} + ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} + ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} + ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} + '') (attrValues cfg.ports)} + + [database_path] + ${cfg.databasePath} + [node_db] - type=HyperLevelDB - path=/var/lib/rippled/db/hyperldb + ${dbCfg cfg.nodeDb} - [debug_logfile] - /var/log/rippled/debug.log + ${optionalString (cfg.tempDb != null) '' + [temp_db] + ${dbCfg cfg.tempDb}''} - '' - + optionalString (cfg.peerIp != null) '' - [peer_ip] - ${cfg.peerIp} + ${optionalString (cfg.importDb != null) '' + [import_db] + ${dbCfg cfg.importDb}''} - [peer_port] - ${toString cfg.peerPort} + [ips] + ${concatStringsSep "\n" cfg.ips} - '' - + cfg.extraConfig; + [ips_fixed] + ${concatStringsSep "\n" cfg.ipsFixed} - rippledCfgFile = pkgs.writeText "rippled.cfg" rippledCfg; - -in + [validators] + ${concatStringsSep "\n" cfg.validators} -{ + [node_size] + ${cfg.nodeSize} - ###### interface + [ledger_history] + ${toString cfg.ledgerHistory} - options = { + [fetch_depth] + ${toString cfg.fetchDepth} - services.rippled = { + [validation_quorum] + ${toString cfg.validationQuorum} - enable = mkOption { - default = false; - description = "Whether to enable rippled"; - }; + [sntp_servers] + ${concatStringsSep "\n" cfg.sntpServers} - # - # Rippled has a simple configuration file layout that is easy to - # build with nix. Many of the options are defined here but are - # commented out until the code to append them to the config above - # is written and they are tested. - # - # If you find a yourself implementing more options, please submit a - # pull request. - # - - /* - ips = mkOption { - default = [ "r.ripple.com 51235" ]; - example = [ "192.168.0.1" "192.168.0.1 3939" "r.ripple.com 51235" ]; - description = '' - List of hostnames or ips where the Ripple protocol is served. - For a starter list, you can either copy entries from: - https://ripple.com/ripple.txt or if you prefer you can let it - default to r.ripple.com 51235 + [rpc_startup] + { "command": "log_level", "severity": "${cfg.logLevel}" } + '' + cfg.extraConfig; - A port may optionally be specified after adding a space to the - address. By convention, if known, IPs are listed in from most - to least trusted. - ''; + portOptions = { name, ...}: { + options = { + name = mkOption { + internal = true; + default = name; }; - ipsFixed = mkOption { - default = null; - example = [ "192.168.0.1" "192.168.0.1 3939" "r.ripple.com 51235" ]; - description = '' - List of IP addresses or hostnames to which rippled should always - attempt to maintain peer connections with. This is useful for - manually forming private networks, for example to configure a - validation server that connects to the Ripple network through a - public-facing server, or for building a set of cluster peers. + ip = mkOption { + default = "127.0.0.1"; + description = "Ip where rippled listens."; + type = types.str; + }; - A port may optionally be specified after adding a space to the address - ''; + port = mkOption { + description = "Port where rippled listens."; + type = types.int; }; - */ - peerIp = mkOption { - default = null; - example = "0.0.0.0"; - description = '' - IP address or domain to bind to allow external connections from peers. - Defaults to not binding, which disallows external connections from peers. - ''; + protocol = mkOption { + description = "Protocols expose by rippled."; + type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); }; - peerPort = mkOption { - default = 51235; - description = '' - If peerIp is supplied, corresponding port to bind to for peer connections. - ''; + user = mkOption { + description = "When set, these credentials will be required on HTTP/S requests."; + type = types.str; + default = ""; }; - /* - peerPortProxy = mkOption { - type = types.int; - example = 51236; - description = '' - An optional, additional listening port number for peers. Incoming - connections on this port will be required to provide a PROXY Protocol - handshake, described in this document (external link): + password = mkOption { + description = "When set, these credentials will be required on HTTP/S requests."; + type = types.str; + default = ""; + }; - http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt + admin = mkOption { + description = "Controls whether or not administrative commands are allowed."; + type = types.bool; + default = false; + }; - The PROXY Protocol is a popular method used by elastic load balancing - service providers such as Amazon, to identify the true IP address and - port number of external incoming connections. + ssl = { + key = mkOption { + description = '' + Specifies the filename holding the SSL key in PEM format. + ''; + default = null; + type = types.nullOr types.path; + }; + + cert = mkOption { + description = '' + Specifies the path to the SSL certificate file in PEM format. + This is not needed if the chain includes it. + ''; + default = null; + type = types.nullOr types.path; + }; + + chain = mkOption { + description = '' + If you need a certificate chain, specify the path to the + certificate chain here. The chain may include the end certificate. + ''; + default = null; + type = types.nullOr types.path; + }; - In addition to enabling this setting, it will also be required to - use your provider-specific control panel or administrative web page - to configure your server instance to receive PROXY Protocol handshakes, - and also to restrict access to your instance to the Elastic Load Balancer. - ''; }; - - peerPrivate = mkOption { - default = null; - example = 0; - description = '' - 0: Request peers to broadcast your address. Normal outbound peer connections [default] - 1: Request peers not broadcast your address. Only connect to configured peers. - ''; - }; - - peerSslCipherList = mkOption { - default = null; - example = "ALL:!LOW:!EXP:!MD5:@STRENGTH"; - description = '' - A colon delimited string with the allowed SSL cipher modes for peer. The - choices for for ciphers are defined by the OpenSSL API function - SSL_CTX_set_cipher_list, documented here (external link): - - http://pic.dhe.ibm.com/infocenter/tpfhelp/current/index.jsp?topic=%2Fcom.ibm.ztpf-ztpfdf.doc_put.cur%2Fgtpc2%2Fcpp_ssl_ctx_set_cipher_list.html - - The default setting of "ALL:!LOW:!EXP:!MD5:@STRENGTH", which allows - non-authenticated peer connections (they are, however, secure). - ''; }; + }; - nodeSeed = mkOption { - default = null; - example = "RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE"; - description = '' - This is used for clustering. To force a particular node seed or key, the - key can be set here. The format is the same as the validation_seed field. - To obtain a validation seed, use the rippled validation_create command. - ''; + dbOptions = { + type = mkOption { + description = "Rippled database type."; + type = types.enum ["rocksdb" "nudb" "sqlite"]; + default = "rocksdb"; }; - clusterNodes = mkOption { - default = null; - example = [ "n9KorY8QtTdRx7TVDpwnG9NvyxsDwHUKUEeDLY3AkiGncVaSXZi5" ]; - description = '' - To extend full trust to other nodes, place their node public keys here. - Generally, you should only do this for nodes under common administration. - Node public keys start with an 'n'. To give a node a name for identification - place a space after the public key and then the name. - ''; + path = mkOption { + description = "Location to store the database."; + type = types.path; + default = cfg.databasePath; }; - sntpServers = mkOption { + compression = mkOption { + description = "Whether to enable snappy compression."; + type = types.nullOr types.bool; default = null; - example = [ "time.nist.gov" "pool.ntp.org" ]; - description = '' - IP address or domain of NTP servers to use for time synchronization. - ''; }; - # TODO: websocket options - - rpcAllowRemote = mkOption { - default = false; - description = '' - false: Allow RPC connections only from 127.0.0.1. [default] - true: Allow RPC connections from any IP. - ''; + onlineDelete = mkOption { + description = "Enable automatic purging of older ledger information."; + type = types.addCheck (types.nullOr types.int) (v: v > 256); + default = cfg.ledgerHistory; }; - rpcAdminAllow = mkOption { - example = [ "10.0.0.4" ]; + advisoryDelete = mkOption { description = '' - List of IP addresses allowed to have admin access. + If set, then require administrative RPC call "can_delete" + to enable online deletion of ledger records. ''; + type = types.nullOr types.bool; + default = null; }; - rpcAdminUser = mkOption { - type = types.str; - description = '' - As a server, require this as the admin user to be specified. Also, require - rpc_admin_user and rpc_admin_password to be checked for RPC admin functions. - The request must specify these as the admin_user and admin_password in the - request object. - ''; + extraOpts = mkOption { + description = "Extra database options."; + type = types.lines; + default = ""; }; + }; - rpcAdminPassword = mkOption { - type = types.str; - description = '' - As a server, require this as the admin pasword to be specified. Also, - require rpc_admin_user and rpc_admin_password to be checked for RPC admin - functions. The request must specify these as the admin_user and - admin_password in the request object. - ''; - }; +in + +{ + + ###### interface + + options = { + services.rippled = { + enable = mkEnableOption "Whether to enable rippled"; + + package = mkOption { + description = "Which rippled package to use."; + type = types.package; + default = pkgs.rippled; + }; + + ports = mkOption { + description = "Ports exposed by rippled"; + type = types.attrsOf types.optionSet; + options = [portOptions]; + default = { + rpc = { + port = 5005; + admin = true; + protocol = ["http"]; + }; + + peer = { + port = 51235; + ip = "0.0.0.0"; + protocol = ["peer"]; + }; + + ws_public = { + port = 5006; + ip = "0.0.0.0"; + protocol = ["ws" "wss"]; + }; + }; + }; - rpcIp = mkOption { - type = types.str; + nodeDb = mkOption { + description = "Rippled main database options."; + type = types.nullOr types.optionSet; + options = [dbOptions]; + default = { + type = "rocksdb"; + extraOpts = '' + open_files=2000 + filter_bits=12 + cache_mb=256 + file_size_pb=8 + file_size_mult=2; + ''; + }; + }; + + tempDb = mkOption { + description = "Rippled temporary database options."; + type = types.nullOr types.optionSet; + options = [dbOptions]; + default = null; + }; + + importDb = mkOption { + description = "Settings for performing a one-time import."; + type = types.nullOr types.optionSet; + options = [dbOptions]; + default = null; + }; + + nodeSize = mkOption { description = '' - IP address or domain to bind to allow insecure RPC connections. - Defaults to not binding, which disallows RPC connections. + Rippled size of the node you are running. + "tiny", "small", "medium", "large", and "huge" ''; + type = types.enum ["tiny" "small" "medium" "large" "huge"]; + default = "small"; }; - rpcPort = mkOption { - type = types.int; - description = '' - If rpcIp is supplied, corresponding port to bind to for peer connections. - ''; + ips = mkOption { + description = '' + List of hostnames or ips where the Ripple protocol is served. + For a starter list, you can either copy entries from: + https://ripple.com/ripple.txt or if you prefer you can let it + default to r.ripple.com 51235 + + A port may optionally be specified after adding a space to the + address. By convention, if known, IPs are listed in from most + to least trusted. + ''; + type = types.listOf types.str; + default = ["r.ripple.com 51235"]; + }; + + ipsFixed = mkOption { + description = '' + List of IP addresses or hostnames to which rippled should always + attempt to maintain peer connections with. This is useful for + manually forming private networks, for example to configure a + validation server that connects to the Ripple network through a + public-facing server, or for building a set of cluster peers. + + A port may optionally be specified after adding a space to the address + ''; + type = types.listOf types.str; + default = []; + }; + + validators = mkOption { + description = '' + List of nodes to always accept as validators. Nodes are specified by domain + or public key. + ''; + type = types.listOf types.str; + default = [ + "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" + "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" + "n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3" + "n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4" + "n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5" + ]; }; - rpcUser = mkOption { - type = types.str; + databasePath = mkOption { description = '' - Require a this user to specified and require rpcPassword to - be checked for RPC access via the rpcIp and rpcPort. The user and password - must be specified via HTTP's basic authentication method. - As a client, supply this to the server via HTTP's basic authentication - method. + Path to the ripple database. ''; + type = types.path; + default = "/var/lib/rippled/db"; }; - rpcPassword = mkOption { - type = types.str; + validationQuorum = mkOption { description = '' - Require a this password to specified and require rpc_user to - be checked for RPC access via the rpcIp and rpcPort. The user and password - must be specified via HTTP's basic authentication method. - As a client, supply this to the server via HTTP's basic authentication - method. + The minimum number of trusted validations a ledger must have before + the server considers it fully validated. ''; + type = types.int; + default = 3; }; - rpcStartup = mkOption { - example = [ ''"command" : "log_level"'' ''"partition" : "ripplecalc"'' ''"severity" : "trace"'' ]; - description = "List of RPC commands to run at startup."; + ledgerHistory = mkOption { + description = '' + The number of past ledgers to acquire on server startup and the minimum + to maintain while running. + ''; + type = types.either types.int (types.enum ["full"]); + default = 1296000; # 1 month }; - rpcSecure = mkOption { - default = false; + fetchDepth = mkOption { description = '' - false: Server certificates are not provided for RPC clients using SSL [default] - true: Client RPC connections wil be provided with SSL certificates. + The number of past ledgers to serve to other peers that request historical + ledger data (or "full" for no limit). + ''; + type = types.either types.int (types.enum ["full"]); + default = "full"; + }; - Note that if rpc_secure is enabled, it will also be necessasry to configure the - certificate file settings located in rpcSslCert, rpcSslChain, and rpcSslKey + sntpServers = mkOption { + description = '' + IP address or domain of NTP servers to use for time synchronization.; ''; + type = types.listOf types.str; + default = [ + "time.windows.com" + "time.apple.com" + "time.nist.gov" + "pool.ntp.org" + ]; + }; + + logLevel = mkOption { + description = "Logging verbosity."; + type = types.enum ["debug" "error" "info"]; + default = "error"; }; - */ extraConfig = mkOption { default = ""; @@ -275,8 +373,11 @@ in ''; }; + config = mkOption { + internal = true; + default = pkgs.writeText "rippled.conf" rippledCfg; + }; }; - }; @@ -288,27 +389,21 @@ in { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; - home = "/var/lib/rippled"; + home = cfg.databasePath; + createHome = true; }; systemd.services.rippled = { - path = [ pkgs.rippled ]; - after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.rippled}/bin/rippled --fg -q --conf ${rippledStateCfgFile}"; - WorkingDirectory = "/var/lib/rippled"; + ExecStart = "${cfg.package}/bin/rippled --fg --conf ${cfg.config}"; + User = "rippled"; }; }; - networking.firewall.allowedTCPPorts = mkIf (cfg.peerIp != null) [ cfg.peerPort ]; + environment.systemPackages = [ cfg.package ]; - system.activationScripts.rippled = '' - mkdir -p /var/{lib,log}/rippled - chown -R rippled /var/{lib,log}/rippled - ln -sf ${rippledCfgFile} ${rippledStateCfgFile} - ''; }; } diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 0a06291da2a4..b6cf397f35c0 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -90,17 +90,9 @@ in { ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} ''} ''; - User = "cadvisor"; }; }; - virtualisation.docker.enable = true; - - users.extraUsers = singleton { - name = "cadvisor"; - uid = config.ids.uids.cadvisor; - description = "Cadvisor user"; - extraGroups = [ "docker" ]; - }; + virtualisation.docker.enable = mkDefault true; }; } diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index ce70739abbc4..0143d2e327bd 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -20,6 +20,10 @@ let cfg.collectors)} ''; + cmdLineOpts = concatStringsSep " " ( + [ "-h=${cfg.bosunHost}" "-c=${collectors}" ] ++ cfg.extraOpts + ); + in { options = { @@ -79,6 +83,15 @@ in { ''; }; + extraOpts = mkOption { + type = with types; listOf str; + default = []; + example = [ "-d" ]; + description = '' + Extra scollector command line options + ''; + }; + }; }; @@ -95,9 +108,7 @@ in { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = '' - ${cfg.package}/bin/scollector -h=${cfg.bosunHost} -c=${collectors} - ''; + ExecStart = "${cfg.package}/bin/scollector ${cmdLineOpts}"; }; }; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 8c79bf663d15..d6babb8e9a51 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -27,7 +27,7 @@ let [ global ] security = ${cfg.securityType} passwd program = /var/setuid-wrappers/passwd %u - pam password change = ${toString cfg.syncPasswordsByPam} + pam password change = ${if cfg.syncPasswordsByPam then "yes" else "no"} invalid users = ${toString cfg.invalidUsers} ${cfg.extraConfig} diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix new file mode 100644 index 000000000000..648097274641 --- /dev/null +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -0,0 +1,75 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.u9fs; +in +{ + + options = { + + services.u9fs = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to run the u9fs 9P server for Unix."; + }; + + listenStreams = mkOption { + type = types.listOf types.str; + default = [ "564" ]; + example = [ "192.168.16.1:564" ]; + description = '' + Sockets to listen for clients on. + See <command>man 5 systemd.socket</command> for socket syntax. + ''; + }; + + extraArgs = mkOption { + type = types.str; + default = ""; + example = "-a none -u nobody"; + description = + '' + Extra arguments to pass on invocation, + see <command>man 4 u9fs</command> + ''; + }; + + fsroot = mkOption { + type = types.path; + default = "/"; + example = "/srv"; + description = "File system root to serve to clients."; + }; + + }; + + }; + + config = mkIf cfg.enable { + + systemd = { + sockets.u9fs = { + description = "U9fs Listening Socket"; + wantedBy = [ "sockets.target" ]; + inherit (cfg) listenStreams; + socketConfig.Accept = "yes"; + }; + services."u9fs@" = { + description = "9P Protocol Server"; + reloadIfChanged = true; + requires = [ "u9fs.socket" ]; + serviceConfig = + { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs} ${cfg.fsroot}"; + StandardInput = "socket"; + StandardError = "journal"; + }; + }; + }; + + }; + +} diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix new file mode 100644 index 000000000000..4301da288814 --- /dev/null +++ b/nixos/modules/services/networking/aiccu.nix @@ -0,0 +1,195 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.aiccu; + showBool = b: if b then "true" else "false"; + notNull = a: ! isNull a; + configFile = pkgs.writeText "aiccu.conf" '' + ${if notNull cfg.username then "username " + cfg.username else ""} + ${if notNull cfg.password then "password " + cfg.password else ""} + protocol ${cfg.protocol} + server ${cfg.server} + ipv6_interface ${cfg.interfaceName} + verbose ${showBool cfg.verbose} + daemonize true + automatic ${showBool cfg.automatic} + requiretls ${showBool cfg.requireTLS} + pidfile ${cfg.pidFile} + defaultroute ${showBool cfg.defaultRoute} + ${if notNull cfg.setupScript then cfg.setupScript else ""} + makebeats ${showBool cfg.makeHeartBeats} + noconfigure ${showBool cfg.noConfigure} + behindnat ${showBool cfg.behindNAT} + ${if cfg.localIPv4Override then "local_ipv4_override" else ""} + ''; + +in { + + options = { + + services.aiccu = { + + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel"; + }; + + username = mkOption { + type = with types; nullOr str; + default = null; + example = "FAB5-SIXXS"; + description = "Login credential"; + }; + + password = mkOption { + type = with types; nullOr str; + default = null; + example = "TmAkRbBEr0"; + description = "Login credential"; + }; + + protocol = mkOption { + type = types.str; + default = "tic"; + example = "tic|tsp|l2tp"; + description = "Protocol to use for setting up the tunnel"; + }; + + server = mkOption { + type = types.str; + default = "tic.sixxs.net"; + example = "enabled.ipv6server.net"; + description = "Server to use for setting up the tunnel"; + }; + + interfaceName = mkOption { + type = types.str; + default = "aiccu"; + example = "sixxs"; + description = '' + The name of the interface that will be used as a tunnel interface. + On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels + or tunX (eg tun0) for AYIYA tunnels. + ''; + }; + + tunnelID = mkOption { + type = with types; nullOr str; + default = null; + example = "T12345"; + description = "The tunnel id to use, only required when there are multiple tunnels in the list"; + }; + + verbose = mkOption { + type = types.bool; + default = false; + example = true; + description = "Be verbose?"; + }; + + automatic = mkOption { + type = types.bool; + default = true; + example = false; + description = "Automatic Login and Tunnel activation"; + }; + + requireTLS = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + When set to true, if TLS is not supported on the server + the TIC transaction will fail. + When set to false, it will try a starttls, when that is + not supported it will continue. + In any case if AICCU is build with TLS support it will + try to do a 'starttls' to the TIC server to see if that + is supported. + ''; + }; + + pidFile = mkOption { + type = types.path; + default = "/run/aiccu.pid"; + example = "/var/lib/aiccu/aiccu.pid"; + description = "Location of PID File"; + }; + + defaultRoute = mkOption { + type = types.bool; + default = true; + example = false; + description = "Add a default route"; + }; + + setupScript = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/aiccu/fix-subnets.sh"; + description = "Script to run after setting up the interfaces"; + }; + + makeHeartBeats = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + In general you don't want to turn this off + Of course only applies to AYIYA and heartbeat tunnels not to static ones + ''; + }; + + noConfigure = mkOption { + type = types.bool; + default = false; + example = true; + description = "Don't configure anything"; + }; + + behindNAT = mkOption { + type = types.bool; + default = false; + example = true; + description = "Notify the user that a NAT-kind network is detected"; + }; + + localIPv4Override = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Overrides the IPv4 parameter received from TIC + This allows one to configure a NAT into "DMZ" mode and then + forwarding the proto-41 packets to an internal host. + + This is only needed for static proto-41 tunnels! + AYIYA and heartbeat tunnels don't require this. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd.services.aiccu = { + description = "Automatic IPv6 Connectivity Client Utility"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.aiccu}/bin/aiccu start ${configFile}"; + ExecStop = "${pkgs.aiccu}/bin/aiccu stop"; + Type = "forking"; + PIDFile = cfg.pidFile; + Restart = "no"; # aiccu startup errors are serious, do not pound the tic server or be banned. + }; + }; + + }; +} diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 3ae010e81070..5308fd995085 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -178,7 +178,7 @@ in ExecReload = "${pkgs.consul}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; - TimeoutStartSec = "${toString (20 + (3 * cfg.joinRetries))}s"; + TimeoutStartSec = "0"; } // (optionalAttrs (cfg.leaveOnStop) { ExecStop = "${pkgs.consul}/bin/consul leave"; }); @@ -209,13 +209,14 @@ in echo "$ADDR" } echo "{" > /etc/consul-addrs.json + delim=" " '' + concatStrings (flip mapAttrsToList cfg.interface (name: i: optionalString (i != null) '' - echo " \"${name}_addr\": \"$(getAddr "${i}")\"," >> /etc/consul-addrs.json + echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json + delim="," '')) + '' - echo " \"\": \"\"" >> /etc/consul-addrs.json echo "}" >> /etc/consul-addrs.json ''; postStart = '' diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index bb94a8dacfa2..f01deb6ee7c8 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -3,24 +3,22 @@ let inherit (lib) mkOption mkIf singleton; - inherit (pkgs) ddclient; stateDir = "/var/spool/ddclient"; - ddclientUser = "ddclient"; - - ddclientFlags = "-foreground -file ${ddclientCfg}"; - + ddclientFlags = "-foreground -verbose -noquiet -file ${ddclientCfg}"; + ddclientPIDFile = "${stateDir}/ddclient.pid"; ddclientCfg = pkgs.writeText "ddclient.conf" '' daemon=600 cache=${stateDir}/ddclient.cache - pid=${stateDir}/ddclient.pid - use=${config.services.ddclient.web} + pid=${ddclientPIDFile} + use=${config.services.ddclient.use} login=${config.services.ddclient.username} password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} server=${config.services.ddclient.server} + ssl=${if config.services.ddclient.ssl then "yes" else "yes"} wildcard=YES ${config.services.ddclient.domain} ${config.services.ddclient.extraConfig} @@ -34,10 +32,11 @@ in options = { - services.ddclient = { + services.ddclient = with lib.types; { enable = mkOption { default = false; + type = bool; description = '' Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org). ''; @@ -45,6 +44,7 @@ in domain = mkOption { default = ""; + type = str; description = '' Domain name to synchronize. ''; @@ -52,76 +52,93 @@ in username = mkOption { default = ""; + type = str; description = '' Username. ''; }; password = mkOption { - default = "" ; + default = ""; + type = str; description = '' Password. ''; }; protocol = mkOption { - default = "dyndns2" ; + default = "dyndns2"; + type = str; description = '' - Protocol to use with dynamic DNS provider. (see also, http://sourceforge.net/apps/trac/ddclient/wiki/Protocols) + Protocol to use with dynamic DNS provider (see http://sourceforge.net/apps/trac/ddclient/wiki/Protocols). ''; }; server = mkOption { - default = "members.dyndns.org" ; + default = ""; + type = str; description = '' - Server + Server address. + ''; + }; + + ssl = mkOption { + default = true; + type = bool; + description = '' + Whether to use to use SSL/TLS to connect to dynamic DNS provider. ''; }; extraConfig = mkOption { - default = "" ; + default = ""; + type = str; description = '' Extra configuration. Contents will be added verbatim to the configuration file. ''; }; - web = mkOption { - default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ; - description = ""; + use = mkOption { + default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; + type = str; + description = '' + Method to determine the IP address to send to the dymanic DNS provider. + ''; }; - }; - }; ###### implementation config = mkIf config.services.ddclient.enable { - - environment.systemPackages = [ ddclient ]; - - users.extraUsers = singleton - { name = ddclientUser; - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - home = stateDir; - }; - - jobs.ddclient = - { name = "ddclient"; - startOn = "startup"; + environment.systemPackages = [ ddclient ]; - preStart = - '' - mkdir -m 0755 -p ${stateDir} - chown ${ddclientUser} ${stateDir} - ''; + users.extraUsers = singleton { + name = ddclientUser; + uid = config.ids.uids.ddclient; + description = "ddclient daemon user"; + home = stateDir; + }; - exec = "${ddclient}/bin/ddclient ${ddclientFlags}"; + systemd.services.ddclient = { + description = "Dynamic DNS Client"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + # This may change back to forking if too many problems occur: + type = "simple"; + User = ddclientUser; + Group = "nogroup"; #TODO get this to work + PermissionsStartOnly = "true"; + PIDFile = ddclientPIDFile; + ExecStartPre = '' + ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}" + ''; + ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}"; + #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this? }; - + }; }; - } diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index fbb211911f1c..7ddabf73106e 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -82,7 +82,7 @@ in systemd.services.dnsmasq = { description = "dnsmasq daemon"; - after = [ "network.target" "systemd-resolved.conf" ]; + after = [ "network.target" "systemd-resolved.service" ]; wantedBy = [ "multi-user.target" ]; path = [ dnsmasq ]; preStart = '' diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 887ea79c34b1..09e48ec4bff0 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -18,42 +18,8 @@ with lib; }; config = mkOption { - type = types.lines; - default = - '' - global - log 127.0.0.1 local6 - maxconn 24000 - daemon - nbproc 1 - - defaults - mode http - option httpclose - - # Remove requests from the queue if people press stop button - option abortonclose - - # Try to connect this many times on failure - retries 3 - - # If a client is bound to a particular backend but it goes down, - # send them to a different one - option redispatch - - monitor-uri /haproxy-ping - - timeout connect 7s - timeout queue 300s - timeout client 300s - timeout server 300s - - # Enable status page at this URL, on the port HAProxy is bound to - stats enable - stats uri /haproxy-status - stats refresh 5s - stats realm Haproxy statistics - ''; + type = types.nullOr types.lines; + default = null; description = '' Contents of the HAProxy configuration file, <filename>haproxy.conf</filename>. @@ -66,6 +32,11 @@ with lib; config = mkIf cfg.enable { + assertions = [{ + assertion = cfg.config != null; + message = "You must provide services.haproxy.config."; + }]; + systemd.services.haproxy = { description = "HAProxy"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f72c7fb39d6c..3a64d3f09e02 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -71,6 +71,13 @@ let ${coreutils}/bin/rm -f $tmp $tmp.ns ''; + # pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0 + dispatcherTypesSubdirMap = { + "basic" = ""; + /*"pre-up" = "pre-up.d/"; + "pre-down" = "pre-down.d/";*/ + }; + in { ###### interface @@ -118,6 +125,30 @@ in { ''; }; + dispatcherScripts = mkOption { + type = types.listOf (types.submodule { + options = { + source = mkOption { + type = types.str; + description = '' + A script source. + ''; + }; + + type = mkOption { + type = types.enum (attrNames dispatcherTypesSubdirMap); + default = "basic"; + description = '' + Dispatcher hook type. Only basic hooks are currently available. + ''; + }; + }; + }); + default = []; + description = '' + A list of scripts which will be executed in response to network events. + ''; + }; }; }; @@ -155,7 +186,11 @@ in { ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; - }; + } + ++ lib.imap (i: s: { + text = s.source; + target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; + }) cfg.dispatcherScripts; environment.systemPackages = cfg.packages ++ [ networkmanager_openvpn diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 140b7ed2da37..36d9f5d2f166 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -9,6 +9,14 @@ let stateDir = "/var/lib/nsd"; pidFile = stateDir + "/var/nsd.pid"; + nsdPkg = pkgs.nsd.override { + bind8Stats = cfg.bind8Stats; + ipv6 = cfg.ipv6; + ratelimit = cfg.ratelimit.enable; + rootServer = cfg.rootServer; + zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0; + }; + zoneFiles = pkgs.stdenv.mkDerivation { preferLocalBuild = true; name = "nsd-env"; @@ -107,6 +115,7 @@ let zone: name: "${name}" zonefile: "${stateDir}/zones/${name}" + ${maybeString "zonestats: " zone.zoneStats} ${maybeString "outgoing-interface: " zone.outgoingInterface} ${forEach " rrl-whitelist: " zone.rrlWhitelist} @@ -270,6 +279,19 @@ let Use imports or pkgs.lib.readFile if you don't want this data in your config file. ''; }; + + zoneStats = mkOption { + type = types.nullOr types.str; + default = null; + example = "%s"; + description = '' + When set to something distinct to null NSD is able to collect + statistics per zone. All statistics of this zone(s) will be added + to the group specified by this given name. Use "%s" to use the zones + name as the group. The groups are output from nsd-control stats + and stats_noreset. + ''; + }; }; }; @@ -286,6 +308,15 @@ in ''; }; + bind8Stats = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Wheter to enable BIND8 like statisics. + ''; + }; + rootServer = mkOption { type = types.bool; default = false; @@ -659,13 +690,6 @@ in config = mkIf cfg.enable { - # this is not working :( - nixpkgs.config.nsd = { - ipv6 = cfg.ipv6; - ratelimit = cfg.ratelimit.enable; - rootServer = cfg.rootServer; - }; - users.extraGroups = singleton { name = username; gid = config.ids.gids.nsd; @@ -688,7 +712,7 @@ in serviceConfig = { PIDFile = pidFile; Restart = "always"; - ExecStart = "${pkgs.nsd}/sbin/nsd -d -c ${configFile}"; + ExecStart = "${nsdPkg}/sbin/nsd -d -c ${configFile}"; }; preStart = '' diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c0ad9e17c413..b11f996c63cf 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -195,12 +195,14 @@ in default = [ { path = "/etc/ssh/ssh_host_dsa_key"; type = "dsa"; - bits = 1024; } { path = "/etc/ssh/ssh_host_ecdsa_key"; type = "ecdsa"; bits = 521; } + { path = "/etc/ssh/ssh_host_ed25519_key"; + type = "ed25519"; + } ]; description = '' NixOS can automatically generate SSH host keys. This option @@ -323,7 +325,7 @@ in ${flip concatMapStrings cfg.hostKeys (k: '' if ! [ -f "${k.path}" ]; then - ssh-keygen -t "${k.type}" -b "${toString k.bits}" -f "${k.path}" -N "" + ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N "" fi '')} ''; @@ -379,6 +381,8 @@ in UsePAM yes + UsePrivilegeSeparation sandbox + AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} ${concatMapStrings (port: '' Port ${toString port} diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 679aa81a13da..b573a356b351 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -183,7 +183,7 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - systemd.services.cupsd = + systemd.services.cups = { description = "CUPS Printing Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix new file mode 100644 index 000000000000..919c2c2b0e15 --- /dev/null +++ b/nixos/modules/services/security/munge.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.munge; + +in + +{ + + ###### interface + + options = { + + services.munge = { + enable = mkEnableOption "munge service"; + + password = mkOption { + default = "/etc/munge/munge.key"; + type = types.string; + description = '' + The path to a daemon's secret key. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.munge ]; + + systemd.services.munged = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ pkgs.munge pkgs.coreutils ]; + + preStart = '' + chmod 0700 ${cfg.password} + mkdir -p /var/lib/munge -m 0711 + mkdir -p /var/log/munge -m 0700 + mkdir -p /run/munge -m 0755 + ''; + + serviceConfig = { + ExecStart = "${pkgs.munge}/bin/munged --syslog --key-file ${cfg.password}"; + PIDFile = "/run/munge/munged.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + + }; + + }; + +} diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1b38ea3b679b..135113b3ceb1 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -9,28 +9,16 @@ let homeDir = "/var/lib/transmission"; downloadDir = "${homeDir}/Downloads"; incompleteDir = "${homeDir}/.incomplete"; + settingsDir = "${homeDir}/.config/transmission-daemon"; - settingsFile = "${settingsDir}/settings.json"; + settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); # Strings must be quoted, ints and bools must not (for settings.json). toOption = x: if x == true then "true" else if x == false then "false" else if isInt x then toString x - else toString ''\"${x}\"''; - - # All lines in settings.json end with a ',' (comma), except for the last - # line. This is standard JSON. But a comma can also appear *inside* some - # fields, notably the "rpc-whitelist" field. This is difficult to handle in - # sed so we simply ignore it and say that if you want to change the option at - # the last line of settings.json, you have to do it manually. At this time of - # writing, the last option is "utp-enable":true. - attrsToSedArgs = as: - concatStrings (concatLists (mapAttrsToList (name: value: - #map (x: '' -e 's=\(\"${name}\":\)[^,]*\(.*\)=\1 ${toOption x}\2=' '') # breaks if comma inside value field - map (x: '' -e 's=\(\"${name}\":\).*=\1 ${toOption x},=' '') # always append ',' (breaks last line in settings.json) - (if isList value then value else [value])) - as)); + else toString ''"${x}"''; # for users in group "transmission" to have access to torrents fullSettings = cfg.settings // { umask = 2; }; @@ -73,7 +61,7 @@ in boolean values must not. See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation and/or look at ${settingsFile}. + documentation. ''; }; @@ -95,7 +83,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. serviceConfig.ExecStartPre = '' - ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs fullSettings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}" + ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json" ''; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6a830827fd78..2b5cba68d457 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -171,6 +171,9 @@ let SSLRandomSeed startup builtin SSLRandomSeed connect builtin + + SSLProtocol All -SSLv2 -SSLv3 + SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 3bea3c3ee1dd..a5e539bc9ba7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -384,8 +384,7 @@ rec { }; adminPassword = mkOption { - description = "The admin password for accessing owncloud. - Warning: this is stored in cleartext in the Nix store!"; + description = "The admin password for accessing owncloud."; }; dbType = mkOption { @@ -571,7 +570,7 @@ rec { chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true - QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','`echo -n "${config.adminPassword}" | ${pkgs.openssl}/bin/openssl dgst -sha1 | ${pkgs.gawk}/bin/awk '{print $2}'`'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');" + QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');" ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true ''; } diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 7e91e7b60eef..2c5e433003c8 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.fcgiwrap; - in { options = { @@ -21,29 +20,53 @@ in { description = "Number of processes to prefork."; }; - bindSocket = mkOption { - type = types.string; - default = "unix:/run/fcgiwrap.sock"; - description = '' - Socket to bind to. Valid socket URLs are: - unix:/path/to/socket for Unix sockets - tcp:dot.ted.qu.ad:port for IPv4 sockets - tcp6:[ipv6_addr]:port for IPv6 sockets - ''; + socketType = mkOption { + type = types.addCheck types.str (t: t == "unix" || t == "tcp" || t == "tcp6"); + default = "unix"; + description = "Socket type: 'unix', 'tcp' or 'tcp6'."; + }; + + socketAddress = mkOption { + type = types.str; + default = "/run/fcgiwrap.sock"; + example = "1.2.3.4:5678"; + description = "Socket address. In case of a UNIX socket, this should be its filesystem path."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = "User permissions for the socket."; + }; + + group = mkOption { + type = types.nullOr types.str; + default = null; + description = "Group permissions for the socket."; }; }; }; config = mkIf cfg.enable { - systemd.services.fcgiwrap = { after = [ "nss-user-lookup.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional (cfg.socketType != "unix") "multi-user.target"; serviceConfig = { - ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} -s ${cfg.bindSocket}"; - }; + ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} ${ + if (cfg.socketType != "unix") then "-s ${cfg.socketType}:${cfg.socketAddress}" else "" + }"; + } // (if cfg.user != null && cfg.group != null then { + User = cfg.user; + Group = cfg.group; + } else { } ); }; + systemd.sockets = if (cfg.socketType == "unix") then { + fcgiwrap = { + wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = cfg.socketAddress; + }; + } else { }; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0af1b58b7cae..0f21ef012639 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -102,6 +102,9 @@ in ''; serviceConfig = { ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 9c3c65dcfaa7..02e51577e3e2 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -88,7 +88,9 @@ in }; environment.systemPackages = - [ + filter isDerivation (builtins.attrValues plasma5) + ++ filter isDerivation (builtins.attrValues kf5) + ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme kdeApps.kde-baseapps @@ -97,13 +99,12 @@ in kdeApps.konsole kdeApps.oxygen-icons + kdeApps.kde-runtime + pkgs.hicolor_icon_theme pkgs.orion # GTK theme, nearly identical to Breeze - ] - ++ filter isDerivation (builtins.attrValues plasma5) - ++ filter isDerivation (builtins.attrValues kf5) - ++ phononBackendPackages; + ] ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; @@ -121,6 +122,8 @@ in fonts.fonts = [ plasma5.oxygen-fonts ]; + programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; + # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 6a14a163c19a..fce5bf11f053 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -46,7 +46,6 @@ in pkgs.which # Needed by the xfce's xinitrc script. pkgs.xfce.exo pkgs.xfce.gtk_xfce_engine - pkgs.xfce.libxfcegui4 # For the icons. pkgs.xfce.mousepad pkgs.xfce.ristretto pkgs.xfce.terminal diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 601971d27b69..c5012dbb5e30 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -89,6 +89,10 @@ let ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} + # Tell systemd about our $DISPLAY. This is needed by the + # ssh-agent unit. + ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY + # Load X defaults. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then @@ -204,6 +208,14 @@ in description = "Shell commands executed just before the window or desktop manager is started."; }; + hiddenUsers = mkOption { + type = types.listOf types.str; + default = [ "nobody" ]; + description = '' + A list of users which will not be shown in the display manager. + ''; + }; + desktopManagerHandlesLidAndPower = mkOption { type = types.bool; default = true; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index b3da0cda04a3..a7ebafa28b38 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -95,15 +95,23 @@ in auth required pam_succeed_if.so uid >= 1000 quiet auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so - auth sufficient pam_unix.so nullok likeauth - auth required pam_deny.so + auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth + ${optionalString config.security.pam.enableEcryptfs + "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} + + ${optionalString (! config.security.pam.enableEcryptfs) + "auth required pam_deny.so"} account sufficient pam_unix.so password requisite pam_unix.so nullok sha512 + ${optionalString config.security.pam.enableEcryptfs + "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so + ${optionalString config.security.pam.enableEcryptfs + "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start @@ -115,15 +123,22 @@ in auth required pam_succeed_if.so uid >= 1000 quiet auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so - auth sufficient pam_unix.so nullok likeauth - auth required pam_deny.so + auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth + ${optionalString config.security.pam.enableEcryptfs + "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} + ${optionalString (! config.security.pam.enableEcryptfs) + "auth required pam_deny.so"} account sufficient pam_unix.so password requisite pam_unix.so nullok sha512 + ${optionalString config.security.pam.enableEcryptfs + "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so + ${optionalString config.security.pam.enableEcryptfs + "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index 42eaacfe84af..d0b69c5452c2 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -38,7 +38,7 @@ let ''} [X-*-Greeter] - HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10 + HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers} PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so ${optionalString (cfg.themeDirectory != null) '' diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 98e3fd6d6a5d..e7ddb7ff254d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -18,6 +18,9 @@ let exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} ''; + theme = pkgs.gnome3.gnome_themes_standard; + icons = pkgs.gnome3.gnome_icon_theme; + # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. @@ -26,19 +29,16 @@ let buildInputs = [ pkgs.makeWrapper ]; buildCommand = '' - mkdir -p $out/gtk-3.0/ - - # This wrapper ensures that we actually get ?? (fonts should be OK now) + # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ - --set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \ - --set XDG_CONFIG_HOME $out/ - - # We need this to ensure that it actually tries to find icons from gnome-icon-theme - cat - > $out/gtk-3.0/settings.ini << EOF - [Settings] - gtk-icon-theme-name=gnome - EOF + --prefix PATH : "${pkgs.glibc}/bin" \ + --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \ + --set GTK_PATH "${theme}:${pkgs.gtk3}" \ + --set GTK_EXE_PREFIX "${theme}" \ + --set GTK_DATA_PREFIX "${theme}" \ + --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ + --set XDG_CONFIG_HOME "${theme}/share" cat - > $out/lightdm-gtk-greeter.desktop << EOF [Desktop Entry] @@ -50,6 +50,14 @@ let ''; }; + usersConf = writeText "users.conf" + '' + [UserList] + minimum-uid=500 + hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} + hidden-shells=/run/current-system/sw/sbin/nologin + ''; + lightdmConf = writeText "lightdm.conf" '' [LightDM] @@ -63,10 +71,19 @@ let greeter-session = ${cfg.greeter.name} ''; + gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" + '' + [greeter] + theme-name = Adwaita + icon-theme-name = Adwaita + background = ${cfg.background} + ''; + in { options = { services.xserver.displayManager.lightdm = { + enable = mkOption { default = false; description = '' @@ -84,6 +101,14 @@ in package = wrappedGtkGreeter; }; }; + + background = mkOption { + default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"; + description = '' + The background image or color to use. + ''; + }; + }; }; @@ -97,10 +122,14 @@ in # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH execCmd = '' export PATH=${lightdm}/sbin:$PATH - ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} + exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run ''; }; + environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf; + environment.etc."lightdm/lightdm.conf".source = lightdmConf; + environment.etc."lightdm/users.conf".source = usersConf; + services.dbus.enable = true; services.dbus.packages = [ lightdm ]; @@ -109,7 +138,7 @@ in users.extraUsers.lightdm = { createHome = true; - home = "/var/lib/lightdm"; + home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix new file mode 100644 index 000000000000..c14c13b1cba9 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -0,0 +1,110 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + dmcfg = xcfg.displayManager; + cfg = dmcfg.sddm; + xEnv = config.systemd.services."display-manager".environment; + + xserverWrapper = pkgs.writeScript "xserver-wrapper" '' + #!/bin/sh + ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} + exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + ''; + + cfgFile = pkgs.writeText "sddm.conf" '' + [General] + HaltCommand=${pkgs.systemd}/bin/systemctl poweroff + RebootCommand=${pkgs.systemd}/bin/systemctl reboot + + [Theme] + Current=${cfg.theme} + + [Users] + MaximumUid=${toString config.ids.uids.nixbld} + HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} + HideShells=/run/current-system/sw/sbin/nologin + + [XDisplay] + MinimumVT=${toString xcfg.tty} + ServerPath=${xserverWrapper} + XephyrPath=${pkgs.xorg.xorgserver}/bin/Xephyr + SessionCommand=${dmcfg.session.script} + SessionDir=${dmcfg.session.desktops} + XauthPath=${pkgs.xorg.xauth}/bin/xauth + ''; + +in +{ + options = { + + services.xserver.displayManager.sddm = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable sddm as the display manager. + ''; + }; + + theme = mkOption { + type = types.str; + default = "maui"; + description = '' + Greeter theme to use. + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + + services.xserver.displayManager.slim.enable = false; + + services.xserver.displayManager.job = { + logsXsession = true; + + #execCmd = "${pkgs.sddm}/bin/sddm"; + execCmd = "exec ${pkgs.sddm}/bin/sddm"; + }; + + security.pam.services = { + sddm = { + allowNullPassword = true; + startSession = true; + }; + + sddm-greeter.text = '' + auth required pam_succeed_if.so audit quiet_success user = sddm + auth optional pam_permit.so + + account required pam_succeed_if.so audit quiet_success user = sddm + account sufficient pam_unix.so + + password required pam_deny.so + + session required pam_succeed_if.so audit quiet_success user = sddm + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional pam_keyinit.so force revoke + session optional pam_permit.so + ''; + }; + + users.extraUsers.sddm = { + createHome = true; + home = "/var/lib/sddm"; + group = "sddm"; + uid = config.ids.uids.sddm; + }; + + environment.etc."sddm.conf".source = cfgFile; + + users.extraGroups.sddm.gid = config.ids.gids.sddm; + + }; +} diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix index 6e6e88e67218..f8386b5e333b 100644 --- a/nixos/modules/services/x11/hardware/multitouch.nix +++ b/nixos/modules/services/x11/hardware/multitouch.nix @@ -2,9 +2,15 @@ with lib; -let cfg = config.services.xserver.multitouch; in - -{ +let cfg = config.services.xserver.multitouch; + disabledTapConfig = '' + Option "MaxTapTime" "0" + Option "MaxTapMove" "0" + Option "TapButton1" "0" + Option "TapButton2" "0" + Option "TapButton3" "0" + ''; +in { options = { @@ -30,6 +36,33 @@ let cfg = config.services.xserver.multitouch; in description = "Whether to ignore touches detected as being the palm (i.e when typing)"; }; + tapButtons = mkOption { + type = types.bool; + default = true; + example = false; + description = "Whether to enable tap buttons."; + }; + + buttonsMap = mkOption { + type = types.listOf types.int; + default = [3 2 0]; + example = [1 3 2]; + description = "Remap touchpad buttons."; + apply = map toString; + }; + + additionalOptions = mkOption { + type = types.str; + default = ""; + example = '' + Option "ScaleDistance" "50" + Option "RotateDistance" "60" + ''; + description = '' + Additional options for mtrack touchpad driver. + ''; + }; + }; }; @@ -46,12 +79,17 @@ let cfg = config.services.xserver.multitouch; in Identifier "Touchpads" Driver "mtrack" Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}" + Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" + ${optionalString (!cfg.tapButtons) disabledTapConfig} ${optionalString cfg.invertScroll '' Option "ScrollUpButton" "5" Option "ScrollDownButton" "4" Option "ScrollLeftButton" "7" Option "ScrollRightButton" "6" ''} + ${cfg.additionalOptions} EndSection ''; diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix new file mode 100644 index 000000000000..556d9e187fdd --- /dev/null +++ b/nixos/modules/services/x11/unclutter.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: +with lib; +let cfg = config.services.unclutter; +in { + options = { + services.unclutter.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable unclutter to hide your mouse cursor when inactive"; + }; + + services.unclutter.arguments = mkOption { + description = "Arguments to pass to unclutter command"; + default = "-idle 1"; + type = types.uniq types.string; + }; + }; + + config = mkIf cfg.enable { + systemd.services.unclutter = { + description = "unclutter"; + requires = [ "display-manager.service" ]; + after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; + serviceConfig.ExecStart = '' + ${pkgs.unclutter}/bin/unclutter ${cfg.arguments} + ''; + environment = { DISPLAY = ":0"; }; + serviceConfig.Restart = "always"; + }; + }; +} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 628d475c9684..1912b8aa5a91 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -8,14 +8,17 @@ in { imports = [ + ./afterstep.nix ./bspwm.nix ./compiz.nix + ./fluxbox.nix ./herbstluftwm.nix ./i3.nix ./metacity.nix ./openbox.nix ./sawfish.nix ./stumpwm.nix + ./spectrwm.nix ./twm.nix ./windowmaker.nix ./wmii.nix diff --git a/nixos/modules/services/x11/window-managers/spectrwm.nix b/nixos/modules/services/x11/window-managers/spectrwm.nix new file mode 100644 index 000000000000..5db6b41ba8fd --- /dev/null +++ b/nixos/modules/services/x11/window-managers/spectrwm.nix @@ -0,0 +1,33 @@ + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.spectrwm; +in + +{ + options = { + services.xserver.windowManager.spectrwm = { + enable = mkOption { + default = false; + example = true; + description = "Enable the spectrwm window manager."; + }; + }; + }; + + config = mkIf cfg.enable { + services.xserver.windowManager = { + session = [{ + name = "spectrwm"; + start = '' + ${pkgs.spectrwm}/bin/spectrwm & + waitPID=$! + ''; + }]; + }; + environment.systemPackages = [ pkgs.spectrwm ]; + }; +} diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index dbe13c022f09..ce36bac2bdcf 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -9,19 +9,21 @@ use Cwd 'abs_path'; my $out = "@out@"; +# To be robust against interruption, record what units need to be started etc. my $startListFile = "/run/systemd/start-list"; my $restartListFile = "/run/systemd/restart-list"; my $reloadListFile = "/run/systemd/reload-list"; my $action = shift @ARGV; -if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test")) { +if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { print STDERR <<EOF; Usage: $0 [switch|boot|test] -switch: make the configuration the boot default and activate now -boot: make the configuration the boot default -test: activate the configuration, but don\'t make it the boot default +switch: make the configuration the boot default and activate now +boot: make the configuration the boot default +test: activate the configuration, but don\'t make it the boot default +dry-activate: show what would be done if this configuration were activated EOF exit 1; } @@ -56,8 +58,6 @@ EOF exit 100; } -syslog(LOG_NOTICE, "switching to system configuration $out"); - # Ignore SIGHUP so that we're not killed if we're running on (say) # virtual console 1 and we restart the "tty1" unit. $SIG{PIPE} = "IGNORE"; @@ -116,6 +116,11 @@ sub boolIsTrue { return $s eq "yes" || $s eq "true"; } +sub recordUnit { + my ($fn, $unit) = @_; + write_file($fn, { append => 1 }, "$unit\n") if $action ne "dry-activate"; +} + # As a fingerprint for determining whether a unit has changed, we use # its absolute path. If it has an override file, we append *its* # absolute path as well. @@ -124,9 +129,20 @@ sub fingerprintUnit { return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : ""); } -# Stop all services that no longer exist or have changed in the new -# configuration. -my (@unitsToStop, @unitsToSkip); +# Figure out what units need to be stopped, started, restarted or reloaded. +my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload); + +my %unitsToFilter; # units not shown + +$unitsToStart{$_} = 1 foreach + split('\n', read_file($startListFile, err_mode => 'quiet') // ""); + +$unitsToRestart{$_} = 1 foreach + split('\n', read_file($restartListFile, err_mode => 'quiet') // ""); + +$unitsToReload{$_} = 1 foreach + split '\n', read_file($reloadListFile, err_mode => 'quiet') // ""; + my $activePrev = getActiveUnits; while (my ($unit, $state) = each %{$activePrev}) { my $baseUnit = $unit; @@ -141,7 +157,7 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } elsif ($unit =~ /\.target$/) { @@ -155,7 +171,10 @@ while (my ($unit, $state) = each %{$activePrev}) { # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) { - write_file($startListFile, { append => 1 }, "$unit\n"); + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); + # Don't spam the user with target units that always get started. + $unitsToFilter{$unit} = 1; } } @@ -171,7 +190,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # (unless there is a PartOf dependency), so this is just a # bookkeeping thing to get systemd to do the right thing. if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "no")) { - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } } @@ -180,16 +199,18 @@ while (my ($unit, $state) = each %{$activePrev}) { # Do nothing. These cannot be restarted directly. } elsif ($unit =~ /\.mount$/) { # Reload the changed mount unit to force a remount. - write_file($reloadListFile, { append => 1 }, "$unit\n"); + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { - write_file($reloadListFile, { append => 1 }, "$unit\n"); + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); } elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { - push @unitsToSkip, $unit; + $unitsToSkip{$unit} = 1; } else { # If this unit is socket-activated, then stop the # socket unit(s) as well, and restart the @@ -202,8 +223,9 @@ while (my ($unit, $state) = each %{$activePrev}) { } foreach my $socket (@sockets) { if (defined $activePrev->{$socket}) { - push @unitsToStop, $socket; - write_file($startListFile, { append => 1 }, "$socket\n"); + $unitsToStop{$unit} = 1; + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $socket); $socketActivated = 1; } } @@ -213,7 +235,8 @@ while (my ($unit, $state) = each %{$activePrev}) { # This unit should be restarted instead of # stopped and started. - write_file($restartListFile, { append => 1 }, "$unit\n"); + $unitsToRestart{$unit} = 1; + recordUnit($restartListFile, $unit); } else { @@ -222,10 +245,11 @@ while (my ($unit, $state) = each %{$activePrev}) { # We write this to a file to ensure that the # service gets restarted if we're interrupted. if (!$socketActivated) { - write_file($startListFile, { append => 1 }, "$unit\n"); + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); } - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } } @@ -268,14 +292,16 @@ foreach my $mountPoint (keys %$prevFss) { my $unit = pathToUnitName($mountPoint) . ".mount"; if (!defined $new) { # Filesystem entry disappeared, so unmount it. - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) { # Filesystem type or device changed, so unmount and mount it. - write_file($startListFile, { append => 1 }, "$unit\n"); - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); } elsif ($prev->{options} ne $new->{options}) { # Mount options changes, so remount it. - write_file($reloadListFile, { append => 1 }, "$unit\n"); + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); } } @@ -294,14 +320,51 @@ foreach my $device (keys %$prevSwaps) { # FIXME: update swap options (i.e. its priority). } -if (scalar @unitsToStop > 0) { - @unitsToStop = unique(@unitsToStop); - print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n"; - system("systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors? + +# Should we have systemd re-exec itself? +my $restartSystemd = abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd"); + + +sub filterUnits { + my ($units) = @_; + my @res; + foreach my $unit (sort(keys %{$units})) { + push @res, $unit if !defined $unitsToFilter{$unit}; + } + return @res; +} + +my @unitsToStopFiltered = filterUnits(\%unitsToStop); +my @unitsToStartFiltered = filterUnits(\%unitsToStart); + + +# Show dry-run actions. +if ($action eq "dry-activate") { + print STDERR "would stop the following units: ", join(", ", @unitsToStopFiltered), "\n" + if scalar @unitsToStopFiltered > 0; + print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" + if scalar(keys %unitsToSkip) > 0; + print STDERR "would restart systemd\n" if $restartSystemd; + print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" + if scalar(keys %unitsToRestart) > 0; + print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" + if scalar @unitsToStartFiltered; + print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" + if scalar(keys %unitsToReload) > 0; + exit 0; +} + + +syslog(LOG_NOTICE, "switching to system configuration $out"); + +if (scalar (keys %unitsToStop) > 0) { + print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" + if scalar @unitsToStopFiltered; + system("systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? } -print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n" - if scalar @unitsToSkip > 0; +print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" + if scalar(keys %unitsToSkip) > 0; # Activate the new configuration (i.e., update /etc, make accounts, # and so on). @@ -310,7 +373,7 @@ print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; # Restart systemd if necessary. -if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) { +if ($restartSystemd) { print STDERR "restarting systemd...\n"; system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2; } @@ -327,10 +390,9 @@ system("@systemd@/bin/systemctl", "reload-or-restart", "dbus.service"); # Restart changed services (those that have to be restarted rather # than stopped and started). -my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // "")); -if (scalar @restart > 0) { - print STDERR "restarting the following units: ", join(", ", sort(@restart)), "\n"; - system("@systemd@/bin/systemctl", "restart", "--", @restart) == 0 or $res = 4; +if (scalar(keys %unitsToRestart) > 0) { + print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; + system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; unlink($restartListFile); } @@ -340,17 +402,16 @@ if (scalar @restart > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. -my @start = unique("default.target", "timers.target", "sockets.target", split('\n', read_file($startListFile, err_mode => 'quiet') // "")); -print STDERR "starting the following units: ", join(", ", sort(@start)), "\n"; -system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4; +print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" + if scalar @unitsToStartFiltered; +system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; unlink($startListFile); # Reload units that need it. This includes remounting changed mount # units. -my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // ""); -if (scalar @reload > 0) { - print STDERR "reloading the following units: ", join(", ", sort(@reload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4; +if (scalar(keys %unitsToReload) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; + system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; unlink($reloadListFile); } diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index 4b5e84f53c1a..6153578612c1 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -24,6 +24,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Whether to create symlinks to the system generations under <literal>/boot</literal>. When enabled, @@ -42,6 +43,7 @@ in copyKernels = mkOption { default = false; + type = types.bool; description = " Whether copy the necessary boot files into /boot, so /nix/store is not needed by the boot loader. diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index a166709d39a3..585c8854feec 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -179,6 +179,7 @@ in }; splashImage = mkOption { + type = types.nullOr types.path; example = literalExample "./my-background.png"; description = '' Background image used for GRUB. It must be a 640x480, diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix index 3b33d42b4ae4..374d9524ff1e 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -23,6 +23,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Some systems require a /sbin/init script which is started. Or having it makes starting NixOS easier. diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index d3f32418a64c..1ea3ddd8867c 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -21,6 +21,7 @@ in boot.loader.raspberryPi.enable = mkOption { default = false; + type = types.bool; description = '' Whether to create files with the system generations in <literal>/boot</literal>. diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index a34a13602650..5af644279e5f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -177,20 +177,24 @@ fi if test -e /sys/power/resume -a -e /sys/power/disk; then if test -n "@resumeDevice@"; then resumeDev="@resumeDevice@" + resumeInfo="$(udevadm info -q property "$resumeDev" )" else for sd in @resumeDevices@; do # Try to detect resume device. According to Ubuntu bug: # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1 # When there are multiple swap devices, we can't know where will hibernate # image reside. We can check all of them for swsuspend blkid. - if [ "$(udevadm info -q property "$sd" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then + resumeInfo="$(udevadm info -q property "$sd" )" + if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeDev="$sd" break fi done fi - if test -n "$resumeDev"; then - readlink -f "$resumeDev" > /sys/power/resume 2> /dev/null || echo "failed to resume..." + if test -e "$resumeDev"; then + resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')" + resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')" + echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..." fi fi diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 173453a17f71..42148957be40 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -53,7 +53,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg # Silence chown/chmod to fail gracefully on a readonly filesystem # like squashfs. chown -f 0:30000 /nix/store -chmod -f 1775 /nix/store +chmod -f 1735 /nix/store if [ -n "@readOnlyStore@" ]; then if ! readonly-mountpoint /nix/store; then mount --bind /nix/store /nix/store diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 93782ffa4d58..1ac89c4c2554 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -55,8 +55,7 @@ in boot.zfs = { useGit = mkOption { type = types.bool; - # TODO(wkennington): Revert when 0.6.4 is out - default = versionAtLeast config.boot.kernelPackages.kernel.version "3.19"; + default = false; example = true; description = '' Use the git version of the SPL and ZFS packages. diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 03c42404e5d5..8d26998021d3 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -22,6 +22,7 @@ in # FIXME: still needed? boot.extraTTYs = mkOption { default = []; + type = types.listOf types.string; example = ["tty8" "tty9"]; description = '' Tty (virtual console) devices, in addition to the consoles on diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 70158fc7252b..8223c5a4941e 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -35,7 +35,10 @@ in assertions = [ { assertion = cfg.defaultGatewayWindowSize == null; message = "networking.defaultGatewayWindowSize is not supported by networkd."; - } ]; + } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { + assertion = !rstp; + message = "networking.bridges.${n}.rstp is not supported by networkd."; + }); systemd.services.dhcpcd.enable = mkDefault false; diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 5d1bb631b54f..778cdc5d30dd 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -16,7 +16,7 @@ with lib; Enable sensitivity and speed configuration for trackpoints. ''; }; - + sensitivity = mkOption { default = 128; example = 255; @@ -44,7 +44,7 @@ with lib; Enable scrolling while holding the middle mouse button. ''; }; - + }; }; @@ -70,7 +70,7 @@ with lib; '' Section "InputClass" Identifier "Trackpoint Wheel Emulation" - MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" + MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index c461cf8c00cb..da39dda85353 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -10,6 +10,7 @@ let isExecutable = true; src = ./nixos-container.pl; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + su = "${pkgs.shadow.su}/bin/su"; inherit (pkgs) utillinux; }; @@ -202,7 +203,7 @@ in script = '' mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" + mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers if ! [ -e "$root/etc/os-release" ]; then touch "$root/etc/os-release" fi @@ -211,7 +212,7 @@ in "/nix/var/nix/profiles/per-container/$INSTANCE" \ "/nix/var/nix/gcroots/per-container/$INSTANCE" - cp -f /etc/resolv.conf "$root/etc/resolv.conf" + cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" if [ "$PRIVATE_NETWORK" = 1 ]; then extraFlags+=" --network-veth" @@ -260,11 +261,21 @@ in ip route add $LOCAL_ADDRESS dev $ifaceHost fi fi + + # Get the leader PID so that we can signal it in + # preStop. We can't use machinectl there because D-Bus + # might be shutting down. FIXME: in systemd 219 we can + # just signal systemd-nspawn to do a clean shutdown. + machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid" ''; preStop = '' - machinectl poweroff "$INSTANCE" || true + pid="$(cat /run/containers/$INSTANCE.pid)" + if [ -n "$pid" ]; then + kill -RTMIN+4 "$pid" + fi + rm -f "/run/containers/$INSTANCE.pid" ''; restartIfChanged = false; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 4d493b3896f2..98985d2d2c57 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -129,10 +129,10 @@ in wantedBy = [ "sshd.service" ]; before = [ "sshd.service" ]; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; + after = [ "network-online.target" "ip-up.target" ]; + wants = [ "network-online.target" "ip-up.target" ]; - script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 6 --waitretry=10"; in + script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; in '' # When dealing with cryptographic keys, we want to keep things private. umask 077 @@ -140,7 +140,7 @@ in if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -m 0700 -p /root/.ssh - ${wget} -O /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys + ${wget} -O /root/authorized-keys-metadata http://metadata.google.internal/0.1/meta-data/authorized-keys if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then @@ -156,7 +156,7 @@ in ${flip concatMapStrings config.services.openssh.hostKeys (k : let kName = baseNameOf k.path; in '' echo "trying to obtain SSH private host key ${kName}" - ${wget} -O /root/${kName} http://metadata/0.1/meta-data/attributes/${kName} && : + ${wget} -O /root/${kName} http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : if [ $? -eq 0 -a -e /root/${kName} ]; then countKeys=$((countKeys+1)) mv -f /root/${kName} ${k.path} diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 10d3a6575fb9..22da012e4141 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -32,7 +32,9 @@ in default = ""; description = '' - This is the system-wide LXC config. See lxc.system.conf(5). + This is the system-wide LXC config. See + <citerefentry><refentrytitle>lxc.system.conf</refentrytitle> + <manvolnum>5</manvolnum></citerefentry>. ''; }; @@ -43,7 +45,8 @@ in description = '' Default config (default.conf) for new containers, i.e. for - network config. See lxc.container.conf(5). + network config. See <citerefentry><refentrytitle>lxc.container.conf + </refentrytitle><manvolnum>5</manvolnum></citerefentry>. ''; }; @@ -54,7 +57,9 @@ in description = '' This is the config file for managing unprivileged user network - administration access in LXC. See lxc-user-net(5). + administration access in LXC. See <citerefentry> + <refentrytitle>lxc-user-net</refentrytitle><manvolnum>5</manvolnum> + </citerefentry>. ''; }; diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 94edfb37948a..f1d9e64ee38f 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -8,6 +8,7 @@ use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); my $nsenter = "@utillinux@/bin/nsenter"; +my $su = "@su@"; # Ensure a consistent umask. umask 0022; @@ -22,6 +23,7 @@ Usage: nixos-container list nixos-container start <container-name> nixos-container stop <container-name> nixos-container status <container-name> + nixos-container update <container-name> [--config <string>] nixos-container login <container-name> nixos-container root-login <container-name> nixos-container run <container-name> -- args... @@ -271,14 +273,14 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - runInContainer("su", "root", "-l"); + runInContainer("@su@", "root", "-l"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; # Escape command. my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV); - runInContainer("su", "root", "-l", "-c", "exec " . $s); + runInContainer("@su@", "root", "-l", "-c", "exec " . $s); } elsif ($action eq "show-ip") { diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index 141e70974058..2f40283b3e1d 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -82,7 +82,7 @@ in systemd.services.prlshprint = { description = "Parallels Shared Printer Tool"; wantedBy = [ "multi-user.target" ]; - bindsTo = [ "cupsd.service" ]; + bindsTo = [ "cups.service" ]; serviceConfig = { Type = "forking"; ExecStart = "${prl-tools}/bin/prlshprint"; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index f3a24c5cf25b..ea9f61aad6a6 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -5,18 +5,8 @@ with lib; let - cfg = config.virtualisation.xen; - xen = pkgs.xen; - - xendConfig = pkgs.writeText "xend-config.sxp" - '' - (loglevel DEBUG) - (network-script network-bridge) - (vif-script vif-bridge) - ''; - in { @@ -58,23 +48,62 @@ in ''; }; + virtualisation.xen.bridge = + mkOption { + default = "xenbr0"; + description = + '' + Create a bridge for the Xen domUs to connect to. + ''; + }; + + virtualisation.xen.stored = + mkOption { + type = types.path; + description = + '' + Xen Store daemon to use. Defaults to oxenstored of the xen package. + ''; + }; + + virtualisation.xen.trace = + mkOption { + default = false; + description = + '' + Enable Xen tracing. + ''; + }; }; ###### implementation config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isx86_64; + message = "Xen currently not supported on ${pkgs.stdenv.system}"; + } { + assertion = config.boot.loader.grub.enable && (config.boot.loader.grub.efiSupport == false); + message = "Xen currently does not support EFI boot"; + } ]; + + virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored"; environment.systemPackages = [ xen ]; - # Domain 0 requires a pvops-enabled kernel. - boot.kernelPackages = pkgs.linuxPackages_3_2_xen; + # Make sure Domain 0 gets the required configuration + #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; }; boot.kernelModules = - [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" - "blktap" "tun" + [ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback" + "xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk" + "usbbk" "pciback" "xen-acpi-processor" "blktap2" "tun" "netxen_nic" + "xen_wdt" "xen-acpi-processor" "xen-privcmd" "xen-scsiback" + "xenfs" ]; + # The radeonfb kernel module causes the screen to go black as soon # as it's loaded, so don't load it. boot.blacklistedKernelModules = [ "radeonfb" ]; @@ -87,8 +116,8 @@ in options loop max_loop=64 ''; - virtualisation.xen.bootParams = - [ "loglvl=all" "guest_loglvl=all" ] ++ + virtualisation.xen.bootParams = [] ++ + optionals cfg.trace [ "loglvl=all" "guest_loglvl=all" ] ++ optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M"; system.extraSystemBuilderCmds = @@ -101,71 +130,36 @@ in system.activationScripts.xen = '' if [ -d /proc/xen ]; then - ${pkgs.sysvtools}/bin/mountpoint -q /proc/xen || \ + ${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null + ${pkgs.utillinux}/bin/mountpoint -q /proc/xen || \ ${pkgs.utillinux}/bin/mount -t xenfs none /proc/xen fi ''; - jobs.xend = - { description = "Xen Control Daemon"; - - startOn = "stopped udevtrigger"; - - path = - [ pkgs.bridge-utils pkgs.gawk pkgs.iproute pkgs.nettools - pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps - ]; - - environment.XENCONSOLED_TRACE = "hv"; - - preStart = - '' - mkdir -p /var/log/xen/console -m 0700 - - ${xen}/sbin/xend start - - # Wait until Xend is running. - for ((i = 0; i < 60; i++)); do echo "waiting for xend..."; ${xen}/sbin/xend status && break; done - - ${xen}/sbin/xend status || exit 1 - ''; - - postStop = "${xen}/sbin/xend stop"; - }; - - jobs.xendomains = - { description = "Automatically starts, saves and restores Xen domains on startup/shutdown"; - - startOn = "started xend"; - - stopOn = "starting shutdown and stopping xend"; - - restartIfChanged = false; - - path = [ pkgs.xen ]; - - environment.XENDOM_CONFIG = "${xen}/etc/sysconfig/xendomains"; - - preStart = - '' - mkdir -p /var/lock/subsys -m 755 - ${xen}/etc/init.d/xendomains start - ''; - - postStop = "${xen}/etc/init.d/xendomains stop"; - }; + # Domain 0 requires a pvops-enabled kernel. + system.requiredKernelConfig = with config.lib.kernelConfig; + [ (isYes "XEN") + (isYes "X86_IO_APIC") + (isYes "ACPI") + (isYes "XEN_DOM0") + (isYes "PCI_XEN") + (isYes "XEN_DEV_EVTCHN") + (isYes "XENFS") + (isYes "XEN_COMPAT_XENFS") + (isYes "XEN_SYS_HYPERVISOR") + (isYes "XEN_GNTDEV") + (isYes "XEN_BACKEND") + (isModule "XEN_NETDEV_BACKEND") + (isModule "XEN_BLKDEV_BACKEND") + (isModule "XEN_PCIDEV_BACKEND") + (isYes "XEN_BALLOON") + (isYes "XEN_SCRUB_PAGES") + ]; - # To prevent a race between dhcpcd and xend's bridge setup script - # (which renames eth* to peth* and recreates eth* as a virtual - # device), start dhcpcd after xend. - jobs.dhcpcd.startOn = mkOverride 50 "started xend"; environment.etc = - [ { source = xendConfig; - target = "xen/xend-config.sxp"; - } - { source = "${xen}/etc/xen/scripts"; - target = "xen/scripts"; + [ { source = "${xen}/etc/xen/xl.conf"; + target = "xen/xl.conf"; } ]; @@ -174,6 +168,125 @@ in services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; + systemd.services.xen-store = { + description = "Xen Store Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "xen-store.socket" ]; + requires = [ "xen-store.socket" ]; + preStart = '' + export XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + + mkdir -p /var/run + ${optionalString cfg.trace "mkdir -p /var/log/xen"} + grep -q control_d /proc/xen/capabilities + ''; + serviceConfig.ExecStart = '' + ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork + ''; + postStart = '' + time=0 + timeout=30 + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${pkgs.xen}/bin/xenstore-read -s / >/dev/null 2>&1` ; do + time=$(($time+1)) + sleep 1 + done + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo "Could not start Xenstore Daemon" + exit 1 + fi + + ${pkgs.xen}/bin/xenstore-write "/local/domain/0/name" "Domain-0" + ${pkgs.xen}/bin/xenstore-write "/local/domain/0/domid" 0 + ''; + }; + + systemd.sockets.xen-store = { + description = "XenStore Socket for userspace API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = [ "/var/run/xenstored/socket" "/var/run/xenstored/socket_ro" ]; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "root"; + }; + }; + + + systemd.services.xen-console = { + description = "Xen Console Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-store.service" ]; + preStart = '' + mkdir -p /var/run/xen + ${optionalString cfg.trace "mkdir -p /var/log/xen"} + grep -q control_d /proc/xen/capabilities + ''; + serviceConfig = { + ExecStart = '' + ${pkgs.xen}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} + ''; + }; + }; + + + systemd.services.xen-qemu = { + description = "Xen Qemu Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-console.service" ]; + serviceConfig.ExecStart = '' + ${pkgs.xen}/lib/xen/bin/qemu-system-i386 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \ + -monitor /dev/null -serial /dev/null -parallel /dev/null + ''; + }; + + + systemd.services.xen-watchdog = { + description = "Xen Watchdog Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-qemu.service" ]; + serviceConfig.ExecStart = "${pkgs.xen}/bin/xenwatchdogd 30 15"; + serviceConfig.Type = "forking"; + serviceConfig.RestartSec = "1"; + serviceConfig.Restart = "on-failure"; + }; + + + systemd.services.xen-bridge = { + description = "Xen bridge"; + wantedBy = [ "multi-user.target" ]; + before = [ "xen-domains.service" ]; + serviceConfig.RemainAfterExit = "yes"; + serviceConfig.ExecStart = '' + ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge} + ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up + ''; + serviceConfig.ExecStop = '' + ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down + ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge} + ''; + }; + + systemd.services.xen-domains = { + description = "Xen domains - automatically starts, saves and restores Xen domains"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-bridge.service" "xen-qemu.service" ]; + ## To prevent a race between dhcpcd and xend's bridge setup script + ## (which renames eth* to peth* and recreates eth* as a virtual + ## device), start dhcpcd after xend. + before = [ "dhcpd.service" ]; + restartIfChanged = false; + serviceConfig.RemainAfterExit = "yes"; + path = [ pkgs.xen ]; + environment.XENDOM_CONFIG = "${pkgs.xen}/etc/sysconfig/xendomains"; + preStart = "mkdir -p /var/lock/subsys -m 755"; + serviceConfig.ExecStart = "${pkgs.xen}/etc/init.d/xendomains start"; + serviceConfig.ExecStop = "${pkgs.xen}/etc/init.d/xendomains stop"; + }; + }; } diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index 483589669345..2db3190ad139 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -9,7 +9,10 @@ boot.loader.grub.device = "nodev"; boot.loader.grub.extraPerEntryConfig = "root (hd0)"; - boot.initrd.kernelModules = [ "xen-blkfront" ]; + boot.initrd.kernelModules = + [ "xen-blkfront" "xen-tpmfront" "xen-kbdfront" "xen-fbfront" + "xen-netfront" "xen-pcifront" "xen-scsifront" + ]; # Send syslog messages to the Xen console. services.syslogd.tty = "hvc0"; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 2381132bb45e..22d14aa57a0c 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -31,7 +31,7 @@ in rec { nixpkgs = nixpkgsSrc; })) [ "unstable" ]; - tested = pkgs.releaseTools.aggregate { + tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; @@ -85,6 +85,6 @@ in rec { nixpkgs.tarball (all nixpkgs.emacs) ]; - }; + }); } diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 7f53a101bdfc..11155c853696 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -79,7 +79,7 @@ in rec { vim; }; - tested = pkgs.releaseTools.aggregate { + tested = lib.hydraJob (pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; @@ -88,6 +88,6 @@ in rec { constituents = let all = x: map (system: x.${system}) supportedSystems; in [ nixpkgs.tarball ] ++ lib.collect lib.isDerivation nixos; - }; + }); } diff --git a/nixos/release.nix b/nixos/release.nix index 1bd3ec577318..1712c90ad33f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -3,22 +3,20 @@ , supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: +with import ../lib; + let version = builtins.readFile ../.version; versionSuffix = (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - forAllSystems = pkgs.lib.genAttrs supportedSystems; - - scrubDrv = drv: let res = { inherit (drv) drvPath outPath type name system meta; outputName = "out"; out = res; }; in res; + forAllSystems = genAttrs supportedSystems; - callTest = fn: args: forAllSystems (system: scrubDrv (import fn ({ inherit system; } // args))); + callTest = fn: args: forAllSystems (system: hydraJob (import fn ({ inherit system; } // args))); pkgs = import nixpkgs { system = "x86_64-linux"; }; - lib = pkgs.lib; - versionModule = { system.nixosVersionSuffix = versionSuffix; @@ -42,10 +40,10 @@ let in # Declare the ISO as a build product so that it shows up in Hydra. - scrubDrv (runCommand "nixos-iso-${config.system.nixosVersion}" + hydraJob (runCommand "nixos-iso-${config.system.nixosVersion}" { meta = { description = "NixOS installation CD (${description}) - ISO image for ${system}"; - maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; + maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit iso; passthru = { inherit config; }; @@ -74,7 +72,7 @@ let tarball // { meta = { description = "NixOS system tarball for ${system} - ${stdenv.platform.name}"; - maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; + maintainers = map (x: lib.maintainers.${x}) maintainers; }; inherit config; }; @@ -83,12 +81,12 @@ let makeClosure = module: buildFromConfig module (config: config.system.build.toplevel); - buildFromConfig = module: sel: forAllSystems (system: scrubDrv (sel (import ./lib/eval-config.nix { + buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ module versionModule ] ++ lib.singleton + modules = [ module versionModule ] ++ singleton ({ config, lib, ... }: - { fileSystems."/".device = lib.mkDefault "/dev/sda1"; - boot.loader.grub.device = lib.mkDefault "/dev/sda"; + { fileSystems."/".device = mkDefault "/dev/sda1"; + boot.loader.grub.device = mkDefault "/dev/sda"; }); }).config)); @@ -175,10 +173,10 @@ in rec { in # Declare the OVA as a build product so that it shows up in Hydra. - scrubDrv (runCommand "nixos-ova-${config.system.nixosVersion}-${system}" + hydraJob (runCommand "nixos-ova-${config.system.nixosVersion}-${system}" { meta = { description = "NixOS VirtualBox appliance (${system})"; - maintainers = lib.maintainers.eelco; + maintainers = maintainers.eelco; }; ova = config.system.build.virtualBoxOVA; } @@ -195,9 +193,9 @@ in rec { dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { inherit system; - modules = lib.singleton ({ config, pkgs, ... }: - { fileSystems."/".device = lib.mkDefault "/dev/sda1"; - boot.loader.grub.device = lib.mkDefault "/dev/sda"; + modules = singleton ({ config, pkgs, ... }: + { fileSystems."/".device = mkDefault "/dev/sda1"; + boot.loader.grub.device = mkDefault "/dev/sda"; }); }).config.system.build.toplevel; } @@ -242,33 +240,34 @@ in rec { tests.avahi = callTest tests/avahi.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; tests.blivet = callTest tests/blivet.nix {}; - tests.cadvisor = scrubDrv (import tests/cadvisor.nix { system = "x86_64-linux"; }); + tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = callTest tests/chromium.nix {}; - tests.cjdns = callTest tests/cjdns.nix {}; + #tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; - tests.docker = scrubDrv (import tests/docker.nix { system = "x86_64-linux"; }); - tests.dockerRegistry = scrubDrv (import tests/docker-registry.nix { system = "x86_64-linux"; }); - tests.etcd = scrubDrv (import tests/etcd.nix { system = "x86_64-linux"; }); + tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); + tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); + tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = scrubDrv (import tests/fleet.nix { system = "x86_64-linux"; }); + tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); #tests.gitlab = callTest tests/gitlab.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; - tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test); - tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test); - tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test); - tests.installer.separateBoot = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).separateBoot.test); - tests.installer.simple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simple.test); - tests.installer.simpleLabels = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleLabels.test); - tests.installer.simpleProvided = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleProvided.test); - tests.installer.btrfsSimple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSimple.test); - tests.installer.btrfsSubvols = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvols.test); - tests.installer.btrfsSubvolDefault = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); + tests.i3wm = callTest tests/i3wm.nix {}; + tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); + tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); + tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test); + tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); + tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); + tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test); + tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test); + tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test); + tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; tests.kde4 = callTest tests/kde4.nix {}; - tests.kubernetes = scrubDrv (import tests/kubernetes.nix { system = "x86_64-linux"; }); + tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; @@ -300,7 +299,7 @@ in rec { tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; - tests.panamax = scrubDrv (import tests/panamax.nix { system = "x86_64-linux"; }); + tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix new file mode 100644 index 000000000000..0966dba8a3c8 --- /dev/null +++ b/nixos/tests/i3wm.nix @@ -0,0 +1,28 @@ +import ./make-test.nix { + name = "i3wm"; + + machine = { lib, pkgs, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + services.xserver.displayManager.auto.user = "alice"; + services.xserver.windowManager.default = lib.mkForce "i3"; + services.xserver.windowManager.i3.enable = true; + }; + + testScript = { nodes, ... }: '' + $machine->waitForX; + $machine->waitForWindow(qr/first configuration/); + $machine->sleep(1); + $machine->screenshot("started"); + $machine->sendKeys("ret"); + $machine->sleep(1); + $machine->sendKeys("alt"); + $machine->sleep(1); + $machine->screenshot("configured"); + $machine->sendKeys("ret"); + $machine->sleep(2); + $machine->sendKeys("alt-ret"); + $machine->waitForWindow(qr/machine.*alice/); + $machine->sleep(1); + $machine->screenshot("terminal"); + ''; +} diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 8bc7c8d618ad..0a9eda930bad 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -13,7 +13,7 @@ import ./make-test.nix rec { id: redis-master-pod containers: - name: master - image: master:5000/scratch + image: master:5000/nix cpu: 100 ports: - name: redis-server @@ -50,8 +50,8 @@ import ./make-test.nix rec { virtualisation.memorySize = 768; services.kubernetes = { roles = ["master" "node"]; + dockerCfg = ''{"master:5000":{}}''; controllerManager.machines = ["master" "node"]; - kubelet.extraOpts = "-network_container_image=master:5000/pause"; apiserver.address = "0.0.0.0"; verbose = true; }; @@ -94,7 +94,8 @@ import ./make-test.nix rec { { services.kubernetes = { roles = ["node"]; - kubelet.extraOpts = "-network_container_image=master:5000/pause"; + dockerCfg = ''{"master:5000":{}}''; + kubelet.apiServers = ["master:8080"]; verbose = true; }; virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0 --insecure-registry master:5000"; @@ -155,14 +156,14 @@ import ./make-test.nix rec { $node->waitForUnit("kubernetes-kubelet.service"); $node->waitForUnit("kubernetes-proxy.service"); - $master->waitUntilSucceeds("kubecfg list minions | grep master"); - $master->waitUntilSucceeds("kubecfg list minions | grep node"); + $master->waitUntilSucceeds("kubectl get minions | grep master"); + $master->waitUntilSucceeds("kubectl get minions | grep node"); $client->waitForUnit("docker.service"); - $client->succeed("tar cv --files-from /dev/null | docker import - scratch"); - $client->succeed("docker tag scratch master:5000/scratch"); + $client->succeed("tar cv --files-from /dev/null | docker import - nix"); + $client->succeed("docker tag nix master:5000/nix"); $master->waitForUnit("docker-registry.service"); - $client->succeed("docker push master:5000/scratch"); + $client->succeed("docker push master:5000/nix"); $client->succeed("mkdir -p /root/pause"); $client->succeed("cp /etc/test/pause /root/pause/"); $client->succeed("cp /etc/test/Dockerfile /root/pause/"); diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index a69c68f346e8..2d96100fffc8 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.9.3"; + version = "0.10.0"; src = fetchurl { - url = "https://github.com/bitcoin/bitcoin/archive/v${version}.tar.gz"; - sha256 = "0a6lkfzsmqqcbz2cc0cg8dccd990b5y7qi8mw358fhfb4f1jxn9y"; + url = "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz"; + sha256 = "a516cf6d9f58a117607148405334b35d3178df1ba1c59229609d2bcd08d30624"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index dbf9ac3940c6..1196e6d5ebd0 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -2,8 +2,8 @@ rec { - bitcoin = callPackage ./bitcoin.nix { openssl = pkgs.openssl_1_0_1j; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { openssl = pkgs.openssl_1_0_1j; withGui = false; }; + bitcoin = callPackage ./bitcoin.nix { withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { withGui = false; }; darkcoin = callPackage ./darkcoin.nix { withGui = true; }; darkcoind = callPackage ./darkcoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 80137de33b39..cf2f25bfeeef 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; - sha256 = "0h3jn400dj6qxl1gd4max7wl30cib2wczf9dd3qnbw42wngpdvx2"; + sha256 = "17jxsxsrsz3qy2hxdpw78vcbnnd0nq614iy42ypzhw4pdpz0s1l7"; }; buildInputs = [ autoreconfHook pkgconfig openssl diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 38192311ccfa..218a0f8c6d9f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, jack2 +, python, pythonDBus }: stdenv.mkDerivation rec { name = "a2jmidid-${version}"; @@ -9,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; - buildInputs = [ alsaLib dbus jack2 pkgconfig python ]; + buildInputs = [ makeWrapper pkgconfig alsaLib dbus jack2 python pythonDBus ]; configurePhase = "python waf configure --prefix=$out"; buildPhase = "python waf"; - installPhase = "python waf install"; + installPhase = '' + python waf install + wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH + ''; meta = with stdenv.lib; { homepage = http://home.gna.org/a2jmidid; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index dd23504d3fad..0001f0a92922 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, cairo, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz"; - sha256 = "0fa1ghf6qahbhj9j1ciyw0hr6nngwksa37hbs651mlz0fn7lz4xm"; + sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5"; }; - buildInputs = [ cairo gtk gtkmm lv2 lvtk pkgconfig python ]; + buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix new file mode 100644 index 000000000000..3840d06dd467 --- /dev/null +++ b/pkgs/applications/audio/ario/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libsoup, avahi, taglib + }: + +stdenv.mkDerivation rec { + version = "1.5.1"; + name = "ario-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88"; + }; + + patches = [ ./glib-single-include.patch ]; + + buildInputs = [ + pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + ]; + + meta = { + description = "GTK2 client for MPD (Music player daemon)"; + homepage = "http://ario-player.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch new file mode 100644 index 000000000000..45e0a1738f8b --- /dev/null +++ b/pkgs/applications/audio/ario/glib-single-include.patch @@ -0,0 +1,40 @@ +From: Michael Biebl <biebl@debian.org> +Origin: vendor +Bug-Debian: http://bugs.debian.org/665506 +Subject: Including individual glib headers no longer supported + +--- a/src/ario-profiles.h ++++ b/src/ario-profiles.h +@@ -20,7 +20,7 @@ + #ifndef __ARIO_PROFILES_H + #define __ARIO_PROFILES_H + +-#include <glib/gslist.h> ++#include <glib.h> + #include "servers/ario-server.h" + + G_BEGIN_DECLS +--- a/src/plugins/ario-plugin-info.c ++++ b/src/plugins/ario-plugin-info.c +@@ -27,7 +27,7 @@ + + #include <string.h> + #include <glib/gi18n.h> +-#include <glib/gkeyfile.h> ++#include <glib.h> + + #include "plugins/ario-plugin-info-priv.h" + #include "ario-debug.h" +--- a/src/ario-util.h ++++ b/src/ario-util.h +@@ -18,8 +18,8 @@ + */ + + #include "servers/ario-server.h" +-#include "glib/gslist.h" +-#include "gdk/gdkpixbuf.h" ++#include <glib.h> ++#include <gdk/gdkpixbuf.h> + + /* Number of covers used to generate the drag & drop image */ + #define MAX_COVERS_IN_DRAG 3 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 7308d84e0984..6f25693f734e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm mkdir lib-src - mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/ + mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/ rm -r lib-src-rm/ ''; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 663e1827b851..6d28c038f232 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz"; - sha256 = "0p0lfy3vmxjf9nwajzyhl2jscpmbi26qqqsy1hsa4ljc0plfz60p"; + sha256 = "1g76z7ha3hd53vbqaq9n1qg6s3lw8zzaw51iny6y2bz0j1xqwcsr"; }; buildInputs = [ diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 52c079791ac1..bf4375845597 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck"; + sha256 = "00r2f7psd2jym2lxf3q3lz2lskz7091pz9glnxqam2bznwnlyxyp"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix new file mode 100644 index 000000000000..b90c6a0ea369 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "cyclone-${version}"; + version = "0.1-alpha55"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz"; + sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for file in `grep -r -l g_canvas.h` + do + sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file + done + for file in `grep -r -l m_imp.h` + do + sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file + done + ''; + + installPhase = '' + mkdir -p $out/cyclone + cp -r bin/* $out/cyclone + ''; + + meta = { + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; + homepage = http://puredata.info/downloads/cyclone; + license = stdenv.lib.licenses.tcltk; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix new file mode 100644 index 000000000000..9046ec0a87fc --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "helmholtz"; + + src = fetchurl { + url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + name = "helmholtz.zip"; + sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv helmholtz~/src/helmholtz\~.cpp . + mv helmholtz~/src/Helmholtz.cpp . + mv helmholtz~/src/include/ . + mv helmholtz~/src/Makefile . + rm -rf helmholtz~/src/ + rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.dll + rm -rf __MACOSX + ''; + + patchPhase = '' + sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile + sed -i "s@-Wl@@g" Makefile + ''; + + installPhase = '' + cp -r helmholtz~/ $out/ + ''; + + meta = { + description = "Time domain pitch tracker for Pure Data"; + homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix new file mode 100644 index 000000000000..dc4d03759616 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "maxlib-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz"; + sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + sed -i "s@/usr@$out@g" Makefile + ''; + + postInstall = '' + mv $out/local/lib/pd-externals/maxlib/ $out + rm -rf $out/local/ + ''; + + meta = { + description = "A library of non-tilde externals for puredata, by Miller Puckette"; + homepage = http://puredata.info/downloads/maxlib; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix new file mode 100644 index 000000000000..5f76b208e143 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "mrpeach-${version}"; + version = "1.1"; + + # this was to only usable url I could find: + # - The main url changes hash: http://pure-data.cvs.sourceforge.net/viewvc/pure-data/externals/mrpeach/?view=tar + # - There are lot's of places where this SW is available as part of a big pkg: pd-extended, pd-l2ork + # - It's just 211K + + src = fetchurl { + url = "http://slackonly.com/pub/korgie/sources/pd_mrpeach-2011.10.21.tar.gz"; + sha256 = "12jqba3jsdrk20ib9wc2wiivki88ypcd4mkzgsri9siywbbz9w8x"; + }; + + buildInputs = [puredata ]; + + patchPhase = '' + for D in net osc + do + sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile + for i in ${puredata}/include/pd/*; do + ln -s $i $D/ + done + done + ''; + + buildPhase = '' + for D in net osc + do + cd $D + make + cd .. + done + ''; + + installPhase = '' + for D in net osc + do + cd $D + make install + cd .. + done + ''; + + fixupPhase = '' + mv $out/lib/pd-externals/net $out + mv $out/lib/pd-externals/osc $out + rm -rf $out/lib + ''; + + meta = { + description = "A collection of Pd objectclasses for OSC-messages"; + homepage = http://puredata.info/downloads/osc; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix new file mode 100644 index 000000000000..fc7fc5ee3d0c --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "puremapping"; + + src = fetchurl { + url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; + name = "puremapping"; + sha256 = "1ygzxsfj3rnzjkpmgi4wch810q8s5vm1gdam6a938hbbvamafgvc"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/puremapping + mv puremapping/ $out + ''; + + meta = { + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; + homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; + license = stdenv.lib.licenses.gpl1; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix new file mode 100644 index 000000000000..f8a25256bb07 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "timbreid-${version}"; + + src = fetchurl { + url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; + sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv timbreID-0.6.0-src/tID/* . + rm -rf timbreID-0.6.0-src/tID/ + rm -rf timbreID-0.6.0-src/INSTALL.txt + ''; + + installPhase = '' + mkdir -p $out/ + cp -r *.pd $out/ + cp -r *.pd_linux $out/ + cp -r *.wav $out/ + ''; + + meta = { + description = "A collection of audio feature analysis externals for puredata"; + homepage = http://williambrent.conflations.com/pages/research.html; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix new file mode 100644 index 000000000000..68996e9e6e4c --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, autoconf, automake, puredata }: + +stdenv.mkDerivation rec { + name = "zexy-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; + }; + + buildInputs = [ autoconf automake puredata ]; + + patchPhase = '' + cd src/ + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + patchShebangs + ./bootstrap.sh + ./configure --enable-lpt=no --prefix=$out + ''; + + postInstall = '' + mv $out/lib/pd/extra/zexy $out + rm -rf $out/lib + ''; + + meta = { + description = "The swiss army knife for puredata"; + homepage = http://puredata.info/downloads/zexy; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix new file mode 100644 index 000000000000..0a30037b2268 --- /dev/null +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, buildEnv, puredata, makeWrapper, plugins }: + +let +puredataFlags = map (x: "-path ${x}/") plugins; +drv = buildEnv { + name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version; + + paths = [ puredata ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${puredata}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pd \ + --add-flags "${toString puredataFlags}" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 546561e434e2..5277bf6f68c5 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0f4cwcmszvpga1gsfhhjcz7yb0h08v35wsv4ssmijh8gfp3mhjml"; + sha256 = "0f37xjkay3800fbx0iwjca005b1hrjbhszrzn0xg662vf8mj44nv"; }; buildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 69f1eef9cecb..171fefc8a094 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -6,45 +6,45 @@ #ToDo: bad icons with gtk2; # avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from -#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory - let - ver_branch = "1.6"; - version = "1.6.1"; + ver_branch = "2.0"; + version = "2.0.0"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz"; + sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc"; }; - patches = [ - ./lightdm-gtk-greeter.patch - (fetchurl { # CVE-2014-0979, https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/1266449 - url = "https://launchpadlibrarian.net/161796033/07_fix-NULL-username.patch"; - sha256 = "1sqkhsz1z10k6vlmlrqrfx452lznv30885fmnzc73p2zxdlw9q1a"; - }) - ]; - patchFlags = "-p1"; + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] + ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); - buildInputs = [ pkgconfig lightdm intltool ] - ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; - configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2"; + installFlags = [ "DESTDIR=\${out}" ]; postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - '' + stdenv.lib.optionalString useGTK2 '' wrapProgram "$out/sbin/lightdm-gtk-greeter" \ --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" ''; - meta = { + meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm-gtk-greeter; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ocharles wkennington ]; }; } diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch deleted file mode 100644 index ea9e0eaec936..000000000000 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c -index cc5f9e1..d615dc1 100644 ---- a/src/lightdm-gtk-greeter.c -+++ b/src/lightdm-gtk-greeter.c -@@ -1716,7 +1716,7 @@ main (int argc, char **argv) - gtk_container_add (GTK_CONTAINER (menuitem), image); - gtk_widget_show (GTK_WIDGET (menuitem)); - -- items = lightdm_get_sessions (); -+ items = lightdm_get_sessions (greeter); - GSList *sessions = NULL; - for (item = items; item; item = item->next) - { diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index d4c6f24d69a3..b2a2d8799791 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,32 +1,47 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }: +, intltool, x11, libxklavier, libgcrypt +, qt4 ? null, qt5 ? null +}: let - ver_branch = "1.8"; - version = "1.8.6"; + ver_branch = "1.13"; + version = "1.13.1"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "17ivc0c4dbnc0fzd581j53cn6hdav34zz2hswjzy8aczbpk605qi"; + sha256 = "0xa23maq6phkfil8xx26viig2m99sbzcf1w7s56hns2qw6pycn79"; }; - patches = [ ./lightdm.patch ]; - patchFlags = "-p1"; - buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt - ] ++ stdenv.lib.optional doCheck dbus.daemon; + qt4 qt5 + ]; + + configureFlags = [ + "--enable-liblightdm-gobject" + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" + ++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5"; - configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ]; + installFlags = [ "DESTDIR=\${out}" ]; - doCheck = false; # some tests fail, don't know why + # Correct for the nested nix folder tree + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; - meta = { + meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ocharles wkennington ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/lightdm.patch b/pkgs/applications/display-managers/lightdm/lightdm.patch deleted file mode 100644 index d81e0aae56d5..000000000000 --- a/pkgs/applications/display-managers/lightdm/lightdm.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c -index 9387118..635cea0 100644 ---- a/liblightdm-gobject/greeter.c -+++ b/liblightdm-gobject/greeter.c -@@ -567,6 +567,21 @@ lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter) - } - - /** -+ * lightdm_greeter_get_config_path -+ * @greeter: A #LightDMGreeter -+ * -+ * Get the config path to LightDM. -+ * -+ * Return value: The path to the current LightDM configuration file. -+ **/ -+const gchar * -+lightdm_greeter_get_config_path (LightDMGreeter *greeter) -+{ -+ g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); -+ return lightdm_greeter_get_hint (greeter, "config-path"); -+} -+ -+/** - * lightdm_greeter_get_hide_users_hint: - * @greeter: A #LightDMGreeter - * -diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h -index 7d8988f..2b54909 100644 ---- a/liblightdm-gobject/lightdm/greeter.h -+++ b/liblightdm-gobject/lightdm/greeter.h -@@ -93,6 +93,8 @@ gboolean lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter); - - const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter); - -+const gchar *lightdm_greeter_get_config_path (LightDMGreeter *greeter); -+ - gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter); - - gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter); -diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h -index 13ddcd9..cdb2fd6 100644 ---- a/liblightdm-gobject/lightdm/session.h -+++ b/liblightdm-gobject/lightdm/session.h -@@ -12,6 +12,7 @@ - #define LIGHTDM_SESSION_H_ - - #include <glib-object.h> -+#include "greeter.h" - - G_BEGIN_DECLS - -@@ -42,9 +43,9 @@ typedef struct - - GType lightdm_session_get_type (void); - --GList *lightdm_get_sessions (void); -+GList *lightdm_get_sessions (LightDMGreeter *greeter); - --GList *lightdm_get_remote_sessions (void); -+GList *lightdm_get_remote_sessions (LightDMGreeter *greeter); - - const gchar *lightdm_session_get_key (LightDMSession *session); - -diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c -index 949778f..db5e18a 100644 ---- a/liblightdm-gobject/session.c -+++ b/liblightdm-gobject/session.c -@@ -11,6 +11,7 @@ - #include <string.h> - #include <gio/gdesktopappinfo.h> - -+#include "lightdm/greeter.h" - #include "lightdm/session.h" - - enum { -@@ -189,7 +190,7 @@ load_sessions (const gchar *sessions_dir) - } - - static void --update_sessions (void) -+update_sessions (LightDMGreeter *greeter) - { - GKeyFile *config_key_file = NULL; - gchar *config_path = NULL; -@@ -205,8 +206,7 @@ update_sessions (void) - remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR); - - /* Use session directory from configuration */ -- /* FIXME: This should be sent in the greeter connection */ -- config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL); -+ config_path = g_strdup (lightdm_greeter_get_config_path (greeter)); - config_key_file = g_key_file_new (); - result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error); - if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) -@@ -250,9 +250,9 @@ update_sessions (void) - * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession - **/ - GList * --lightdm_get_sessions (void) -+lightdm_get_sessions (LightDMGreeter *greeter) - { -- update_sessions (); -+ update_sessions (greeter); - return local_sessions; - } - -@@ -264,9 +264,9 @@ lightdm_get_sessions (void) - * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession - **/ - GList * --lightdm_get_remote_sessions (void) -+lightdm_get_remote_sessions (LightDMGreeter *greeter) - { -- update_sessions (); -+ update_sessions (greeter); - return remote_sessions; - } - -diff --git a/src/lightdm.c b/src/lightdm.c -index 7d35034..910164c 100644 ---- a/src/lightdm.c -+++ b/src/lightdm.c -@@ -1142,6 +1142,9 @@ main (int argc, char **argv) - } - } - g_clear_error (&error); -+ -+ config_set_string (config_get_instance (), "SeatDefaults", "config-path", config_path); -+ - g_free (config_path); - - /* Set default values */ -diff --git a/src/seat.c b/src/seat.c -index e2b9c2c..a950ea2 100644 ---- a/src/seat.c -+++ b/src/seat.c -@@ -1137,6 +1137,7 @@ create_greeter_session (Seat *seat) - greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false"); - greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false"); - greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false"); -+ greeter_set_hint (greeter_session, "config-path", seat_get_string_property (seat, "config-path")); - - g_object_unref (session_config); - diff --git a/pkgs/applications/display-managers/sddm/cmake_paths.patch b/pkgs/applications/display-managers/sddm/cmake_paths.patch new file mode 100644 index 000000000000..7deb3e2e1bd9 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/cmake_paths.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d6e0a9..df4ad28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,7 +77,9 @@ find_package(Qt5LinguistTools REQUIRED) + + # find qt5 imports dir + get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) +-exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR) ++if(NOT QT_IMPORTS_DIR) ++ exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR) ++endif() + + # Set components version + set(COMPONENTS_VERSION 2.0) +diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in +index 6a28224..798bc5c 100644 +--- a/data/man/sddm.conf.rst.in ++++ b/data/man/sddm.conf.rst.in +@@ -65,6 +65,10 @@ OPTIONS + Path of the X server. + Default value is "/usr/bin/X". + ++`XephyrPath=` ++ Path of the Xephyr. ++ Default value is "/usr/bin/Xephyr". ++ + `XauthPath=` + Path of the Xauth. + Default value is "/usr/bin/xauth". +diff --git a/src/common/Configuration.h b/src/common/Configuration.h +index 72aa6f4..854cc22 100644 +--- a/src/common/Configuration.h ++++ b/src/common/Configuration.h +@@ -54,6 +54,7 @@ namespace SDDM { + // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal + Section(XDisplay, + Entry(ServerPath, QString, _S("/usr/bin/X"), _S("X server path")); ++ Entry(XephyrPath, QString, _S("/usr/bin/Xephyr"), _S("Xephyr path")); + Entry(XauthPath, QString, _S("/usr/bin/xauth"), _S("Xauth path")); + Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Session description directory")); + Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Xsession script path\n" +diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp +index f10ad82..cb9de3f 100644 +--- a/src/daemon/XorgDisplayServer.cpp ++++ b/src/daemon/XorgDisplayServer.cpp +@@ -136,7 +136,7 @@ namespace SDDM { + if (daemonApp->testing()) { + QStringList args; + args << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600"; +- process->start("/usr/bin/Xephyr", args); ++ process->start(mainConfig.XDisplay.XephyrPath.get(), args); + } else { + // set process environment + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix new file mode 100644 index 000000000000..73a188af0cf5 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs +, libXdmcp, libXau, qt5, pam, systemd }: + +let + version = "0.11.0"; +in +stdenv.mkDerivation rec { + name = "sddm-${version}"; + + src = fetchFromGitHub { + owner = "sddm"; + repo = "sddm"; + rev = "v${version}"; + sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig"; + }; + + nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ]; + + buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ]; + + patches = [ (fetchpatch { + url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch"; + sha256 = "1pda0wf4xljdadja7iyh5c48h0347imadg9ya1dw5slgb7w1d94l"; + }) + ./cmake_paths.patch + ]; + + cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" + ''; + + postInstall = '' + wrapProgram $out/bin/sddm-greeter \ + --set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "QML based X11 display manager"; + homepage = http://launchpad.net/lightdm; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 0c0ddc3158ab..a3cdbb6afb96 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.171.0"; + version = "0.187.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0syl3rljk2k8j6fy8xq59qhf13b8a4awpi5cvn1kka56y0vmhxs5"; + sha256 = "0s6173dg5m52zc8kqwlgjn113d84cskrv9v29fb0nrvwvkv2xzmw"; name = "${name}.deb"; }; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/atom patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node + $out/share/atom/resources/app/apm/bin/node wrapProgram $out/bin/atom \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" wrapProgram $out/bin/apm \ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e04e438b8bad..41be00bdb631 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -246,11 +246,11 @@ in { description = "Eclipse Classic"; sources = { "x86_64-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz; sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd"; }; "i686-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz; sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg"; }; }; @@ -261,14 +261,29 @@ in { description = "Eclipse Classic"; sources = { "x86_64-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz; sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2"; }; "i686-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz; sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z"; }; }; }; + eclipse_sdk_442 = buildEclipse { + name = "eclipse-sdk-4.4.2"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz; + sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l"; + + }; + "i686-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz; + sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d"; + }; + }; + }; } diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix new file mode 100644 index 000000000000..8fdc198f45c4 --- /dev/null +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }: +stdenv.mkDerivation rec { + name = "edbrowse-3.5.2"; + buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24" + ''; + installPhase = "installBin src/edbrowse"; + src = fetchurl { + url = "http://the-brannons.com/edbrowse/${name}.zip"; + sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714"; + }; + meta = { + description = "Edbrowse, a Command Line Editor Browser"; + longDescription = '' + Edbrowse is a combination editor, browser, and mail client that is 100% text based. + The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html. + This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else. + A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever. + edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. + ''; + license = stdenv.lib.licenses.gpl1Plus; + homepage = http://the-brannons.com/edbrowse/; + maintainers = [ stdenv.lib.maintainers.schmitthenner ]; + }; +} diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 71b98eec0e98..af5c11e69aef 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -44,16 +44,8 @@ stdenv.mkDerivation rec { "-I${cairo}/include/cairo"; postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el <<EOF - ;; nixos specific load-path - (when (getenv "NIX_PROFILES") (setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (getenv "NIX_PROFILES")))) - load-path))) - - ;; make tramp work for NixOS machines - (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) - EOF + mkdir -p $out/share/emacs/site-lisp/ + cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el ''; doCheck = true; diff --git a/pkgs/applications/editors/emacs-24/site-start.el b/pkgs/applications/editors/emacs-24/site-start.el new file mode 100644 index 000000000000..023d6412ed84 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/site-start.el @@ -0,0 +1,17 @@ +;; NixOS specific load-path +(setq load-path + (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + load-path)) + +;;; Make `woman' find the man pages +(eval-after-load 'woman + '(setq woman-manpath + (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + woman-manpath))) + +;; Make tramp work for remote NixOS machines +;;; NOTE: You might want to add +(eval-after-load 'tramp + '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix new file mode 100644 index 000000000000..ab94dbae9501 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -0,0 +1,31 @@ +{trivialBuild, fetchFromGitHub}: + +trivialBuild rec { + pname = "nyan-mode"; + version = "20150128"; + + src = fetchFromGitHub { + owner = "TeMPOraL"; + repo = pname; + rev = "41faa2c809da7b2cb3e6f8fadefae3f338ced3f2"; + sha256 = "1idaac7sjc8hhbf5zif61ncg1pvg28c0qfihavdx61albww0ll7f"; + }; + + patches = [ ./directory.patch ]; + + preBuild = '' + substituteInPlace nyan-mode.el \ + --replace "@OUT@" "$out/" + ''; + + postInstall = '' + cp -r img $out + cp -r mus $out + ''; + + meta = { + description = "An analog indicator of the position in the buffer"; + homepage = https://github.com/TeMPOraL/nyan-mode/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch b/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch new file mode 100644 index 000000000000..b471531ec34c --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch @@ -0,0 +1,13 @@ +diff --git a/nyan-mode.el b/nyan-mode.el +index 939a25a..3d0b983 100644 +--- a/nyan-mode.el ++++ b/nyan-mode.el +@@ -106,7 +106,7 @@ This can be t or nil." + :group 'nyan) + + +-(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name))) ++(defconst +nyan-directory+ "@OUT@") + + (defconst +nyan-cat-size+ 3) + diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index ce25f5ab05d3..364daed439d2 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, emacs }: +{ stdenv, fetchzip, emacs }: # this package installs the emacs-mode which # resides in the ocaml compiler sources. -let version = "2.0.8"; +let version = "2.0.9"; in stdenv.mkDerivation { name = "tuareg-mode-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.8.tar.bz2; - sha256 = "128ibdzv5rf33b71d7b3gr9plmfamc28aprl8y0ap0ivc8jaqyga"; + src = fetchzip { + url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; + sha256 = "1rd7ai1wn476zfkkxv2xk72bbzi4d9c17gngd35882q4b5vzp756"; }; buildInputs = [ emacs ]; @@ -20,8 +20,9 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://caml.inria.fr; + homepage = https://github.com/ocaml/tuareg; description = "OCaml mode package for Emacs"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 5ef198745312..c023da0bc958 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { - name = "gobby-0.4.94"; + name = "gobby-0.5.0"; src = fetchurl { url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00"; + sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index d5b8314cea5d..ba4a4173da7e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk -, coreutils, gnugrep, which, git, python, unzip +, coreutils, gnugrep, which, git, python, unzip, androidsdk }: assert stdenv.isLinux; @@ -54,25 +54,26 @@ let ''; installPhase = '' - mkdir -vp $out/{bin,$name,share/pixmaps,libexec/${name}} - cp -va . $out/$name + mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} + cp -a . $out/$name ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png mv bin/fsnotifier* $out/libexec/${name}/. jdk=${jdk.home} + item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ --prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix JDK_HOME : "$jdk" \ --prefix ${hiName}_JDK : "$jdk" - cp -a "${desktopItem}"/* "$out" + ln -s "$item/share/applications" $out/share ''; }; buildAndroidStudio = { name, version, build, src, license, description }: - (mkIdeaProduct rec { + let drv = (mkIdeaProduct rec { inherit name version build src; product = "Studio"; meta = with stdenv.lib; { @@ -88,6 +89,13 @@ let maintainers = with maintainers; [ edwtjo ]; }; }); + in stdenv.lib.overrideDerivation drv (x : { + buildInputs = x.buildInputs ++ [ makeWrapper ]; + installPhase = x.installPhase + '' + wrapProgram "$out/bin/android-studio" \ + --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/" + ''; + }); buildClion = { name, version, build, src, license, description }: (mkIdeaProduct rec { @@ -185,14 +193,14 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "1.1.0b2"; - build = "135.1711524"; + version = "1.1.0"; + build = "135.1740770"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "0pkmyk7ipd4bfbryhanak5mq3x8ix1yv4czx8yi9vdpa34b6pnkw"; + sha256 = "1r2hrld3yfaxq3mw2xmzhvrrhc7w5xlv3d18rv758hy9n40c2nr1"; }; }; @@ -246,37 +254,37 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; + sha256 = "16na04sp9q7z10kjx8wpf9k9bv9vgv7rmd9jnrn72nhwd7bp0n1i"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; + sha256 = "17cxznv7q47isym6l7kbp3jdzdgj02jayygy42x4bwjmg579v1gg"; }; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.2"; - build = "PS-139.732"; + version = "8.0.3"; + build = "PS-139.1348"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; + sha256 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b"; }; }; diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch index 2dabaaaed0c9..2f630f18ab76 100644 --- a/pkgs/applications/editors/jedit/build.xml.patch +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -1,6 +1,6 @@ ---- a/build.xml 2013-07-28 18:03:55.000000000 +0100 -+++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 -@@ -42,16 +42,6 @@ +--- a/build.xml 2015-02-04 08:47:37.000000000 +0100 ++++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 +@@ -43,16 +43,6 @@ <property name="textAreaPackage" location="../textarea"/> @@ -17,7 +17,7 @@ <!-- Miscellaneous --> <property name="jar.filename" value="${ant.project.name}.jar"/> -@@ -89,51 +79,8 @@ +@@ -90,51 +80,8 @@ value="true"/> </target> @@ -39,7 +39,7 @@ - - <target name="init-ivy" - depends="init,download-ivy" -- unless="${ivy.done}"> +- unless="ivy.done"> - <property name="ivy.retrieve.pattern" - value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/> - <taskdef resource="org/apache/ivy/ant/antlib.xml" @@ -52,7 +52,7 @@ - <target name="retrieve" - description="retrieve the dependencies" - depends="init,init-ivy" -- unless="${ivy.done}"> +- unless="ivy.done"> - <ivy:retrieve sync="true"/> - <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]" - organisation="org.apache.ivy" @@ -70,7 +70,7 @@ <taskdef resource="net/sf/antcontrib/antlib.xml" uri="antlib:net.sf.antcontrib"> <classpath> -@@ -238,37 +185,6 @@ +@@ -239,37 +186,6 @@ </javac> </target> @@ -108,13 +108,14 @@ <target name="prepare-textArea" depends="init"> <delete includeemptydirs="true" -@@ -425,32 +341,8 @@ +@@ -423,33 +339,8 @@ </javac> </target> - <target name="test" - depends="init,retrieve,compile,compile-test" -- description="run unit tests"> +- description="run unit tests" +- unless="skip.tests"> - <delete dir="${build.dir}/test/raw-reports"/> - <mkdir dir="${build.dir}/test/raw-reports"/> - <junit printsummary="true" @@ -142,7 +143,11 @@ description="build the jEdit JAR-file with full debug-information"> <mkdir dir="${jar.location}"/> <jar destfile="${jar.location}/${jar.filename}" -@@ -508,7 +400,7 @@ +@@ -504,11 +395,10 @@ + </copy> + </contrib:then> + </contrib:if> +- <antcall target="test" /> </target> <target name="build-exe-launcher" @@ -151,7 +156,7 @@ description="build the EXE launcher"> <contrib:if> <os family="windows"/> -@@ -611,7 +503,7 @@ +@@ -622,7 +512,7 @@ </target> <target name="unpack-docbook-xsl" @@ -160,7 +165,7 @@ <unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip" dest="${build.dir}/docbook-xsl/"/> </target> -@@ -655,7 +547,7 @@ +@@ -668,7 +558,7 @@ </presetdef> <target name="generate-doc-faq" @@ -169,7 +174,7 @@ <dependset.html> <srcfileset dir="doc/FAQ"/> <targetfileset dir="${jar.location}/doc/FAQ"/> -@@ -679,7 +571,7 @@ +@@ -692,7 +582,7 @@ </target> <target name="generate-doc-news" @@ -178,7 +183,7 @@ <dependset.html> <srcfileset dir="doc/whatsnew"/> <targetfileset dir="${jar.location}/doc/whatsnew"/> -@@ -703,7 +595,7 @@ +@@ -716,7 +606,7 @@ </target> <target name="generate-doc-users-guide" @@ -187,7 +192,7 @@ <dependset.html> <srcfileset dir="doc/users-guide"/> <targetfileset dir="${jar.location}/doc/users-guide"/> -@@ -838,7 +730,7 @@ +@@ -851,7 +741,7 @@ </target> <target name="generate-pdf-users-guide" @@ -196,7 +201,7 @@ <fail message="Please set the property "paper.type"" unless="paper.type"/> <contrib:switch value="${paper.type}"> -@@ -1143,7 +1035,7 @@ +@@ -1154,7 +1044,7 @@ </target> <target name="compile-jarbundler" @@ -205,7 +210,7 @@ <mkdir dir="${classes.dir}/jarbundler"/> <depend srcDir="${basedir}" destDir="${classes.dir}/jarbundler" -@@ -1173,7 +1065,7 @@ +@@ -1180,7 +1070,7 @@ </target> <target name="dist-mac-finish" @@ -214,7 +219,7 @@ description="finish building the Mac OS X disk image (DMG-file) on Mac OS X"> <fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently"> <condition> -@@ -1271,7 +1163,7 @@ +@@ -1295,7 +1185,7 @@ </target> <target name="dist-mac" @@ -223,7 +228,7 @@ description="build the Mac OS X disk image (DMG-file)"> <antcall target="compile-jarbundler"> <param name="config.build.debuglevel" -@@ -1386,7 +1278,7 @@ +@@ -1411,7 +1301,7 @@ </target> <target name="prepare-dist-files" @@ -232,7 +237,7 @@ <antcall target="build"> <param name="config.build.debuglevel" value="lines,source"/> -@@ -1567,7 +1459,7 @@ +@@ -1592,7 +1482,7 @@ </target> <target name="dist-deb" @@ -241,7 +246,7 @@ description="build the DEB Package"> <antcall target="compile-ar"> <param name="config.build.debuglevel" -@@ -1813,7 +1705,7 @@ +@@ -1838,7 +1728,7 @@ </target> <target name="dist-sign-deb-Release" diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index b19723177046..7dfb651d7d30 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging}: +{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging }: let - version = "5.1.0"; + version = "5.2.0"; bsh = fetchurl { url = http://www.beanshell.org/bsh-2.0b4.jar; sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { name = "jedit-${version}"; src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; - sha256 = "015rn4339mp4wrd901x56nr42wfcy429pg54n835c6n34b2jjdc6"; + sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; }; buildInputs = [ ant jdk commonsBsf commonsLogging ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation { description = "Mature programmer's text editor (Java based)"; homepage = http://www.jedit.org; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index b98e02fd7b98..b0ac24ee61a0 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.7.0"; + version = "4.7.1"; pname = "kdevelop"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "68de8f412e8ab6107766f00623e54c458d02825e3a70f5ea9969688f8c77c120"; + sha256 = "e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1"; }; buildInputs = [ kdevplatform kdebase_workspace okteta qjson ]; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 852af584e901..d4fa56898c36 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -14,21 +14,21 @@ in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "LightTable-${version}"; - version = "0.6.7"; + name = "lighttable-${version}"; + version = "0.7.2"; src = if stdenv.system == "i686-linux" then fetchurl { name = "LightTableLinux.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux.tar.gz; - sha256 = "3b09f9665ed1b4abb7c1ca16286ac7222caf6dc124059be6db4cb9f5fd041e73"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz"; + sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i"; } else fetchurl { name = "LightTableLinux64.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux64.tar.gz; - sha256 = "710d670ccc30aadba521ccb723388679ee6404aac662297a005432c811d59e82"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz"; + sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c"; }; buildInputs = [ makeWrapper ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin - ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ --prefix "LD_LIBRARY_PATH" : $out/LightTable diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix new file mode 100644 index 000000000000..768842a3875d --- /dev/null +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib }: + +let metadata = assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + if stdenv.system == "i686-linux" then + { arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; } + else + { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; }; +in stdenv.mkDerivation rec { + version = "1.2"; + name = "tuxguitar-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz"; + sha256 = metadata.sha256; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r lib share $out/ + cp tuxguitar $out/bin/tuxguitar + cp tuxguitar.jar $out/lib + + ln -s $out/share $out/bin/share + + wrapProgram $out/bin/tuxguitar \ + --set JAVA "${jdk}/bin/java" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib}/lib" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" + ''; + + meta = with stdenv.lib; { + description = "A multitrack guitar tablature editor"; + longDescription = '' + TuxGuitar is a multitrack guitar tablature editor and player written + in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. + ''; + homepage = http://www.tuxguitar.com.ar/; + license = licenses.lgpl2; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix new file mode 100644 index 000000000000..c3ecbf0a60f5 --- /dev/null +++ b/pkgs/applications/editors/rstudio/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }: + +let + version = "0.98.110"; + ginVer = "1.5"; + gwtVer = "2.5.1"; +in +stdenv.mkDerivation { + name = "RStudio-${version}"; + + buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ]; + + src = fetchurl { + url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; + sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z"; + }; + + # Hack RStudio to only use the input R. + patches = [ ./r-location.patch ]; + postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; + + inherit ginVer; + ginSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; + sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; + }; + + inherit gwtVer; + gwtSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; + sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; + }; + + hunspellDicts = builtins.attrValues hunspellDicts; + + mathJaxSrc = fetchurl { + url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; + sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal"; + }; + + preConfigure = + '' + GWT_LIB_DIR=src/gwt/lib + + mkdir -p $GWT_LIB_DIR/gin/$ginVer + unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + + unzip $gwtSrc + mkdir -p $GWT_LIB_DIR/gwt + mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + + mkdir dependencies/common/dictionaries + for dict in $hunspellDicts; do + for i in $dict/share/hunspell/* + do ln -sv $i dependencies/common/dictionaries/ + done + done + + unzip $mathJaxSrc -d dependencies/common/mathjax + ''; + + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + + meta = with stdenv.lib; + { description = "Set of integrated tools for the R language"; + homepage = http://www.rstudio.com/; + license = licenses.agpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 94ae1d9c846a..e6c2cacc49ad 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -87,7 +87,7 @@ composableDerivation { // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction - // edf { name = "mzscheme"; } #Include MzScheme interpreter. + // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. // edf { @@ -102,7 +102,20 @@ composableDerivation { }; } - // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { + name = "python3"; + feat = "python3interp"; + enable = { + nativeBuildInputs = [ pkgs.python3 ]; + } // lib.optionalAttrs stdenv.isDarwin { + configureFlags + = [ "--enable-python3interp=yes" + "--with-python3-config-dir=${pkgs.python3}/lib" + "--disable-pythoninterp" ]; + }; + } + + // edf { name = "tcl"; feat = "tclinterp"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "lua"; @@ -131,6 +144,7 @@ composableDerivation { cfg = { luaSupport = config.vim.lua or true; pythonSupport = config.vim.python or true; + python3Support = config.vim.python3 or false; rubySupport = config.vim.ruby or true; nlsSupport = config.vim.nls or false; tclSupport = config.vim.tcl or false; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 3d1d5f7d14f9..8aefbb9429c5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1iijbrq2chqwvvb8nv744fg1q1c9iflrw8jbc7rhj97jdmdyqwhk"; + sha256 = "13gj5z9dz1847wlbn2cqpkvr64ds8yrn5hacs5wvbqmh0z9v6aw5"; }; buildInputs = diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2551a9853121..5ace07f827bb 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, -liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, mysql, libpgf }: +{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake +, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun +, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff +, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 +, qimageblitz, qjson, qt4, soprano +}: stdenv.mkDerivation rec { name = "digikam-4.6.0"; @@ -13,20 +15,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff - jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ]; + buildInputs = [ + boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun + libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf + libtiff marble mysql opencv phonon qca2 qimageblitz qjson qt4 + shared_desktop_ontologies soprano + ]; # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + # Help digiKam find libusb, otherwise gphoto2 support is disabled + cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; + enableParallelBuilding = true; meta = { description = "Photo Management Program"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 40f8d441d7e9..0973893bbec8 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" ]; + # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + enableParallelBuilding = true; buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 223f632f937d..629126503c92 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -44,7 +44,6 @@ in stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - rm $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 4299d49ae65f..a9ced83cfaed 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.13"; + name = "yEd-3.14"; src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "1d5qs6q31k49y9gh054aafck548pv9f97b3il4iksnna1r59w5jy"; + sha256 = "147bb081b063abee202a0019597ac960273454046afb29ebbe91e62102dd0471"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 0a1865671433..00f84896a0bf 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -201,6 +201,7 @@ let NIX_CFLAGS_COMPILE = (super.kde-runtime.NIX_CFLAGS_COMPILE or "") + " -I${ilmbase}/include/OpenEXR"; + meta = { priority = 10; }; }; kde-workspace = with pkgs; super.kde-workspace // { @@ -214,6 +215,7 @@ let nativeBuildInputs = super.kde-workspace.nativeBuildInputs ++ [ pkgconfig ]; + meta = { priority = 10; }; }; kdelibs = with pkgs; super.kdelibs // { @@ -239,6 +241,7 @@ let "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" "-DHUPNP_ENABLED=ON" "-DWITH_SOLID_UDISKS2=ON" + "-DKDE_DEFAULT_HOME=.kde" ]; }; @@ -279,10 +282,10 @@ let buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst]; }; - krfb = with pkgs; super.krfb // { + krfb = super.krfb // { buildInputs = super.krfb.buildInputs - ++ [xlibs.libXtst kde4.telepathy.common_internals]; + ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; }; libkdcraw = with pkgs; super.libkdcraw // { diff --git a/pkgs/applications/kde-apps-14.12/manifest.nix b/pkgs/applications/kde-apps-14.12/manifest.nix index 8411690b1ebe..88069b6702a7 100644 --- a/pkgs/applications/kde-apps-14.12/manifest.nix +++ b/pkgs/applications/kde-apps-14.12/manifest.nix @@ -2081,6 +2081,15 @@ }; } { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar"; + store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz"; + sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv"; + name = "kde-l10n-ca_valencia-14.12.2.tar.xz"; + }; + } + { name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar"; store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz"; src = fetchurl { @@ -3772,4 +3781,1885 @@ name = "poxml-14.12.2.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz"; + sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl"; + name = "libkexiv2-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz"; + sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh"; + name = "kbruch-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar"; + store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz"; + sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96"; + name = "kde-dev-scripts-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar"; + store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz"; + sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh"; + name = "kdeartwork-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz"; + sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4"; + name = "libkipi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar"; + store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz"; + sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56"; + name = "okteta-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz"; + sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi"; + name = "analitza-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar"; + store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz"; + sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv"; + name = "kdepim-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz"; + sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d"; + name = "kteatime-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz"; + sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77"; + name = "pairs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz"; + sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj"; + name = "kreversi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz"; + sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m"; + name = "kcachegrind-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz"; + sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny"; + name = "kmouth-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz"; + sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a"; + name = "kcron-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz"; + sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l"; + name = "kde-l10n-sk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz"; + sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m"; + name = "kde-l10n-mr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar"; + store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz"; + sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg"; + name = "kde-l10n-et-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz"; + sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q"; + name = "kde-l10n-zh_TW-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar"; + store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz"; + sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf"; + name = "kde-l10n-ga-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz"; + sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p"; + name = "kde-l10n-hr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz"; + sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb"; + name = "kde-l10n-uk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar"; + store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz"; + sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79"; + name = "kde-l10n-fa-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar"; + store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz"; + sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74"; + name = "kde-l10n-pt-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz"; + sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa"; + name = "kde-l10n-ar-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz"; + sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp"; + name = "kde-l10n-ca-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz"; + sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820"; + name = "kde-l10n-cs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar"; + store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz"; + sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4"; + name = "kde-l10n-is-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar"; + store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz"; + sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75"; + name = "kde-l10n-ia-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz"; + sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9"; + name = "kde-l10n-wa-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar"; + store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz"; + sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4"; + name = "kde-l10n-sv-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz"; + sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53"; + name = "kde-l10n-nn-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar"; + store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz"; + sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg"; + name = "kde-l10n-it-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar"; + store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz"; + sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1"; + name = "kde-l10n-pt_BR-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar"; + store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz"; + sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz"; + name = "kde-l10n-el-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz"; + sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc"; + name = "kde-l10n-ro-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz"; + sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893"; + name = "kde-l10n-fi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz"; + sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv"; + name = "kde-l10n-sr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz"; + sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa"; + name = "kde-l10n-da-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar"; + store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz"; + sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0"; + name = "kde-l10n-es-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz"; + sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p"; + name = "kde-l10n-he-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz"; + sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks"; + name = "kde-l10n-ja-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz"; + sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm"; + name = "kde-l10n-ug-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz"; + sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d"; + name = "kde-l10n-bs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz"; + sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg"; + name = "kde-l10n-bg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz"; + sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx"; + name = "kde-l10n-zh_CN-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz"; + sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh"; + name = "kde-l10n-fr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar"; + store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz"; + sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi"; + name = "kde-l10n-de-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz"; + sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib"; + name = "kde-l10n-kk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar"; + store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz"; + sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b"; + name = "kde-l10n-eu-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar"; + store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz"; + sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri"; + name = "kde-l10n-lt-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar"; + store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz"; + sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk"; + name = "kde-l10n-pa-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz"; + sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb"; + name = "kde-l10n-tr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz"; + sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw"; + name = "kde-l10n-nl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz"; + sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5"; + name = "kde-l10n-ca_valencia-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar"; + store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz"; + sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww"; + name = "kde-l10n-id-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar"; + store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz"; + sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f"; + name = "kde-l10n-lv-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz"; + sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc"; + name = "kde-l10n-pl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz"; + sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1"; + name = "kde-l10n-nds-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz"; + sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr"; + name = "kde-l10n-km-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz"; + sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452"; + name = "kde-l10n-hu-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar"; + store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz"; + sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v"; + name = "kde-l10n-ko-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz"; + sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz"; + name = "kde-l10n-hi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz"; + sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3"; + name = "kde-l10n-ru-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz"; + sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1"; + name = "kde-l10n-nb-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz"; + sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h"; + name = "kde-l10n-en_GB-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz"; + sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla"; + name = "kde-l10n-gl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz"; + sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35"; + name = "kde-l10n-sl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz"; + sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc"; + name = "kate-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz"; + sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h"; + name = "kolourpaint-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz"; + sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj"; + name = "kruler-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar"; + store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz"; + sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib"; + name = "ktimer-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar"; + store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz"; + sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr"; + name = "ksquares-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar"; + store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz"; + sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy"; + name = "ksystemlog-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz"; + sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2"; + name = "kshisen-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar"; + store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz"; + sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm"; + name = "ksudoku-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz"; + sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx"; + name = "libkomparediff2-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar"; + store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz"; + sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8"; + name = "kamera-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz"; + sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j"; + name = "kscd-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar"; + store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz"; + sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721"; + name = "kdegraphics-mobipocket-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar"; + store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz"; + sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825"; + name = "ksnapshot-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar"; + store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz"; + sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz"; + name = "ksnakeduel-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar"; + store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz"; + sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8"; + name = "filelight-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz"; + sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l"; + name = "step-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar"; + store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz"; + sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl"; + name = "kompare-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar"; + store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz"; + sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv"; + name = "kblocks-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz"; + sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc"; + name = "knetwalk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar"; + store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz"; + sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19"; + name = "killbots-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz"; + sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f"; + name = "kde-wallpapers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar"; + store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz"; + sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc"; + name = "bomber-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz"; + sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w"; + name = "kjumpingcube-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz"; + sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk"; + name = "kfourinline-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar"; + store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz"; + sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig"; + name = "kwordquiz-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz"; + sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f"; + name = "palapeli-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz"; + sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz"; + name = "libkdcraw-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz"; + sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98"; + name = "sweeper-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar"; + store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz"; + sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp"; + name = "zeroconf-ioslave-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar"; + store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz"; + sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l"; + name = "kalgebra-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz"; + sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74"; + name = "kaccessible-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar"; + store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz"; + sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a"; + name = "kdepim-runtime-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz"; + sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8"; + name = "kmix-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz"; + sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl"; + name = "kbreakout-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz"; + sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy"; + name = "libkmahjongg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz"; + sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb"; + name = "kmahjongg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar"; + store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz"; + sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii"; + name = "libkdeedu-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar"; + store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz"; + sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z"; + name = "kstars-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz"; + sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg"; + name = "granatier-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz"; + sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy"; + name = "juk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar"; + store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz"; + sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh"; + name = "kdepimlibs-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz"; + sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27"; + name = "libkdegames-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar"; + store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz"; + sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm"; + name = "ktuberling-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz"; + sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd"; + name = "poxml-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar"; + store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz"; + sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9"; + name = "kmag-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz"; + sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai"; + name = "kde-runtime-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz"; + sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2"; + name = "lokalize-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz"; + sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp"; + name = "kopete-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar"; + store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz"; + sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v"; + name = "parley-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz"; + sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira"; + name = "svgpart-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz"; + sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh"; + name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz"; + sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji"; + name = "ffmpegthumbs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz"; + sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks"; + name = "kdesdk-kioslaves-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz"; + sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m"; + name = "kremotecontrol-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz"; + sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp"; + name = "kdenetwork-filesharing-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz"; + sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb"; + name = "audiocd-kio-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz"; + sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a"; + name = "konsole-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz"; + sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr"; + name = "mplayerthumbs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar"; + store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz"; + sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns"; + name = "kde-dev-utils-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz"; + sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy"; + name = "krdc-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz"; + sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm"; + name = "klickety-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar"; + store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz"; + sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5"; + name = "kdiamond-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz"; + sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx"; + name = "ark-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz"; + sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6"; + name = "kfloppy-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz"; + sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im"; + name = "picmi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar"; + store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz"; + sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh"; + name = "konquest-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar"; + store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz"; + sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24"; + name = "kalzium-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar"; + store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz"; + sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1"; + name = "kde-base-artwork-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz"; + sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb"; + name = "blinken-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz"; + sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v"; + name = "kcharselect-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz"; + sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy"; + name = "umbrello-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz"; + sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia"; + name = "kget-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar"; + store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz"; + sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim"; + name = "kuser-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar"; + store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz"; + sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31"; + name = "kigo-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz"; + sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj"; + name = "dolphin-plugins-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar"; + store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz"; + sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn"; + name = "katomic-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz"; + sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p"; + name = "rocs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz"; + sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144"; + name = "libkcddb-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz"; + sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz"; + name = "kdewebdev-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar"; + store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz"; + sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb"; + name = "krfb-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz"; + sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd"; + name = "kde-baseapps-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz"; + sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y"; + name = "cantor-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar"; + store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz"; + sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk"; + name = "kdelibs-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz"; + sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0"; + name = "kubrick-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz"; + sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r"; + name = "kpat-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar"; + store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz"; + sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4"; + name = "marble-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar"; + store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz"; + sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj"; + name = "kcolorchooser-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz"; + sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam"; + name = "libkface-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz"; + sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin"; + name = "kbounce-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz"; + sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki"; + name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz"; + sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5"; + name = "kcalc-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz"; + sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k"; + name = "lskat-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz"; + sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c"; + name = "amor-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar"; + store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz"; + sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x"; + name = "klines-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz"; + sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0"; + name = "kiriki-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz"; + sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i"; + name = "kgpg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar"; + store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz"; + sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g"; + name = "kolf-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar"; + store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz"; + sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0"; + name = "superkaramba-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz"; + sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb"; + name = "kapman-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz"; + sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5"; + name = "khangman-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz"; + sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3"; + name = "libksane-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz"; + sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8"; + name = "kgoldrunner-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar"; + store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz"; + sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp"; + name = "bovo-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz"; + sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm"; + name = "kgamma-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz"; + sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj"; + name = "kajongg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz"; + sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7"; + name = "kppp-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz"; + sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i"; + name = "kmplot-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz"; + sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp"; + name = "kdf-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz"; + sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki"; + name = "knavalbattle-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz"; + sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m"; + name = "ksirk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz"; + sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5"; + name = "print-manager-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar"; + store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz"; + sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh"; + name = "artikulate-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz"; + sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb"; + name = "kdeedu-data-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz"; + sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34"; + name = "kturtle-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar"; + store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz"; + sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c"; + name = "klettres-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz"; + sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk"; + name = "libkeduvocdocument-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz"; + sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7"; + name = "libkcompactdisc-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz"; + sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r"; + name = "kdesdk-strigi-analyzers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz"; + sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd"; + name = "kiten-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar"; + store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz"; + sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4"; + name = "kwalletmanager-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz"; + sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4"; + name = "kanagram-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar"; + store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz"; + sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb"; + name = "kspaceduel-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar"; + store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz"; + sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb"; + name = "kig-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz"; + sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz"; + name = "jovie-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar"; + store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz"; + sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax"; + name = "cervisia-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz"; + sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj"; + name = "dragon-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar"; + store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz"; + sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0"; + name = "kqtquickcharts-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar"; + store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz"; + sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6"; + name = "kblackbox-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz"; + sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy"; + name = "kapptemplate-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar"; + store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz"; + sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf"; + name = "kgeography-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz"; + sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah"; + name = "ksaneplugin-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar"; + store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz"; + sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7"; + name = "okular-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz"; + sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk"; + name = "kdesdk-thumbnailers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar"; + store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz"; + sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx"; + name = "kde-workspace-4.11.17.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar"; + store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz"; + sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p"; + name = "ktux-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar"; + store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz"; + sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08"; + name = "kmousetool-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar"; + store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz"; + sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6"; + name = "oxygen-icons-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz"; + sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h"; + name = "ktouch-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar"; + store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz"; + sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf"; + name = "kollision-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz"; + sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax"; + name = "kdegraphics-thumbnailers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar"; + store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz"; + sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw"; + name = "gwenview-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar"; + store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz"; + sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f"; + name = "kmines-14.12.3.tar.xz"; + }; + } ] diff --git a/pkgs/applications/kde-apps-14.12/manifest.sh b/pkgs/applications/kde-apps-14.12/manifest.sh index 487e505ccd0f..7e3038275b85 100755 --- a/pkgs/applications/kde-apps-14.12/manifest.sh +++ b/pkgs/applications/kde-apps-14.12/manifest.sh @@ -6,6 +6,8 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ http://download.kde.org/stable/applications/14.12.1/ \ + http://download.kde.org/stable/applications/14.12.2/ \ + http://download.kde.org/stable/applications/14.12.3/ \ -A '*.tar.xz' else diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 9bf481189e38..a2b3c15f0444 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 982c0d618d52..27eced335dca 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw , jackaudioSupport ? false, jack2 -, cudaSupport ? false, cudatoolkit6 +, cudaSupport ? false, cudatoolkit65 , colladaSupport ? true, opencollada }: @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; }; + patches = [ ./sm52.patch ]; + buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6 + ++ optional cudaSupport cudatoolkit65 ++ optional colladaSupport opencollada; postUnpack = @@ -40,6 +42,7 @@ stdenv.mkDerivation rec { "-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" + "-DWITH_PLAYER=ON" "-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" diff --git a/pkgs/applications/misc/blender/sm52.patch b/pkgs/applications/misc/blender/sm52.patch new file mode 100644 index 000000000000..7cb86c53bddb --- /dev/null +++ b/pkgs/applications/misc/blender/sm52.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' blender-2.73a-orig/CMakeLists.txt blender-2.73a/CMakeLists.txt +--- blender-2.73a-orig/CMakeLists.txt 2015-01-21 13:31:24.000000000 +0100 ++++ blender-2.73a/CMakeLists.txt 2015-03-01 23:14:22.962585422 +0100 +@@ -351,7 +351,7 @@ + option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF) + option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL}) + option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) +-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for") ++set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for") + mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) + unset(PLATFORM_DEFAULT) + option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ee064865d340..b96dfaf53976 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.20.0"; + name = "calibre-2.22.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13246f4vxz4ps3c549hrnwdkwic5jsf7g1faham38z1ixd094lkd"; + sha256 = "19hpm5xzhjr0nfjm6xyqxjx2iwm3iw7y6bbs11337arfrxn16ly0"; }; inherit python; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix new file mode 100644 index 000000000000..78cd08e212c6 --- /dev/null +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, gtk, libnotify, unzip, glib, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "cbatticon-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/valr/cbatticon/archive/${version}.zip"; + sha256 = "1jkaar987ayydgghl8s8f1yy41mcmhqvgw897jv4y8yliskn0604"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ gtk libnotify unzip glib pkgconfig ]; + + meta = with stdenv.lib; { + description = "A lightweight and fast battery icon that sits in your system tray"; + homepage = https://github.com/valr/cbatticon; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 0950817c7888..fa5ae99f4fb5 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }: stdenv.mkDerivation rec { - name = "cherrytree-0.35.6"; + name = "cherrytree-0.35.7"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "1nfrnnwaxb07jf5c3id8zimr3q3rbhvzjlmpb99d41d7hqrd2bxj"; + sha256 = "03p3bx7skc361rmh0axhm0fa0inmxv4bpa9l566wskb3zq4sy4g3"; }; propagatedBuildInputs = [ pythonPackages.sqlite3 ]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index f64593517aff..a13004ecd022 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; - version = "14.12.1"; + version = "15.02.1"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "1sybsa84qznlzcgn18p70gh1v60npwfca5yn80h35msxrnh8gbp5"; + sha256 = "18pb31vd9786q522i1i780wpzr6vih9gg9d8k508gh2d5yr4aal6"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index b8779eca0dc1..bbd944066357 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "14.12.1"; + version = "15.02.1"; in stdenv.mkDerivation { name = "curaengine-${version}"; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "1cfns71mjndy2dlmccmjx8ldd0p5v88sqg0jg6ak5c864cvgbjdr"; + sha256 = "18fxh910b66s45757zqh8bm5kdxjgvxispjqknqkwl1nrllzmx53"; }; installPhase = '' diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 404fb9553861..da3b364f3eb6 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,10 +1,10 @@ { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-0.12.1b"; + name = "doomseeker-0.12.2b"; src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "110yg3w3y1x8p4gqpxb6djxw348caj50q5liq8ssb5mf78v8gk6b"; + sha256 = "1bcrxc3g9c6b4d8dbm2rx0ldxkqc5fc91jndkwiaykf8hajm0jnr"; }; cmakeFlags = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 97ffd02e7514..2638594d7e54 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, buildPythonPackage, slowaes, ecdsa, pyqt4 }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: buildPythonPackage rec { namePrefix = ""; name = "electrum-${version}"; - version = "1.9.8"; + version = "2.0.3"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff"; + sha256 = "1kzrbnkl5jps0kf0420vzpiqjk3v1jxvlrxwhc0f58xbqyc7l4mj"; }; - buildInputs = [ slowaes ecdsa ]; - - propagatedBuildInputs = [ - slowaes + propagatedBuildInputs = with pythonPackages; [ + dns ecdsa + pbkdf2 + protobuf + pyasn1 + pyasn1-modules pyqt4 + qrcode + requests + slowaes + tlslite ]; postPatch = '' @@ -28,6 +34,6 @@ buildPythonPackage rec { long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain."; homepage = "https://electrum.org"; license = stdenv.lib.licenses.gpl3; - maintainers = [ "emery@vfemail.net" ]; + maintainers = [ "emery@vfemail.net" stdenv.lib.maintainers.joachifm ]; }; } diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 0c084f9d018c..e4b0675aa945 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,19 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper +{ stdenv, lib, fetchgit, makeWrapper , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify , libxkbcommon, xlibs, udev , bashInteractive }: -let rev = "5ccde4e8f2c02a398f9172e07c25262ecf954626"; -in stdenv.mkDerivation { - name = "finalterm-git-${builtins.substring 0 8 rev}"; +stdenv.mkDerivation { + name = "finalterm-git-2014-11-15"; - src = fetchFromGitHub { - owner = "p-e-w"; - repo = "finalterm"; - inherit rev; - sha256 = "1gw6nc19whfjd4xj0lc0fmjypn8d7nasif79671859ymnfizyq4f"; + src = fetchgit { + url = "https://github.com/p-e-w/finalterm.git"; + rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; + sha256 = "c3ec9b36692b66a3aaa3125b2947c83beda4705b6d6f4a10b9bde9d8db8367c5"; }; buildInputs = [ @@ -34,6 +32,11 @@ in stdenv.mkDerivation { ) ''; + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + postFixup = '' wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix new file mode 100644 index 000000000000..f4d4af0e12df --- /dev/null +++ b/pkgs/applications/misc/hstr/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, readline, ncurses }: + +let + version = "1.16"; +in +stdenv.mkDerivation rec { + + name = "hstr-${version}"; + + src = fetchurl { + url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; + sha256 = "1hl3fn6kravx5gsdsr0l824vnkj5aiz0dybhd3ak932v95b5knyg"; + }; + + buildInputs = [ readline ncurses ]; + + meta = { + homepage = "https://github.com/dvorka/hstr"; + description = "Shell history suggest box - easily view, navigate, search and use your command history"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; # Cannot test others + }; + +} diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index ee93f57eafcd..1b71989f8b6b 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-2.0.2"; + name = "wacomtablet-2.1.0"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz"; - sha256 = "13k5f5xpka5cbgl24a3j9khqcmp96x1vhynn9v558ag6dg9ch2hw"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz"; + sha256 = "17n1p5v2yx517hkqd13pyl3wnrdnh6pfzwf2y2csrfckyndhwk8w"; }; buildInputs = [ kdelibs xf86_input_wacom ]; diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase-node-client/default.nix index bacd8d46fd56..048b42159b8f 100644 --- a/pkgs/applications/misc/keybase-node-client/default.nix +++ b/pkgs/applications/misc/keybase-node-client/default.nix @@ -11,11 +11,11 @@ let in nodePackages.buildNodePackage rec { name = "keybase-node-client-${version}"; - version = "0.7.0"; + version = "0.7.7"; src = [(fetchurl { url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz"; - sha256 = "0n73v4f61rq2dvy2yd3s4l8qvvjzp3ncqj70llm4i6cvbp9kym1v"; + sha256 = "1p2plxz4lf5pbrvl5sql00lk459lnxcz7cxc4cdhfzc6h4ql425f"; })]; deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); diff --git a/pkgs/applications/misc/keybase-node-client/package.nix b/pkgs/applications/misc/keybase-node-client/package.nix index 85d10ad0ba45..2835fe81b989 100644 --- a/pkgs/applications/misc/keybase-node-client/package.nix +++ b/pkgs/applications/misc/keybase-node-client/package.nix @@ -3,1027 +3,898 @@ { by-spec."CSSselect"."~0.4.0" = self.by-version."CSSselect"."0.4.1"; - by-version."CSSselect"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSselect-0.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; - name = "CSSselect-0.4.1.tgz"; - sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; - }) - ]; - buildInputs = - (self.nativeDeps."CSSselect" or []); - deps = [ - self.by-version."CSSwhat"."0.4.7" - self.by-version."domutils"."1.4.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "CSSselect" ]; + by-version."CSSselect"."0.4.1" = self.buildNodePackage { + name = "CSSselect-0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; + name = "CSSselect-0.4.1.tgz"; + sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; + }; + deps = { + "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7"; + "domutils-1.4.3" = self.by-version."domutils"."1.4.3"; + }; + peerDependencies = []; }; by-spec."CSSwhat"."0.4" = self.by-version."CSSwhat"."0.4.7"; - by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - name = "CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; - }) - ]; - buildInputs = - (self.nativeDeps."CSSwhat" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "CSSwhat" ]; + by-version."CSSwhat"."0.4.7" = self.buildNodePackage { + name = "CSSwhat-0.4.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + name = "CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; - by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "node-argparse-0.1.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; - name = "argparse-0.1.15.tgz"; - sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; - }) - ]; - buildInputs = - (self.nativeDeps."argparse" or []); - deps = [ - self.by-version."underscore"."1.4.4" - self.by-version."underscore.string"."2.3.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "argparse" ]; + by-version."argparse"."0.1.15" = self.buildNodePackage { + name = "argparse-0.1.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + name = "argparse-0.1.15.tgz"; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + }; + deps = { + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; + }; + peerDependencies = []; }; "argparse" = self.by-version."argparse"."0.1.15"; by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-asn1-0.1.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }) - ]; - buildInputs = - (self.nativeDeps."asn1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "asn1" ]; - }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-assert-plus-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; - }) - ]; - buildInputs = - (self.nativeDeps."assert-plus" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "assert-plus" ]; + by-version."asn1"."0.1.11" = self.buildNodePackage { + name = "asn1-0.1.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."assert-plus"."^0.1.5" = + self.by-version."assert-plus"."0.1.5"; + by-version."assert-plus"."0.1.5" = self.buildNodePackage { + name = "assert-plus-0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."async"."0.2.x" = self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.2.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."async"."~0.9.0" = self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.9.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; + by-version."async"."0.9.0" = self.buildNodePackage { + name = "async-0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-aws-sign2-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sign2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "aws-sign2" ]; + by-version."aws-sign2"."0.5.0" = self.buildNodePackage { + name = "aws-sign2-0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."badnode"."^1.0.1" = + self.by-version."badnode"."1.0.1"; + by-version."badnode"."1.0.1" = self.buildNodePackage { + name = "badnode-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/badnode/-/badnode-1.0.1.tgz"; + name = "badnode-1.0.1.tgz"; + sha1 = "3f14123363badf4bed1acc8ed839ee99b27ad7e0"; + }; + deps = { + "semver-4.3.1" = self.by-version."semver"."4.3.1"; + }; + peerDependencies = []; + }; + "badnode" = self.by-version."badnode"."1.0.1"; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."bitcoyne".">=0.0.6" = - self.by-version."bitcoyne"."0.0.6"; - by-version."bitcoyne"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-bitcoyne-0.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-0.0.6.tgz"; - name = "bitcoyne-0.0.6.tgz"; - sha1 = "a309d1afe7554f2b380782428cd6f67a82183d2f"; - }) - ]; - buildInputs = - (self.nativeDeps."bitcoyne" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."kbpgp"."1.0.5" - self.by-version."pgp-utils"."0.0.27" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bitcoyne" ]; - }; - "bitcoyne" = self.by-version."bitcoyne"."0.0.6"; + self.by-version."bitcoyne"."1.0.1"; + by-version."bitcoyne"."1.0.1" = self.buildNodePackage { + name = "bitcoyne-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-1.0.1.tgz"; + name = "bitcoyne-1.0.1.tgz"; + sha1 = "5a775f93ccb8c4b7b26d4c2a44c25916783cf40e"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "kbpgp-2.0.8" = self.by-version."kbpgp"."2.0.8"; + "pgp-utils-0.0.27" = self.by-version."pgp-utils"."0.0.27"; + }; + peerDependencies = []; + }; + "bitcoyne" = self.by-version."bitcoyne"."1.0.1"; by-spec."bn"."^1.0.0" = self.by-version."bn"."1.0.1"; - by-version."bn"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-bn-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz"; - name = "bn-1.0.1.tgz"; - sha1 = "a153825e6b1eb2c2db7726149b047a07ce0a3bb3"; - }) - ]; - buildInputs = - (self.nativeDeps."bn" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "bn" ]; + by-version."bn"."1.0.1" = self.buildNodePackage { + name = "bn-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz"; + name = "bn-1.0.1.tgz"; + sha1 = "a153825e6b1eb2c2db7726149b047a07ce0a3bb3"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."bn"."^1.0.1" = self.by-version."bn"."1.0.1"; "bn" = self.by-version."bn"."1.0.1"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-boom-0.4.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }) - ]; - buildInputs = - (self.nativeDeps."boom" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "boom" ]; + by-version."boom"."0.4.2" = self.buildNodePackage { + name = "boom-0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + peerDependencies = []; + }; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }; + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = []; }; by-spec."cheerio"."0.13.0" = self.by-version."cheerio"."0.13.0"; - by-version."cheerio"."0.13.0" = lib.makeOverridable self.buildNodePackage { - name = "node-cheerio-0.13.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz"; - name = "cheerio-0.13.0.tgz"; - sha1 = "44f5112044e0e0148300dd16bf8bbd7755ce65f1"; - }) - ]; - buildInputs = - (self.nativeDeps."cheerio" or []); - deps = [ - self.by-version."htmlparser2"."3.4.0" - self.by-version."underscore"."1.4.4" - self.by-version."entities"."0.5.0" - self.by-version."CSSselect"."0.4.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cheerio" ]; + by-version."cheerio"."0.13.0" = self.buildNodePackage { + name = "cheerio-0.13.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz"; + name = "cheerio-0.13.0.tgz"; + sha1 = "44f5112044e0e0148300dd16bf8bbd7755ce65f1"; + }; + deps = { + "htmlparser2-3.4.0" = self.by-version."htmlparser2"."3.4.0"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "entities-0.5.0" = self.by-version."entities"."0.5.0"; + "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1"; + }; + peerDependencies = []; }; "cheerio" = self.by-version."cheerio"."0.13.0"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; - by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-cli-0.4.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; - name = "cli-0.4.5.tgz"; - sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; - }) - ]; - buildInputs = - (self.nativeDeps."cli" or []); - deps = [ - self.by-version."glob"."4.0.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cli" ]; + by-version."cli"."0.4.5" = self.buildNodePackage { + name = "cli-0.4.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; + name = "cli-0.4.5.tgz"; + sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; + }; + deps = { + "glob-5.0.0" = self.by-version."glob"."5.0.0"; + }; + peerDependencies = []; }; by-spec."cliff"."0.1.x" = - self.by-version."cliff"."0.1.9"; - by-version."cliff"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "node-cliff-0.1.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; - name = "cliff-0.1.9.tgz"; - sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; - }) - ]; - buildInputs = - (self.nativeDeps."cliff" or []); - deps = [ - self.by-version."colors"."0.6.2" - self.by-version."eyes"."0.1.8" - self.by-version."winston"."0.8.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cliff" ]; + self.by-version."cliff"."0.1.10"; + by-version."cliff"."0.1.10" = self.buildNodePackage { + name = "cliff-0.1.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + name = "cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + }; + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; + }; + peerDependencies = []; }; by-spec."codesign"."0.0.9" = self.by-version."codesign"."0.0.9"; - by-version."codesign"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-codesign-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz"; - name = "codesign-0.0.9.tgz"; - sha1 = "2da6b703f1d1cf2a76e8b1d48f44fa922e21b55f"; - }) - ]; - buildInputs = - (self.nativeDeps."codesign" or []); - deps = [ - self.by-version."argparse"."0.1.15" - self.by-version."iced-error"."0.0.9" - self.by-version."iced-logger"."0.0.5" - self.by-version."glob-to-regexp"."0.0.1" - self.by-version."tablify"."0.1.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "codesign" ]; + by-version."codesign"."0.0.9" = self.buildNodePackage { + name = "codesign-0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz"; + name = "codesign-0.0.9.tgz"; + sha1 = "2da6b703f1d1cf2a76e8b1d48f44fa922e21b55f"; + }; + deps = { + "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6"; + "glob-to-regexp-0.0.2" = self.by-version."glob-to-regexp"."0.0.2"; + "tablify-0.1.5" = self.by-version."tablify"."0.1.5"; + }; + peerDependencies = []; }; "codesign" = self.by-version."codesign"."0.0.9"; by-spec."colors"."0.6.2" = self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-colors-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; + by-version."colors"."0.6.2" = self.buildNodePackage { + name = "colors-0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + deps = { + }; + peerDependencies = []; }; "colors" = self.by-version."colors"."0.6.2"; by-spec."colors"."0.6.x" = self.by-version."colors"."0.6.2"; - by-spec."colors"."0.x.x" = - self.by-version."colors"."0.6.2"; by-spec."colors".">=0.6.2" = - self.by-version."colors"."0.6.2"; + self.by-version."colors"."1.0.3"; + by-version."colors"."1.0.3" = self.buildNodePackage { + name = "colors-1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + name = "colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; + by-spec."colors"."~1.0.3" = + self.by-version."colors"."1.0.3"; by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.5"; - by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-combined-stream-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; - name = "combined-stream-0.0.5.tgz"; - sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; - }) - ]; - buildInputs = - (self.nativeDeps."combined-stream" or []); - deps = [ - self.by-version."delayed-stream"."0.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "combined-stream" ]; + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = self.buildNodePackage { + name = "combined-stream-0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; + peerDependencies = []; }; by-spec."commander".">= 0.5.2" = - self.by-version."commander"."2.3.0"; - by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; - name = "commander-2.3.0.tgz"; - sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; + self.by-version."commander"."2.6.0"; + by-version."commander"."2.6.0" = self.buildNodePackage { + name = "commander-2.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + name = "commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; - by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; - name = "commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; + by-version."commander"."2.1.0" = self.buildNodePackage { + name = "commander-2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."core-util-is"."~1.0.0" = self.by-version."core-util-is"."1.0.1"; - by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-core-util-is-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; - name = "core-util-is-1.0.1.tgz"; - sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; - }) - ]; - buildInputs = - (self.nativeDeps."core-util-is" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "core-util-is" ]; + by-version."core-util-is"."1.0.1" = self.buildNodePackage { + name = "core-util-is-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; + name = "core-util-is-1.0.1.tgz"; + sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cryptiles-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }) - ]; - buildInputs = - (self.nativeDeps."cryptiles" or []); - deps = [ - self.by-version."boom"."0.4.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cryptiles" ]; - }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ctype-0.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }) - ]; - buildInputs = - (self.nativeDeps."ctype" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ctype" ]; + by-version."cryptiles"."0.2.2" = self.buildNodePackage { + name = "cryptiles-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; + peerDependencies = []; + }; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = self.buildNodePackage { + name = "ctype-0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."cycle"."1.0.x" = self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-cycle-1.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }) - ]; - buildInputs = - (self.nativeDeps."cycle" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "cycle" ]; + by-version."cycle"."1.0.3" = self.buildNodePackage { + name = "cycle-1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."deep-equal"."0.2.1" = self.by-version."deep-equal"."0.2.1"; - by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-deep-equal-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; - name = "deep-equal-0.2.1.tgz"; - sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; + by-version."deep-equal"."0.2.1" = self.buildNodePackage { + name = "deep-equal-0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; + name = "deep-equal-0.2.1.tgz"; + sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; + }; + deps = { + }; + peerDependencies = []; }; "deep-equal" = self.by-version."deep-equal"."0.2.1"; by-spec."deep-equal".">=0.2.1" = - self.by-version."deep-equal"."0.2.1"; + self.by-version."deep-equal"."1.0.0"; + by-version."deep-equal"."1.0.0" = self.buildNodePackage { + name = "deep-equal-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"; + name = "deep-equal-1.0.0.tgz"; + sha1 = "d4564f07d2f0ab3e46110bec16592abd7dc2e326"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."deep-equal"."~0.2.1" = - self.by-version."deep-equal"."0.2.1"; + self.by-version."deep-equal"."0.2.2"; + by-version."deep-equal"."0.2.2" = self.buildNodePackage { + name = "deep-equal-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + name = "deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-delayed-stream-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }) - ]; - buildInputs = - (self.nativeDeps."delayed-stream" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "delayed-stream" ]; + by-version."delayed-stream"."0.0.5" = self.buildNodePackage { + name = "delayed-stream-0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."docco"."~0.6.2" = self.by-version."docco"."0.6.3"; - by-version."docco"."0.6.3" = lib.makeOverridable self.buildNodePackage { + by-version."docco"."0.6.3" = self.buildNodePackage { name = "docco-0.6.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz"; - name = "docco-0.6.3.tgz"; - sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee"; - }) - ]; - buildInputs = - (self.nativeDeps."docco" or []); - deps = [ - self.by-version."commander"."2.3.0" - self.by-version."marked"."0.3.2" - self.by-version."fs-extra"."0.12.0" - self.by-version."underscore"."1.7.0" - self.by-version."highlight.js"."8.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "docco" ]; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz"; + name = "docco-0.6.3.tgz"; + sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee"; + }; + deps = { + "commander-2.6.0" = self.by-version."commander"."2.6.0"; + "marked-0.3.3" = self.by-version."marked"."0.3.3"; + "fs-extra-0.16.4" = self.by-version."fs-extra"."0.16.4"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + "highlight.js-8.4.0" = self.by-version."highlight.js"."8.4.0"; + }; + peerDependencies = []; }; by-spec."domelementtype"."1" = - self.by-version."domelementtype"."1.1.1"; - by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-domelementtype-1.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; - name = "domelementtype-1.1.1.tgz"; - sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf"; - }) - ]; - buildInputs = - (self.nativeDeps."domelementtype" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "domelementtype" ]; + self.by-version."domelementtype"."1.3.0"; + by-version."domelementtype"."1.3.0" = self.buildNodePackage { + name = "domelementtype-1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + name = "domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."domhandler"."2.2" = - self.by-version."domhandler"."2.2.0"; - by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domhandler-2.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz"; - name = "domhandler-2.2.0.tgz"; - sha1 = "ac9febfa988034b43f78ba056ebf7bd373416476"; - }) - ]; - buildInputs = - (self.nativeDeps."domhandler" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domhandler" ]; + self.by-version."domhandler"."2.2.1"; + by-version."domhandler"."2.2.1" = self.buildNodePackage { + name = "domhandler-2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; + name = "domhandler-2.2.1.tgz"; + sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + peerDependencies = []; }; by-spec."domutils"."1.3" = self.by-version."domutils"."1.3.0"; - by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domutils-1.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; - name = "domutils-1.3.0.tgz"; - sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; - }) - ]; - buildInputs = - (self.nativeDeps."domutils" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domutils" ]; + by-version."domutils"."1.3.0" = self.buildNodePackage { + name = "domutils-1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; + name = "domutils-1.3.0.tgz"; + sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + peerDependencies = []; }; by-spec."domutils"."1.4" = 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.3.tgz"; - name = "domutils-1.4.3.tgz"; - sha1 = "0865513796c6b306031850e175516baf80b72a6f"; - }) - ]; - buildInputs = - (self.nativeDeps."domutils" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domutils" ]; + by-version."domutils"."1.4.3" = self.buildNodePackage { + name = "domutils-1.4.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + name = "domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + peerDependencies = []; }; by-spec."entities"."0.x" = self.by-version."entities"."0.5.0"; - by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-entities-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz"; - name = "entities-0.5.0.tgz"; - sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49"; - }) - ]; - buildInputs = - (self.nativeDeps."entities" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "entities" ]; + by-version."entities"."0.5.0" = self.buildNodePackage { + name = "entities-0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz"; + name = "entities-0.5.0.tgz"; + sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."eyes"."0.1.x" = self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-eyes-0.1.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }) - ]; - buildInputs = - (self.nativeDeps."eyes" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eyes" ]; - }; + by-version."eyes"."0.1.8" = self.buildNodePackage { + name = "eyes-0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."eyes"."~0.1.8" = + self.by-version."eyes"."0.1.8"; by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-forever-agent-0.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }) - ]; - buildInputs = - (self.nativeDeps."forever-agent" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "forever-agent" ]; + by-version."forever-agent"."0.5.2" = self.buildNodePackage { + name = "forever-agent-0.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }) - ]; - buildInputs = - (self.nativeDeps."form-data" or []); - deps = [ - self.by-version."combined-stream"."0.0.5" - self.by-version."mime"."1.2.11" - self.by-version."async"."0.9.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "form-data" ]; + by-version."form-data"."0.1.4" = self.buildNodePackage { + name = "form-data-0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + }; + peerDependencies = []; }; by-spec."framed-msgpack-rpc"."1.1.4" = self.by-version."framed-msgpack-rpc"."1.1.4"; - by-version."framed-msgpack-rpc"."1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-framed-msgpack-rpc-1.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz"; - name = "framed-msgpack-rpc-1.1.4.tgz"; - sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2"; - }) - ]; - buildInputs = - (self.nativeDeps."framed-msgpack-rpc" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - self.by-version."purepack"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "framed-msgpack-rpc" ]; + by-version."framed-msgpack-rpc"."1.1.4" = self.buildNodePackage { + name = "framed-msgpack-rpc-1.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz"; + name = "framed-msgpack-rpc-1.1.4.tgz"; + sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "purepack-1.0.1" = self.by-version."purepack"."1.0.1"; + }; + peerDependencies = []; }; "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4"; by-spec."fs-extra".">= 0.6.0" = - self.by-version."fs-extra"."0.12.0"; - by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage { - name = "node-fs-extra-0.12.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; - name = "fs-extra-0.12.0.tgz"; - sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; - }) - ]; - buildInputs = - (self.nativeDeps."fs-extra" or []); - deps = [ - self.by-version."ncp"."0.6.0" - self.by-version."mkdirp"."0.5.0" - self.by-version."jsonfile"."2.0.0" - self.by-version."rimraf"."2.2.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fs-extra" ]; + self.by-version."fs-extra"."0.16.4"; + by-version."fs-extra"."0.16.4" = self.buildNodePackage { + name = "fs-extra-0.16.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.4.tgz"; + name = "fs-extra-0.16.4.tgz"; + sha1 = "3e3d3cd6f388e2acbc0fc2e0202f0533ec0507b1"; + }; + deps = { + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; + "rimraf-2.3.1" = self.by-version."rimraf"."2.3.1"; + }; + peerDependencies = []; }; by-spec."glob".">= 3.1.4" = - self.by-version."glob"."4.0.6"; - by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-4.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; - name = "glob-4.0.6.tgz"; - sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = [ - self.by-version."graceful-fs"."3.0.2" - self.by-version."inherits"."2.0.1" - self.by-version."minimatch"."1.0.0" - self.by-version."once"."1.3.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; + self.by-version."glob"."5.0.0"; + by-version."glob"."5.0.0" = self.buildNodePackage { + name = "glob-5.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-5.0.0.tgz"; + name = "glob-5.0.0.tgz"; + sha1 = "bb00d4e340932eb101dc2a30e4127ddd51ed15ed"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = []; + }; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.0"; + by-version."glob"."4.5.0" = self.buildNodePackage { + name = "glob-4.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.5.0.tgz"; + name = "glob-4.5.0.tgz"; + sha1 = "d6511322e9d5c9bc689f20eb7348f00489723882"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = []; }; by-spec."glob-to-regexp".">=0.0.1" = - self.by-version."glob-to-regexp"."0.0.1"; - by-version."glob-to-regexp"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-to-regexp-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.1.tgz"; - name = "glob-to-regexp-0.0.1.tgz"; - sha1 = "2a5f79f2ed3233d4ee9ea7b6412547000c3f9d75"; - }) - ]; - buildInputs = - (self.nativeDeps."glob-to-regexp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob-to-regexp" ]; - }; - by-spec."gpg-wrapper"."0.0.47" = - self.by-version."gpg-wrapper"."0.0.47"; - by-version."gpg-wrapper"."0.0.47" = lib.makeOverridable self.buildNodePackage { - name = "node-gpg-wrapper-0.0.47"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-0.0.47.tgz"; - name = "gpg-wrapper-0.0.47.tgz"; - sha1 = "5de253269cb999e3e928a375971c7613bcb29d36"; - }) - ]; - buildInputs = - (self.nativeDeps."gpg-wrapper" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."iced-spawn"."0.0.10" - self.by-version."iced-utils"."0.1.21" - self.by-version."pgp-utils"."0.0.27" - ]; - peerDependencies = [ - ]; - passthru.names = [ "gpg-wrapper" ]; - }; - "gpg-wrapper" = self.by-version."gpg-wrapper"."0.0.47"; - by-spec."graceful-fs"."^3.0.2" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-3.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; + self.by-version."glob-to-regexp"."0.0.2"; + by-version."glob-to-regexp"."0.0.2" = self.buildNodePackage { + name = "glob-to-regexp-0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.2.tgz"; + name = "glob-to-regexp-0.0.2.tgz"; + sha1 = "82cb3c797594b47890f180f015c1773601374b91"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."gpg-wrapper".">=1.0.3" = + self.by-version."gpg-wrapper"."1.0.3"; + by-version."gpg-wrapper"."1.0.3" = self.buildNodePackage { + name = "gpg-wrapper-1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.3.tgz"; + name = "gpg-wrapper-1.0.3.tgz"; + sha1 = "826260e7ae53932f80574e04240bbb8999227cd1"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0"; + "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "spotty-1.0.0" = self.by-version."spotty"."1.0.0"; + }; + peerDependencies = []; + }; + "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.3"; + by-spec."graceful-fs"."^3.0.5" = + self.by-version."graceful-fs"."3.0.5"; + by-version."graceful-fs"."3.0.5" = self.buildNodePackage { + name = "graceful-fs-3.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"; + name = "graceful-fs-3.0.5.tgz"; + sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; - by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-hawk-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - name = "hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk" or []); - deps = [ - self.by-version."hoek"."0.9.1" - self.by-version."boom"."0.4.2" - self.by-version."cryptiles"."0.2.2" - self.by-version."sntp"."0.2.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; + by-version."hawk"."1.0.0" = self.buildNodePackage { + name = "hawk-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; + peerDependencies = []; }; by-spec."highlight.js".">= 8.0.x" = - self.by-version."highlight.js"."8.2.0"; - by-version."highlight.js"."8.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-highlight.js-8.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.2.0.tgz"; - name = "highlight.js-8.2.0.tgz"; - sha1 = "31ac0ea5d20f88f562948e7e8eb5a62e9e8c5e43"; - }) - ]; - buildInputs = - (self.nativeDeps."highlight.js" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "highlight.js" ]; + self.by-version."highlight.js"."8.4.0"; + by-version."highlight.js"."8.4.0" = self.buildNodePackage { + name = "highlight.js-8.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.4.0.tgz"; + name = "highlight.js-8.4.0.tgz"; + sha1 = "dc0d05b8dc9b110f13bce52cb96fd1e0c6bc791c"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-hoek-0.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }) - ]; - buildInputs = - (self.nativeDeps."hoek" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "hoek" ]; + by-version."hoek"."0.9.1" = self.buildNodePackage { + name = "hoek-0.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."htmlparser2"."~3.4.0" = self.by-version."htmlparser2"."3.4.0"; - by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-htmlparser2-3.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; - name = "htmlparser2-3.4.0.tgz"; - sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7"; - }) - ]; - buildInputs = - (self.nativeDeps."htmlparser2" or []); - deps = [ - 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.13" - ]; - peerDependencies = [ - ]; - passthru.names = [ "htmlparser2" ]; + by-version."htmlparser2"."3.4.0" = self.buildNodePackage { + name = "htmlparser2-3.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; + name = "htmlparser2-3.4.0.tgz"; + sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7"; + }; + deps = { + "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1"; + "domutils-1.3.0" = self.by-version."domutils"."1.3.0"; + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + peerDependencies = []; }; by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-http-signature-0.10.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; - }) - ]; - buildInputs = - (self.nativeDeps."http-signature" or []); - deps = [ - self.by-version."assert-plus"."0.1.2" - self.by-version."asn1"."0.1.11" - self.by-version."ctype"."0.5.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "http-signature" ]; + self.by-version."http-signature"."0.10.1"; + by-version."http-signature"."0.10.1" = self.buildNodePackage { + name = "http-signature-0.10.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; + peerDependencies = []; }; by-spec."iced-coffee-script"."~1.7.1-c" = self.by-version."iced-coffee-script"."1.7.1-g"; - by-version."iced-coffee-script"."1.7.1-g" = lib.makeOverridable self.buildNodePackage { + by-version."iced-coffee-script"."1.7.1-g" = self.buildNodePackage { name = "iced-coffee-script-1.7.1-g"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz"; - name = "iced-coffee-script-1.7.1-g.tgz"; - sha1 = "41f9ccabe113bade608d519c10a41406a62c170b"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-coffee-script" or []); - deps = [ - self.by-version."docco"."0.6.3" - self.by-version."iced-runtime"."1.0.1" - self.by-version."mkdirp"."0.3.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-coffee-script" ]; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz"; + name = "iced-coffee-script-1.7.1-g.tgz"; + sha1 = "41f9ccabe113bade608d519c10a41406a62c170b"; + }; + deps = { + "docco-0.6.3" = self.by-version."docco"."0.6.3"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + }; + peerDependencies = []; }; "iced-coffee-script" = self.by-version."iced-coffee-script"."1.7.1-g"; by-spec."iced-data-structures"."0.0.5" = self.by-version."iced-data-structures"."0.0.5"; - by-version."iced-data-structures"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-data-structures-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz"; - name = "iced-data-structures-0.0.5.tgz"; - sha1 = "21de124f847fdeeb88f32cf232d3e3e600e05db4"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-data-structures" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-data-structures" ]; + by-version."iced-data-structures"."0.0.5" = self.buildNodePackage { + name = "iced-data-structures-0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz"; + name = "iced-data-structures-0.0.5.tgz"; + sha1 = "21de124f847fdeeb88f32cf232d3e3e600e05db4"; + }; + deps = { + }; + peerDependencies = []; }; "iced-data-structures" = self.by-version."iced-data-structures"."0.0.5"; by-spec."iced-db"."0.0.4" = self.by-version."iced-db"."0.0.4"; - by-version."iced-db"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-db-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz"; - name = "iced-db-0.0.4.tgz"; - sha1 = "355bf9808998076013a0850ee33c6905dfb85a00"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-db" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."iced-utils"."0.1.21" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-db" ]; + by-version."iced-db"."0.0.4" = self.buildNodePackage { + name = "iced-db-0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz"; + name = "iced-db-0.0.4.tgz"; + sha1 = "355bf9808998076013a0850ee33c6905dfb85a00"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22"; + }; + peerDependencies = []; }; "iced-db" = self.by-version."iced-db"."0.0.4"; by-spec."iced-error"."0.0.9" = self.by-version."iced-error"."0.0.9"; - by-version."iced-error"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-error-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz"; - name = "iced-error-0.0.9.tgz"; - sha1 = "c7c3057614c0a187d96b3d18c6d520e6b872ed37"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-error" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-error" ]; + by-version."iced-error"."0.0.9" = self.buildNodePackage { + name = "iced-error-0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz"; + name = "iced-error-0.0.9.tgz"; + sha1 = "c7c3057614c0a187d96b3d18c6d520e6b872ed37"; + }; + deps = { + }; + peerDependencies = []; }; "iced-error" = self.by-version."iced-error"."0.0.9"; by-spec."iced-error".">=0.0.8" = @@ -1034,912 +905,727 @@ self.by-version."iced-error"."0.0.9"; by-spec."iced-expect"."0.0.3" = self.by-version."iced-expect"."0.0.3"; - by-version."iced-expect"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-expect-0.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz"; - name = "iced-expect-0.0.3.tgz"; - sha1 = "206f271f27b200b9b538e2c0ca66a70209be1238"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-expect" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-expect" ]; + by-version."iced-expect"."0.0.3" = self.buildNodePackage { + name = "iced-expect-0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz"; + name = "iced-expect-0.0.3.tgz"; + sha1 = "206f271f27b200b9b538e2c0ca66a70209be1238"; + }; + deps = { + }; + peerDependencies = []; }; "iced-expect" = self.by-version."iced-expect"."0.0.3"; by-spec."iced-lock"."^1.0.1" = self.by-version."iced-lock"."1.0.1"; - by-version."iced-lock"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-lock-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz"; - name = "iced-lock-1.0.1.tgz"; - sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-lock" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-lock" ]; + by-version."iced-lock"."1.0.1" = self.buildNodePackage { + name = "iced-lock-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz"; + name = "iced-lock-1.0.1.tgz"; + sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; "iced-lock" = self.by-version."iced-lock"."1.0.1"; by-spec."iced-logger"."0.0.5" = self.by-version."iced-logger"."0.0.5"; - by-version."iced-logger"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-logger-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz"; - name = "iced-logger-0.0.5.tgz"; - sha1 = "501852a410691cf7e9542598e04dfbfdadc51486"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-logger" or []); - deps = [ - self.by-version."colors"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-logger" ]; + by-version."iced-logger"."0.0.5" = self.buildNodePackage { + name = "iced-logger-0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz"; + name = "iced-logger-0.0.5.tgz"; + sha1 = "501852a410691cf7e9542598e04dfbfdadc51486"; + }; + deps = { + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + peerDependencies = []; }; "iced-logger" = self.by-version."iced-logger"."0.0.5"; by-spec."iced-logger".">=0.0.3" = - self.by-version."iced-logger"."0.0.5"; + self.by-version."iced-logger"."0.0.6"; + by-version."iced-logger"."0.0.6" = self.buildNodePackage { + name = "iced-logger-0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.6.tgz"; + name = "iced-logger-0.0.6.tgz"; + sha1 = "3f38081e4df4742aab09b86bb0adf8ea6c12de82"; + }; + deps = { + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + peerDependencies = []; + }; by-spec."iced-runtime".">=0.0.1" = - self.by-version."iced-runtime"."1.0.1"; - by-version."iced-runtime"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-runtime-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.1.tgz"; - name = "iced-runtime-1.0.1.tgz"; - sha1 = "b2a8f4544241408d076c581ffa97c67d32e3d49b"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-runtime" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-runtime" ]; - }; - "iced-runtime" = self.by-version."iced-runtime"."1.0.1"; + self.by-version."iced-runtime"."1.0.2"; + by-version."iced-runtime"."1.0.2" = self.buildNodePackage { + name = "iced-runtime-1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.2.tgz"; + name = "iced-runtime-1.0.2.tgz"; + sha1 = "a949a7cf49451175d3f6168d84997da27c4e6b70"; + }; + deps = { + }; + peerDependencies = []; + }; + "iced-runtime" = self.by-version."iced-runtime"."1.0.2"; by-spec."iced-runtime".">=0.0.1 <2.0.0-0" = - self.by-version."iced-runtime"."1.0.1"; + self.by-version."iced-runtime"."1.0.2"; by-spec."iced-runtime"."^1.0.0" = - self.by-version."iced-runtime"."1.0.1"; + self.by-version."iced-runtime"."1.0.2"; by-spec."iced-runtime"."^1.0.1" = - self.by-version."iced-runtime"."1.0.1"; - by-spec."iced-spawn"."0.0.10" = - self.by-version."iced-spawn"."0.0.10"; - by-version."iced-spawn"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-spawn-0.0.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-0.0.10.tgz"; - name = "iced-spawn-0.0.10.tgz"; - sha1 = "bef06e4fd98b73a519e6781bc3a4bdf2e78054f4"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-spawn" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - self.by-version."semver"."2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-spawn" ]; - }; - "iced-spawn" = self.by-version."iced-spawn"."0.0.10"; + self.by-version."iced-runtime"."1.0.2"; + by-spec."iced-runtime"."^1.0.2" = + self.by-version."iced-runtime"."1.0.2"; by-spec."iced-spawn".">=0.0.8" = - self.by-version."iced-spawn"."0.0.10"; + self.by-version."iced-spawn"."1.0.0"; + by-version."iced-spawn"."1.0.0" = self.buildNodePackage { + name = "iced-spawn-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-1.0.0.tgz"; + name = "iced-spawn-1.0.0.tgz"; + sha1 = "dab91968cb46f9c05baadd126a5abb53c5d7d1df"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "semver-4.3.1" = self.by-version."semver"."4.3.1"; + }; + peerDependencies = []; + }; + by-spec."iced-spawn".">=1.0.0" = + self.by-version."iced-spawn"."1.0.0"; + "iced-spawn" = self.by-version."iced-spawn"."1.0.0"; by-spec."iced-test".">=0.0.16" = - self.by-version."iced-test"."0.0.19"; - by-version."iced-test"."0.0.19" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-test-0.0.19"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.19.tgz"; - name = "iced-test-0.0.19.tgz"; - sha1 = "0aff4cfa5170a0ebf9d888695b233e68cf60c634"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-test" or []); - deps = [ - self.by-version."colors"."0.6.2" - self.by-version."deep-equal"."0.2.1" - self.by-version."iced-runtime"."1.0.1" - self.by-version."minimist"."1.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-test" ]; - }; - "iced-test" = self.by-version."iced-test"."0.0.19"; + self.by-version."iced-test"."0.0.21"; + by-version."iced-test"."0.0.21" = self.buildNodePackage { + name = "iced-test-0.0.21"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.21.tgz"; + name = "iced-test-0.0.21.tgz"; + sha1 = "8e7c347aa744eb4dddd786fcd430913be8bd83c7"; + }; + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + }; + peerDependencies = []; + }; + "iced-test" = self.by-version."iced-test"."0.0.21"; by-spec."iced-utils"."0.1.20" = self.by-version."iced-utils"."0.1.20"; - by-version."iced-utils"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-utils-0.1.20"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz"; - name = "iced-utils-0.1.20.tgz"; - sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-utils" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-utils" ]; + by-version."iced-utils"."0.1.20" = self.buildNodePackage { + name = "iced-utils-0.1.20"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz"; + name = "iced-utils-0.1.20.tgz"; + sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; "iced-utils" = self.by-version."iced-utils"."0.1.20"; by-spec."iced-utils".">=0.1.11" = - self.by-version."iced-utils"."0.1.21"; - by-version."iced-utils"."0.1.21" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-utils-0.1.21"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.21.tgz"; - name = "iced-utils-0.1.21.tgz"; - sha1 = "6f9fb61232c75f365340151794082a718ace436b"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-utils" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-utils" ]; + self.by-version."iced-utils"."0.1.22"; + by-version."iced-utils"."0.1.22" = self.buildNodePackage { + name = "iced-utils-0.1.22"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.22.tgz"; + name = "iced-utils-0.1.22.tgz"; + sha1 = "931925d9d39655a392fd337cefb2e111f503bb15"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; by-spec."iced-utils".">=0.1.16" = - self.by-version."iced-utils"."0.1.21"; + self.by-version."iced-utils"."0.1.22"; by-spec."iced-utils".">=0.1.18" = - self.by-version."iced-utils"."0.1.21"; + self.by-version."iced-utils"."0.1.22"; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = self.buildNodePackage { + name = "inflight-1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }; + deps = { + "once-1.3.1" = self.by-version."once"."1.3.1"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = []; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inherits-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; by-spec."ipv6"."~3.1.1" = self.by-version."ipv6"."3.1.1"; - by-version."ipv6"."3.1.1" = lib.makeOverridable self.buildNodePackage { + by-version."ipv6"."3.1.1" = self.buildNodePackage { name = "ipv6-3.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz"; - name = "ipv6-3.1.1.tgz"; - sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c"; - }) - ]; - buildInputs = - (self.nativeDeps."ipv6" or []); - deps = [ - self.by-version."sprintf"."0.1.4" - self.by-version."cli"."0.4.5" - self.by-version."cliff"."0.1.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ipv6" ]; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz"; + name = "ipv6-3.1.1.tgz"; + sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c"; + }; + deps = { + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; + "cli-0.4.5" = self.by-version."cli"."0.4.5"; + "cliff-0.1.10" = self.by-version."cliff"."0.1.10"; + }; + peerDependencies = []; }; by-spec."isarray"."0.0.1" = self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-isarray-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }) - ]; - buildInputs = - (self.nativeDeps."isarray" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "isarray" ]; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."isstream"."0.1.x" = + self.by-version."isstream"."0.1.1"; + by-version."isstream"."0.1.1" = self.buildNodePackage { + name = "isstream-0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"; + name = "isstream-0.1.1.tgz"; + sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."json-stringify-safe"."~5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-json-stringify-safe-5.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; - }) - ]; - buildInputs = - (self.nativeDeps."json-stringify-safe" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "json-stringify-safe" ]; + by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage { + name = "json-stringify-safe-5.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."jsonfile"."^2.0.0" = self.by-version."jsonfile"."2.0.0"; - by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-jsonfile-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; - name = "jsonfile-2.0.0.tgz"; - sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; - }) - ]; - buildInputs = - (self.nativeDeps."jsonfile" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "jsonfile" ]; + by-version."jsonfile"."2.0.0" = self.buildNodePackage { + name = "jsonfile-2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; + name = "jsonfile-2.0.0.tgz"; + sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."kbpgp".">=1.0.2" = - self.by-version."kbpgp"."1.0.5"; - by-version."kbpgp"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-kbpgp-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.0.5.tgz"; - name = "kbpgp-1.0.5.tgz"; - sha1 = "5dea54ffbe648494bd4afcdadae1323e1de909fa"; - }) - ]; - buildInputs = - (self.nativeDeps."kbpgp" or []); - deps = [ - self.by-version."bn"."1.0.1" - self.by-version."deep-equal"."0.2.1" - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."keybase-compressjs"."1.0.1-c" - self.by-version."keybase-ecurve"."1.0.0" - self.by-version."pgp-utils"."0.0.27" - self.by-version."purepack"."1.0.1" - self.by-version."triplesec"."3.0.19" - ]; - peerDependencies = [ - ]; - passthru.names = [ "kbpgp" ]; - }; - "kbpgp" = self.by-version."kbpgp"."1.0.5"; + self.by-version."kbpgp"."2.0.8"; + by-version."kbpgp"."2.0.8" = self.buildNodePackage { + name = "kbpgp-2.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.8.tgz"; + name = "kbpgp-2.0.8.tgz"; + sha1 = "5ede9539bce3564a53f8be72a75c7619414b6e08"; + }; + deps = { + "bn-1.0.1" = self.by-version."bn"."1.0.1"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c"; + "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "purepack-1.0.1" = self.by-version."purepack"."1.0.1"; + "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19"; + "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2"; + }; + peerDependencies = []; + }; + "kbpgp" = self.by-version."kbpgp"."2.0.8"; by-spec."kbpgp"."^1.0.2" = - self.by-version."kbpgp"."1.0.5"; + self.by-version."kbpgp"."1.2.0"; + by-version."kbpgp"."1.2.0" = self.buildNodePackage { + name = "kbpgp-1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.2.0.tgz"; + name = "kbpgp-1.2.0.tgz"; + sha1 = "4305a67a740fb31843b4313b60a6137f2b93ddba"; + }; + deps = { + "bn-1.0.1" = self.by-version."bn"."1.0.1"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c"; + "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "purepack-1.0.1" = self.by-version."purepack"."1.0.1"; + "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19"; + "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2"; + }; + peerDependencies = []; + }; + by-spec."kbpgp"."^2.0.0" = + self.by-version."kbpgp"."2.0.8"; by-spec."keybase-compressjs"."^1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c"; - by-version."keybase-compressjs"."1.0.1-c" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-compressjs-1.0.1-c"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz"; - name = "keybase-compressjs-1.0.1-c.tgz"; - sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-compressjs" or []); - deps = [ - self.by-version."commander"."2.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-compressjs" ]; + by-version."keybase-compressjs"."1.0.1-c" = self.buildNodePackage { + name = "keybase-compressjs-1.0.1-c"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz"; + name = "keybase-compressjs-1.0.1-c.tgz"; + sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f"; + }; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + }; + peerDependencies = []; }; by-spec."keybase-ecurve"."^1.0.0" = self.by-version."keybase-ecurve"."1.0.0"; - by-version."keybase-ecurve"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-ecurve-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz"; - name = "keybase-ecurve-1.0.0.tgz"; - sha1 = "c6bc72adda4603fd3184fee7e99694ed8fd69ad2"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-ecurve" or []); - deps = [ - self.by-version."bn"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-ecurve" ]; + by-version."keybase-ecurve"."1.0.0" = self.buildNodePackage { + name = "keybase-ecurve-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz"; + name = "keybase-ecurve-1.0.0.tgz"; + sha1 = "c6bc72adda4603fd3184fee7e99694ed8fd69ad2"; + }; + deps = { + "bn-1.0.1" = self.by-version."bn"."1.0.1"; + }; + peerDependencies = []; }; by-spec."keybase-path"."0.0.15" = self.by-version."keybase-path"."0.0.15"; - by-version."keybase-path"."0.0.15" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-path-0.0.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz"; - name = "keybase-path-0.0.15.tgz"; - sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-path" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-path" ]; + by-version."keybase-path"."0.0.15" = self.buildNodePackage { + name = "keybase-path-0.0.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz"; + name = "keybase-path-0.0.15.tgz"; + sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; "keybase-path" = self.by-version."keybase-path"."0.0.15"; - by-spec."keybase-proofs"."^1.1.3" = - self.by-version."keybase-proofs"."1.1.3"; - by-version."keybase-proofs"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-proofs-1.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-1.1.3.tgz"; - name = "keybase-proofs-1.1.3.tgz"; - sha1 = "f2a1a77c7e978a70480fb6ef4fb236f413f729da"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-proofs" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-lock"."1.0.1" - self.by-version."iced-runtime"."1.0.1" - self.by-version."pgp-utils"."0.0.27" - self.by-version."triplesec"."3.0.19" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-proofs" ]; - }; - "keybase-proofs" = self.by-version."keybase-proofs"."1.1.3"; + by-spec."keybase-proofs"."^2.0.13" = + self.by-version."keybase-proofs"."2.0.15"; + by-version."keybase-proofs"."2.0.15" = self.buildNodePackage { + name = "keybase-proofs-2.0.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.15.tgz"; + name = "keybase-proofs-2.0.15.tgz"; + sha1 = "d9e0c265e005095f749058825a7f0db3ab5bcedc"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19"; + }; + peerDependencies = []; + }; + "keybase-proofs" = self.by-version."keybase-proofs"."2.0.15"; by-spec."libkeybase"."^0.0.6" = self.by-version."libkeybase"."0.0.6"; - by-version."libkeybase"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-libkeybase-0.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz"; - name = "libkeybase-0.0.6.tgz"; - sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e"; - }) - ]; - buildInputs = - (self.nativeDeps."libkeybase" or []); - deps = [ - self.by-version."iced-lock"."1.0.1" - self.by-version."iced-logger"."0.0.5" - self.by-version."iced-runtime"."1.0.1" - self.by-version."kbpgp"."1.0.5" - self.by-version."tweetnacl"."0.12.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "libkeybase" ]; + by-version."libkeybase"."0.0.6" = self.buildNodePackage { + name = "libkeybase-0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz"; + name = "libkeybase-0.0.6.tgz"; + sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e"; + }; + deps = { + "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1"; + "iced-logger-0.0.5" = self.by-version."iced-logger"."0.0.5"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "kbpgp-1.2.0" = self.by-version."kbpgp"."1.2.0"; + "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2"; + }; + peerDependencies = []; }; "libkeybase" = self.by-version."libkeybase"."0.0.6"; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-lru-cache-2.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; by-spec."marked".">= 0.2.7" = - 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" ]; + self.by-version."marked"."0.3.3"; + by-version."marked"."0.3.3" = self.buildNodePackage { + name = "marked-0.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz"; + name = "marked-0.3.3.tgz"; + sha1 = "08bad9cac13736f6cceddc202344f1b0bf255390"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."merkle-tree"."0.0.12" = self.by-version."merkle-tree"."0.0.12"; - by-version."merkle-tree"."0.0.12" = lib.makeOverridable self.buildNodePackage { - name = "node-merkle-tree-0.0.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz"; - name = "merkle-tree-0.0.12.tgz"; - sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f"; - }) - ]; - buildInputs = - (self.nativeDeps."merkle-tree" or []); - deps = [ - self.by-version."deep-equal"."0.2.1" - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."iced-utils"."0.1.21" - ]; - peerDependencies = [ - ]; - passthru.names = [ "merkle-tree" ]; + by-version."merkle-tree"."0.0.12" = self.buildNodePackage { + name = "merkle-tree-0.0.12"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz"; + name = "merkle-tree-0.0.12.tgz"; + sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f"; + }; + deps = { + "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22"; + }; + peerDependencies = []; }; "merkle-tree" = self.by-version."merkle-tree"."0.0.12"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; + by-version."mime"."1.2.11" = self.buildNodePackage { + name = "mime-1.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."minimatch"."^1.0.0" = - self.by-version."minimatch"."1.0.0"; - by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-minimatch-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; - name = "minimatch-1.0.0.tgz"; - sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = [ - self.by-version."lru-cache"."2.5.0" - self.by-version."sigmund"."1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.1"; + by-version."minimatch"."2.0.1" = self.buildNodePackage { + name = "minimatch-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz"; + name = "minimatch-2.0.1.tgz"; + sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37"; + }; + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = []; }; by-spec."minimist".">=0.0.8" = self.by-version."minimist"."1.1.0"; - by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"; - name = "minimist-1.1.0.tgz"; - sha1 = "cdf225e8898f840a258ded44fc91776770afdc93"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; + by-version."minimist"."1.1.0" = self.buildNodePackage { + name = "minimist-1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"; + name = "minimist-1.1.0.tgz"; + sha1 = "cdf225e8898f840a258ded44fc91776770afdc93"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; + by-version."minimist"."0.0.10" = self.buildNodePackage { + name = "minimist-0.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."mkdirp"."0.3.5" = self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "node-mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; + by-version."mkdirp"."0.3.5" = self.buildNodePackage { + name = "mkdirp-0.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + deps = { + }; + peerDependencies = []; }; "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."^0.5.0" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - self.by-version."minimist"."0.0.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; by-spec."mkdirp"."~0.3.5" = self.by-version."mkdirp"."0.3.5"; by-spec."more-entropy".">=0.0.7" = self.by-version."more-entropy"."0.0.7"; - by-version."more-entropy"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-more-entropy-0.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz"; - name = "more-entropy-0.0.7.tgz"; - sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5"; - }) - ]; - buildInputs = - (self.nativeDeps."more-entropy" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "more-entropy" ]; + by-version."more-entropy"."0.0.7" = self.buildNodePackage { + name = "more-entropy-0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz"; + name = "more-entropy-0.0.7.tgz"; + sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; by-spec."mute-stream"."~0.0.4" = self.by-version."mute-stream"."0.0.4"; - by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-mute-stream-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - name = "mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; - }) - ]; - buildInputs = - (self.nativeDeps."mute-stream" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mute-stream" ]; - }; - by-spec."ncp"."^0.6.0" = - self.by-version."ncp"."0.6.0"; - by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "ncp-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; - name = "ncp-0.6.0.tgz"; - sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; - }) - ]; - buildInputs = - (self.nativeDeps."ncp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ncp" ]; + by-version."mute-stream"."0.0.4" = self.buildNodePackage { + name = "mute-stream-0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + name = "mute-stream-0.0.4.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."network-byte-order"."~0.2.0" = self.by-version."network-byte-order"."0.2.0"; - by-version."network-byte-order"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-network-byte-order-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz"; - name = "network-byte-order-0.2.0.tgz"; - sha1 = "6ac11bf44bf610daeddbe90a09a5c817c6e0d2b3"; - }) - ]; - buildInputs = - (self.nativeDeps."network-byte-order" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "network-byte-order" ]; + by-version."network-byte-order"."0.2.0" = self.buildNodePackage { + name = "network-byte-order-0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz"; + name = "network-byte-order-0.2.0.tgz"; + sha1 = "6ac11bf44bf610daeddbe90a09a5c817c6e0d2b3"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-node-uuid-1.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = self.buildNodePackage { + name = "node-uuid-1.4.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; - by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-oauth-sign-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - name = "oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }) - ]; - buildInputs = - (self.nativeDeps."oauth-sign" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "oauth-sign" ]; + by-version."oauth-sign"."0.3.0" = self.buildNodePackage { + name = "oauth-sign-0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."once"."^1.3.0" = self.by-version."once"."1.3.1"; - by-version."once"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-once-1.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz"; - name = "once-1.3.1.tgz"; - sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f"; - }) - ]; - buildInputs = - (self.nativeDeps."once" or []); - deps = [ - self.by-version."wrappy"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "once" ]; + by-version."once"."1.3.1" = self.buildNodePackage { + name = "once-1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz"; + name = "once-1.3.1.tgz"; + sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f"; + }; + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = []; }; by-spec."optimist"."0.6.1" = self.by-version."optimist"."0.6.1"; - by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-optimist-0.6.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - name = "optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.10" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; + by-version."optimist"."0.6.1" = self.buildNodePackage { + name = "optimist-0.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + name = "optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + deps = { + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + peerDependencies = []; }; "optimist" = self.by-version."optimist"."0.6.1"; - by-spec."pgp-utils".">=0.0.21" = + by-spec."pgp-utils"."0.0.27" = self.by-version."pgp-utils"."0.0.27"; - by-version."pgp-utils"."0.0.27" = lib.makeOverridable self.buildNodePackage { - name = "node-pgp-utils-0.0.27"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz"; - name = "pgp-utils-0.0.27.tgz"; - sha1 = "3c9afdc0c5d0674bd78ed5009e2d0aec20be32b3"; - }) - ]; - buildInputs = - (self.nativeDeps."pgp-utils" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "pgp-utils" ]; + by-version."pgp-utils"."0.0.27" = self.buildNodePackage { + name = "pgp-utils-0.0.27"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz"; + name = "pgp-utils-0.0.27.tgz"; + sha1 = "3c9afdc0c5d0674bd78ed5009e2d0aec20be32b3"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; + }; + by-spec."pgp-utils".">=0.0.21" = + self.by-version."pgp-utils"."0.0.28"; + by-version."pgp-utils"."0.0.28" = self.buildNodePackage { + name = "pgp-utils-0.0.28"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.28.tgz"; + name = "pgp-utils-0.0.28.tgz"; + sha1 = "fe29f874cb3f32d75daac79a33661b831a2e3add"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; by-spec."pgp-utils".">=0.0.22" = - self.by-version."pgp-utils"."0.0.27"; - "pgp-utils" = self.by-version."pgp-utils"."0.0.27"; + self.by-version."pgp-utils"."0.0.28"; + "pgp-utils" = self.by-version."pgp-utils"."0.0.28"; by-spec."pgp-utils".">=0.0.25" = - self.by-version."pgp-utils"."0.0.27"; + self.by-version."pgp-utils"."0.0.28"; + by-spec."pgp-utils".">=0.0.28" = + self.by-version."pgp-utils"."0.0.28"; by-spec."pkginfo"."0.3.x" = self.by-version."pkginfo"."0.3.0"; - by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-pkginfo-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; - name = "pkginfo-0.3.0.tgz"; - sha1 = "726411401039fe9b009eea86614295d5f3a54276"; - }) - ]; - buildInputs = - (self.nativeDeps."pkginfo" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "pkginfo" ]; + by-version."pkginfo"."0.3.0" = self.buildNodePackage { + name = "pkginfo-0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."progress"."1.1.3" = self.by-version."progress"."1.1.3"; - by-version."progress"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-progress-1.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz"; - name = "progress-1.1.3.tgz"; - sha1 = "42f89c5fc3b6f0408a0bdd68993b174f96aababf"; - }) - ]; - buildInputs = - (self.nativeDeps."progress" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "progress" ]; + by-version."progress"."1.1.3" = self.buildNodePackage { + name = "progress-1.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz"; + name = "progress-1.1.3.tgz"; + sha1 = "42f89c5fc3b6f0408a0bdd68993b174f96aababf"; + }; + deps = { + }; + peerDependencies = []; }; "progress" = self.by-version."progress"."1.1.3"; by-spec."progress"."~1.1.2" = self.by-version."progress"."1.1.8"; - by-version."progress"."1.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-progress-1.1.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; - name = "progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; - }) - ]; - buildInputs = - (self.nativeDeps."progress" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "progress" ]; + by-version."progress"."1.1.8" = self.buildNodePackage { + name = "progress-1.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + name = "progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; + self.by-version."punycode"."1.3.2"; + by-version."punycode"."1.3.2" = self.buildNodePackage { + name = "punycode-1.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + name = "punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."purepack"."1.0.1" = self.by-version."purepack"."1.0.1"; - by-version."purepack"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-purepack-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz"; - name = "purepack-1.0.1.tgz"; - sha1 = "9592f35bc22279a777885d3de04acc3555994f68"; - }) - ]; - buildInputs = - (self.nativeDeps."purepack" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "purepack" ]; + by-version."purepack"."1.0.1" = self.buildNodePackage { + name = "purepack-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz"; + name = "purepack-1.0.1.tgz"; + sha1 = "9592f35bc22279a777885d3de04acc3555994f68"; + }; + deps = { + }; + peerDependencies = []; }; "purepack" = self.by-version."purepack"."1.0.1"; by-spec."purepack".">=1" = @@ -1948,199 +1634,141 @@ self.by-version."purepack"."1.0.1"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; - by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-0.6.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - name = "qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }) - ]; - buildInputs = - (self.nativeDeps."qs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - by-spec."read"."~1.0.5" = + by-version."qs"."0.6.6" = self.buildNodePackage { + name = "qs-0.6.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."read"."keybase/read" = self.by-version."read"."1.0.5"; - by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-read-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - name = "read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read" or []); - deps = [ - self.by-version."mute-stream"."0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; + by-version."read"."1.0.5" = self.buildNodePackage { + name = "read-1.0.5"; + bin = false; + src = fetchgit { + url = "git://github.com/keybase/read"; + rev = "740ae6a1a72a96984ae3527eb0ce0066c9fc8d47"; + sha256 = "927ce6e6e88c80c54b434261afb5717630568b6979afffc6828c4fc0335e22ec"; + }; + deps = { + "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; + }; + peerDependencies = []; }; "read" = self.by-version."read"."1.0.5"; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13"; - by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.13"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; - name = "readable-stream-1.1.13.tgz"; - sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; - }) - ]; - 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.31" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; + by-version."readable-stream"."1.1.13" = self.buildNodePackage { + name = "readable-stream-1.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; + name = "readable-stream-1.1.13.tgz"; + sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = []; }; by-spec."request"."2.30.0" = self.by-version."request"."2.30.0"; - by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.30.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; - name = "request-2.30.0.tgz"; - sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.2" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."tough-cookie"."0.9.15" - self.by-version."form-data"."0.1.4" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign2"."0.5.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; + by-version."request"."2.30.0" = self.buildNodePackage { + name = "request-2.30.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; + name = "request-2.30.0.tgz"; + sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; + }; + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; + "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + }; + peerDependencies = []; }; "request" = self.by-version."request"."2.30.0"; by-spec."rimraf"."^2.2.8" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."semver"."2.2.1" = - self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - "semver" = self.by-version."semver"."2.2.1"; - by-spec."semver"."~2.2.1" = - self.by-version."semver"."2.2.1"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-sigmund-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }) - ]; - buildInputs = - (self.nativeDeps."sigmund" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sigmund" ]; - }; + self.by-version."rimraf"."2.3.1"; + by-version."rimraf"."2.3.1" = self.buildNodePackage { + name = "rimraf-2.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz"; + name = "rimraf-2.3.1.tgz"; + sha1 = "f83df78c168d5daf9f021e8e092e7a165898ee75"; + }; + deps = { + "glob-4.5.0" = self.by-version."glob"."4.5.0"; + }; + peerDependencies = []; + }; + by-spec."semver".">=2.2.1" = + self.by-version."semver"."4.3.1"; + by-version."semver"."4.3.1" = self.buildNodePackage { + name = "semver-4.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-4.3.1.tgz"; + name = "semver-4.3.1.tgz"; + sha1 = "beb0129575b95f76110b29af08d370fd9eeb34bf"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."semver"."^4.0.0" = + self.by-version."semver"."4.3.1"; + "semver" = self.by-version."semver"."4.3.1"; by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sntp-0.2.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }) - ]; - buildInputs = - (self.nativeDeps."sntp" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "sntp" ]; + by-version."sntp"."0.2.4" = self.buildNodePackage { + name = "sntp-0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + peerDependencies = []; }; by-spec."socks5-client"."0.x" = self.by-version."socks5-client"."0.3.6"; - by-version."socks5-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "node-socks5-client-0.3.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz"; - name = "socks5-client-0.3.6.tgz"; - sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1"; - }) - ]; - buildInputs = - (self.nativeDeps."socks5-client" or []); - deps = [ - self.by-version."ipv6"."3.1.1" - self.by-version."network-byte-order"."0.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socks5-client" ]; + by-version."socks5-client"."0.3.6" = self.buildNodePackage { + name = "socks5-client-0.3.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz"; + name = "socks5-client-0.3.6.tgz"; + sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1"; + }; + deps = { + "ipv6-3.1.1" = self.by-version."ipv6"."3.1.1"; + "network-byte-order-0.2.0" = self.by-version."network-byte-order"."0.2.0"; + }; + peerDependencies = []; }; by-spec."socks5-client"."^0.3.6" = self.by-version."socks5-client"."0.3.6"; @@ -2149,370 +1777,300 @@ self.by-version."socks5-client"."0.3.6"; by-spec."socks5-http-client"."^0.1.6" = self.by-version."socks5-http-client"."0.1.6"; - by-version."socks5-http-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-socks5-http-client-0.1.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz"; - name = "socks5-http-client-0.1.6.tgz"; - sha1 = "a915ba75573787876e5d3756ee4a81d60cd4b69b"; - }) - ]; - buildInputs = - (self.nativeDeps."socks5-http-client" or []); - deps = [ - self.by-version."socks5-client"."0.3.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socks5-http-client" ]; + by-version."socks5-http-client"."0.1.6" = self.buildNodePackage { + name = "socks5-http-client-0.1.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz"; + name = "socks5-http-client-0.1.6.tgz"; + sha1 = "a915ba75573787876e5d3756ee4a81d60cd4b69b"; + }; + deps = { + "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6"; + }; + peerDependencies = []; }; "socks5-http-client" = self.by-version."socks5-http-client"."0.1.6"; by-spec."socks5-https-client"."^0.2.2" = self.by-version."socks5-https-client"."0.2.2"; - by-version."socks5-https-client"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-socks5-https-client-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz"; - name = "socks5-https-client-0.2.2.tgz"; - sha1 = "b855e950e97c4fa6bca72a108f00278d33ac91d1"; - }) - ]; - buildInputs = - (self.nativeDeps."socks5-https-client" or []); - deps = [ - self.by-version."socks5-client"."0.3.6" - self.by-version."starttls"."0.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socks5-https-client" ]; + by-version."socks5-https-client"."0.2.2" = self.buildNodePackage { + name = "socks5-https-client-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz"; + name = "socks5-https-client-0.2.2.tgz"; + sha1 = "b855e950e97c4fa6bca72a108f00278d33ac91d1"; + }; + deps = { + "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6"; + "starttls-0.2.1" = self.by-version."starttls"."0.2.1"; + }; + peerDependencies = []; }; "socks5-https-client" = self.by-version."socks5-https-client"."0.2.2"; + by-spec."spotty"."^1.0.0" = + self.by-version."spotty"."1.0.0"; + by-version."spotty"."1.0.0" = self.buildNodePackage { + name = "spotty-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spotty/-/spotty-1.0.0.tgz"; + name = "spotty-1.0.0.tgz"; + sha1 = "05bb5152b3dd0744a341764db5fcf8e47943e678"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; + }; + "spotty" = self.by-version."spotty"."1.0.0"; by-spec."sprintf"."0.1.x" = - self.by-version."sprintf"."0.1.4"; - by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sprintf-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz"; - name = "sprintf-0.1.4.tgz"; - sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b"; - }) - ]; - buildInputs = - (self.nativeDeps."sprintf" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sprintf" ]; + self.by-version."sprintf"."0.1.5"; + by-version."sprintf"."0.1.5" = self.buildNodePackage { + name = "sprintf-0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + name = "sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."stack-trace"."0.0.x" = self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-stack-trace-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }) - ]; - buildInputs = - (self.nativeDeps."stack-trace" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "stack-trace" ]; + by-version."stack-trace"."0.0.9" = self.buildNodePackage { + name = "stack-trace-0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."starttls"."0.x" = self.by-version."starttls"."0.2.1"; - by-version."starttls"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-starttls-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; - name = "starttls-0.2.1.tgz"; - sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; - }) - ]; - buildInputs = - (self.nativeDeps."starttls" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "starttls" ]; + by-version."starttls"."0.2.1" = self.buildNodePackage { + name = "starttls-0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; + name = "starttls-0.2.1.tgz"; + sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage { - name = "node-string_decoder-0.10.31"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }) - ]; - buildInputs = - (self.nativeDeps."string_decoder" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "string_decoder" ]; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."tablify"."0.1.5" = self.by-version."tablify"."0.1.5"; - by-version."tablify"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "node-tablify-0.1.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz"; - name = "tablify-0.1.5.tgz"; - sha1 = "47160ce2918be291d63cecceddb5254dd72982c7"; - }) - ]; - buildInputs = - (self.nativeDeps."tablify" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tablify" ]; + by-version."tablify"."0.1.5" = self.buildNodePackage { + name = "tablify-0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz"; + name = "tablify-0.1.5.tgz"; + sha1 = "47160ce2918be291d63cecceddb5254dd72982c7"; + }; + deps = { + }; + peerDependencies = []; }; "tablify" = self.by-version."tablify"."0.1.5"; by-spec."tablify".">=0.1.5" = self.by-version."tablify"."0.1.5"; by-spec."timeago"."0.1.0" = self.by-version."timeago"."0.1.0"; - by-version."timeago"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-timeago-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz"; - name = "timeago-0.1.0.tgz"; - sha1 = "21176a84d469be35ee431c5c48c0b6aba1f72464"; - }) - ]; - buildInputs = - (self.nativeDeps."timeago" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "timeago" ]; + by-version."timeago"."0.1.0" = self.buildNodePackage { + name = "timeago-0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz"; + name = "timeago-0.1.0.tgz"; + sha1 = "21176a84d469be35ee431c5c48c0b6aba1f72464"; + }; + deps = { + }; + peerDependencies = []; }; "timeago" = self.by-version."timeago"."0.1.0"; by-spec."tough-cookie"."~0.9.15" = self.by-version."tough-cookie"."0.9.15"; - by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { - name = "node-tough-cookie-0.9.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; - name = "tough-cookie-0.9.15.tgz"; - sha1 = "75617ac347e3659052b0350131885829677399f6"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = [ - self.by-version."punycode"."1.3.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; + by-version."tough-cookie"."0.9.15" = self.buildNodePackage { + name = "tough-cookie-0.9.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; + name = "tough-cookie-0.9.15.tgz"; + sha1 = "75617ac347e3659052b0350131885829677399f6"; + }; + deps = { + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + }; + peerDependencies = []; }; by-spec."triplesec".">=3.0.16" = self.by-version."triplesec"."3.0.19"; - by-version."triplesec"."3.0.19" = lib.makeOverridable self.buildNodePackage { - name = "node-triplesec-3.0.19"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz"; - name = "triplesec-3.0.19.tgz"; - sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9"; - }) - ]; - buildInputs = - (self.nativeDeps."triplesec" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-lock"."1.0.1" - self.by-version."iced-runtime"."1.0.1" - self.by-version."more-entropy"."0.0.7" - self.by-version."progress"."1.1.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "triplesec" ]; + by-version."triplesec"."3.0.19" = self.buildNodePackage { + name = "triplesec-3.0.19"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz"; + name = "triplesec-3.0.19.tgz"; + sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "more-entropy-0.0.7" = self.by-version."more-entropy"."0.0.7"; + "progress-1.1.8" = self.by-version."progress"."1.1.8"; + }; + peerDependencies = []; }; "triplesec" = self.by-version."triplesec"."3.0.19"; by-spec."triplesec".">=3.0.19" = self.by-version."triplesec"."3.0.19"; by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-tunnel-agent-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - name = "tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }) - ]; - buildInputs = - (self.nativeDeps."tunnel-agent" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tunnel-agent" ]; + by-version."tunnel-agent"."0.3.0" = self.buildNodePackage { + name = "tunnel-agent-0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."tweetnacl"."^0.12.0" = self.by-version."tweetnacl"."0.12.2"; - by-version."tweetnacl"."0.12.2" = lib.makeOverridable self.buildNodePackage { - name = "node-tweetnacl-0.12.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; - name = "tweetnacl-0.12.2.tgz"; - sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; - }) - ]; - buildInputs = - (self.nativeDeps."tweetnacl" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tweetnacl" ]; - }; + by-version."tweetnacl"."0.12.2" = self.buildNodePackage { + name = "tweetnacl-0.12.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; + name = "tweetnacl-0.12.2.tgz"; + sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."tweetnacl"."^0.12.2" = + self.by-version."tweetnacl"."0.12.2"; by-spec."underscore".">= 1.0.0" = - self.by-version."underscore"."1.7.0"; - by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore-1.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - name = "underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; + self.by-version."underscore"."1.8.2"; + by-version."underscore"."1.8.2" = self.buildNodePackage { + name = "underscore-1.8.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz"; + name = "underscore-1.8.2.tgz"; + sha1 = "64df2eb590899de950782f3735190ba42ebf311d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."underscore"."~1.4" = self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore-1.4.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; + by-version."underscore"."1.4.4" = self.buildNodePackage { + name = "underscore-1.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-spec."underscore.string"."~2.3.1" = self.by-version."underscore.string"."2.3.3"; - by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore.string-2.3.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; - name = "underscore.string-2.3.3.tgz"; - sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore.string" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore.string" ]; + by-version."underscore.string"."2.3.3" = self.buildNodePackage { + name = "underscore.string-2.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."winston"."0.8.x" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-winston-0.8.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; - }) - ]; - buildInputs = - (self.nativeDeps."winston" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.3" - self.by-version."eyes"."0.1.8" - self.by-version."pkginfo"."0.3.0" - self.by-version."stack-trace"."0.0.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "winston" ]; + self.by-version."winston"."0.8.3"; + by-version."winston"."0.8.3" = self.buildNodePackage { + name = "winston-0.8.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + name = "winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; + "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; + }; + peerDependencies = []; }; by-spec."wordwrap"."~0.0.2" = self.by-version."wordwrap"."0.0.2"; - by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-wordwrap-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - name = "wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; + by-version."wordwrap"."0.0.2" = self.buildNodePackage { + name = "wordwrap-0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + name = "wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."wrappy"."1" = self.by-version."wrappy"."1.0.1"; - by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-wrappy-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; - name = "wrappy-1.0.1.tgz"; - sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; - }) - ]; - buildInputs = - (self.nativeDeps."wrappy" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wrappy" ]; + by-version."wrappy"."1.0.1" = self.buildNodePackage { + name = "wrappy-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }; + deps = { + }; + peerDependencies = []; }; } diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix new file mode 100644 index 000000000000..85720f644831 --- /dev/null +++ b/pkgs/applications/misc/khal/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgs, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + version = "0.4.0"; + name = "khal-${version}"; + + src = fetchurl { + url = "https://github.com/geier/khal/archive/v${version}.tar.gz"; + sha256 = "0d32miq55cly4q3raxkw3xpq4d5y3hvzaqvy066nv35bdlpafxi1"; + }; + + propagatedBuildInputs = with pythonPackages; [ + atomicwrites + click + configobj + dateutil + icalendar + lxml + pkgs.vdirsyncer + pytz + pyxdg + requests_toolbelt + tzlocal + urwid + ]; + + meta = { + homepage = http://lostpackets.de/khal/; + description = "CLI calendar application"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 93450d17916f..efe8785654a9 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64" \ + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ --prefix PATH : "${gnome_keyring}/bin" \ --prefix PATH : "${python}/bin" \ --set PYTHONPATH $PYTHONPATH \ diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch new file mode 100644 index 000000000000..e3aa5600e40e --- /dev/null +++ b/pkgs/applications/misc/procmail/CVE-2014-3618.patch @@ -0,0 +1,18 @@ +From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected). + +--- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700 ++++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700 +@@ -84,12 +84,11 @@ + case '"':*target++=delim='"';start++; + } + ;{ int i; +- do ++ while(*start) + if((i= *target++= *start++)==delim) /* corresponding delimiter? */ + break; + else if(i=='\\'&&*start) /* skip quoted character */ + *target++= *start++; +- while(*start); /* anything? */ + } + hitspc=2; + } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 38c982dc3e54..f4980cb2c6b3 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -15,10 +15,14 @@ stdenv.mkDerivation { make DESTDIR=\$out install "; - phases = "unpackPhase installPhase"; + phases = "unpackPhase patchPhase installPhase"; + + patches = [ ./CVE-2014-3618.patch ]; src = fetchurl { url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; }; + + meta.homepage = "http://www.procmail.org/"; } diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index aeb128bf778c..0845a379685e 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version = "0.4.14beta1"; + version = "0.4.14"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0ly0xqpgmd1ccsyqs6z0i3w1g4y3ichmibd809bjy344h6fb0m3b"; + sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; }; buildInputs = [ qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix new file mode 100644 index 000000000000..1bbe026cfebd --- /dev/null +++ b/pkgs/applications/misc/rofi/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig +, libX11, libXinerama, libXft, pango +, i3Support ? false, i3 +}: + +stdenv.mkDerivation rec { + name = "rofi-${version}"; + version = "0.15.2"; + + src = fetchFromGitHub { + repo = "rofi"; + owner = "DaveDavenport"; + rev = "${version}"; + sha256 = "0b8k5g2fpqrz1yac09kmfk4caxcc107qq4yhncnl159xdxw66vz8"; + }; + + buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango + ] ++ stdenv.lib.optional i3Support i3; + + preConfigure = '' + autoreconf -vif + ''; + + meta = { + description = "Window switcher, run dialog and dmenu replacement"; + homepage = https://davedavenport.github.io/rofi; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix new file mode 100644 index 000000000000..ef1bb0bed1dc --- /dev/null +++ b/pkgs/applications/misc/scim/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, yacc, ncurses, libxml2 }: + +let + version = "0.1.8"; +in +stdenv.mkDerivation rec { + + name = "scim-${version}"; + + src = fetchurl { + url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz"; + sha256 = "0qjixb1hzbdrypbmzwb2iaw5wp57kn7fmm1zpjp4gzjyanrhazs2"; + }; + + buildInputs = [ yacc ncurses libxml2 ]; + + buildPhase = '' + cd src + + sed "s,prefix=/usr,prefix=$out," Makefile + sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile + + make + export DESTDIR=$out + ''; + + installPhase = '' + make install prefix= + ''; + + meta = { + homepage = "https://github.com/andmarti1424/scim"; + description = "SCIM - Spreadsheet Calculator Improvised - SC fork"; + license = { + fullName = "SCIM License"; + url = "https://github.com/andmarti1424/scim/raw/master/LICENSE"; + }; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; # Cannot test others + }; + +} diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 978dd19e3dfa..0c9b6e8c08a0 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, p7zip }: +, gtk3, gsettings_desktop_schemas, p7zip }: let @@ -17,20 +17,21 @@ let categories = "Application;CAD;"; }; - buildInputs = [ ant jdk jre makeWrapper p7zip ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildPhase = '' ant furniture textures help mkdir -p $out/share/{java,applications} - mv build/*.jar $out/share/java/. + mv "build/"*.jar $out/share/java/. ant ''; installPhase = '' mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. - cp ${sweethome3dItem}/share/applications/* $out/share/applications + cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; @@ -50,14 +51,14 @@ let in rec { application = mkSweetHome3D rec { - version = "4.4"; + version = "4.6.2"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "1ziqq8wm6la7bsqya6gc8cc2vz02phl88msqjgqqfl2jf8bz9afv"; + sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index b48b95cda5bf..87da1c6643b2 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, p7zip, sweethome3dApp }: +, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: let @@ -24,7 +24,7 @@ let categories = "Application;CAD;"; }; - buildInputs = [ ant jre jdk makeWrapper ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -38,8 +38,9 @@ let mkdir -p $out/bin mkdir -p $out/share/{java,applications} cp ${module}-${version}.jar $out/share/java/. - cp ${editorItem}/share/applications/* $out/share/applications + cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; @@ -57,7 +58,7 @@ let d2u = stdenv.lib.replaceChars ["."] ["_"]; -in rec { +in { textures-editor = mkEditorProject rec { version = "1.4"; @@ -74,14 +75,14 @@ in rec { }; furniture-editor = mkEditorProject rec { - version = "1.14"; + version = "1.16"; module = "FurnitureLibraryEditor"; name = sweetName module version; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = stdenv.lib.licenses.gpl2; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0rdcd8vjbcv9jdms2xr3y7ykm2a9bkmwj4y7ybk9zcldayqsgn6z"; + sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix new file mode 100644 index 000000000000..de1abff9c16a --- /dev/null +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, qt4 }: + +stdenv.mkDerivation rec { + name = "xkblayout-state"; + version = "1b"; + + src = fetchurl { + url = "https://github.com/nonpop/${name}/archive/v${version}.tar.gz"; + sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx"; + }; + + buildInputs = [ qt4 ]; + + installPhase = '' + mkdir -p $out/bin + cp xkblayout-state $out/bin + ''; + + meta = with stdenv.lib; { + description = "A small command-line program to get/set the current XKB keyboard layout"; + homepage = https://github.com/nonpop/xkblayout-state; + license = licenses.gpl2; + maintainers = [ maintainers.jagajaga ]; + }; +} diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index c781a5619ae4..323782d60fe0 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext }: +{ stdenv, fetchurl, kdelibs, gettext, konsole }: let pname = "yakuake"; @@ -16,6 +16,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext ]; + patchPhase = '' + substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" + ''; + meta = { homepage = http://yakuake.kde.org; description = "Quad-style terminal emulator for KDE"; diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index ab3a4575212e..1b439daa853e 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -5,15 +5,15 @@ let else if stdenv.system == "i686-linux" then "i386" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "1prs3r6xcxq31xfdp3w2wdi3d7r6lw5r4d4zay2cwphmp4kpg3qg" - else if stdenv.system == "i686-linux" then "09rn95qvkdwlzqq11hqfq4i5cam6dip7ww1wd5dpyirzn8yw7cfh" + sha256 = if stdenv.system == "x86_64-linux" then "1b9f6qxpvyrzf23l71hw42qyg4i27by3hs91sm34drm24z7m7fpd" + else if stdenv.system == "i686-linux" then "0caqwaxd6i8cap35kpzkwy5dknk7iaxf5fbfjy46cbwylgcpsc2x" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "btsync-${version}"; - version = "1.4.106"; + version = "1.4.110"; src = fetchurl { url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index daefa2635109..e1144a44afb2 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "42.0.2305.3"; - sha256 = "00338x1x78wcvaxcnnq5cng30450gsyqnlwplgyq7zjsrpqpprvn"; - sha256bin32 = "1xxmyfmdksqpwwf3wxhxrxvqnvjxlwkhkrdzkmra7d74hz7mqjz7"; - sha256bin64 = "0q4hvvkjzy46x9hfhchywakzrd0jfwhxxsv96cz3yfcqwasf42x7"; + version = "43.0.2327.5"; + sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n"; + sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6"; + sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb"; }; beta = { - version = "41.0.2272.64"; - sha256 = "0jq864636527fpnrkdaalp73hjcd581imdk13bxfi6g4ic0sizkg"; - sha256bin32 = "12sisp6bk6qvgikzxi616d8cnrrgs2593kyq7sv3276wjz34a07m"; - sha256bin64 = "1vz89r43byd0shjvr6bvmwlsh97fx281hlzfv49q9k49piyfylgp"; + version = "42.0.2311.39"; + sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0"; + sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v"; + sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx"; }; stable = { - version = "40.0.2214.115"; - sha256 = "19d6zd71w3zvqwb0ncdapfwkckjgqmb1jfg228jvaispp9nvjq92"; - sha256bin32 = "1sv8sj0xp14q5693jcwwipinx539d5rgvhqcxm6b030024jjh8sr"; - sha256bin64 = "1zgb9g6fr29i7f9s1s1dcih1qjiz62ir90k0fsam9df99gzmmyc0"; + version = "41.0.2272.89"; + sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk"; + sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4"; + sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 4cb356fcab1a..f6e3cd3cf8d1 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20140616"; + name = "conkeror-1.0pre-20150319"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "98e89c7e5ff3a1069a0984338da01273cdb189a2"; - sha256 = "284ba966efebfa0aaa768abc1a4f901e2ecf5db9d0391d904a49118b0b94fcd7"; + rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29"; + sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 0018f00a3662..23726f5c3d18 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation { ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" for executable in \ - firefox mozilla-xremote-client firefox-bin plugin-container \ + firefox firefox-bin plugin-container \ updater crashreporter webapprt-stub do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -130,7 +130,7 @@ stdenv.mkDerivation { done for executable in \ - firefox mozilla-xremote-client firefox-bin plugin-container \ + firefox firefox-bin plugin-container \ updater crashreporter webapprt-stub libxul.so do patchelf --set-rpath "$libPath" \ diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index f99ff763cb89..de69560338fb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,183 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "35.0.1"; + version = "36.0.4"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "124492ee256fc578cff9e7774f679a0dc3f75a27"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "f3503b3d8889d8f097219cee2fb793f06bdff7ed"; } - { locale = "af"; arch = "linux-i686"; sha1 = "52dd493830ec7d3d0c1dd9d5d91449944f3ed0cb"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "bb88cfe49158d1b650bff932ccd65f750681df9f"; } - { locale = "an"; arch = "linux-i686"; sha1 = "883f34da9eaf2975d46f07bf4ffb7e991231f9a8"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "1757dbb135225b5b1958084fb3e8b0050451ac1f"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "839887065496742f53c7868bed5f172e0727b236"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "a0f4a097083449e81278a9accb23cb6e76cf39e1"; } - { locale = "as"; arch = "linux-i686"; sha1 = "7395f49cdb471d67eff6aad56fd896b2b60ca9ea"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "219ac273c48ec5018a1c62eb5c8ff1588bad466a"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "5228be973800169254e75016b5c1c11477b40fbf"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "7065cbb3fea059bf880217068704367168458c78"; } - { locale = "az"; arch = "linux-i686"; sha1 = "0c8cc063cd4661660b352d370281a477eb444697"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "1fdb7b783a9a90767c5c63a149f3ada590e3f81f"; } - { locale = "be"; arch = "linux-i686"; sha1 = "29532d5c3f3a8c9db4cc83dffea8328609eef286"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "cde75662d5b868117c76b3b4418292e6d536038c"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "272bd811c7b921ab80231c8994e04cb79aa7c868"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "01bfcb17b1524d3c5571283fa8abaa409250a640"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "40d2d3a9da8033e60e2bcd8faa0aa94a1f8acffb"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "a96f420650deb7d65c449861a05ae35154247009"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e2db4777b68113ec300e00e1235d7aa6eaebb9a2"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "bf886b2983bd3f0528bfdba036d978230fb0f9f6"; } - { locale = "br"; arch = "linux-i686"; sha1 = "6b74d9b0a1b6114810a98d615b32115b39be0eed"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "9c5c21f0b7d5f6677065cc57faccc4d6fb280a39"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "72acb7bd98f689eb8cef254c72da4fd0bda3274c"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "015adba9f964ad8cfbaf5081416a380d0abbd167"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "3e1f61aaa19328f7cc729fc011dc216ef33054cf"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "bb489274879dcdfeb86c778a7aef5d971e8c1111"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "729901a823944d4f92571f3f8f07d936f6e0635c"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "3066eec76de4c79699893afe497d12540ed49d80"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "0206ebc636ab4f3264281ddbef21f3d99c72c92f"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "48d7577d158daf8d4edf988c3efbb40944f7d607"; } - { locale = "da"; arch = "linux-i686"; sha1 = "39e692a7227349a53cde95a18024fd8f9c47a49d"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "0f85723f4a602c5348e1f910384cb05d4b0d37b8"; } - { locale = "de"; arch = "linux-i686"; sha1 = "b5150224a5115403cc12bdc583d89151d29aab23"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "890bd378d14fcfcfee327405323fb18d688f9575"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "6f6b9af4610b85c73e523e8149849a21e60a078c"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "3d45d05927b18e7a3d95edad282bdb4efb41509f"; } - { locale = "el"; arch = "linux-i686"; sha1 = "c1cca4d312329eef5023b16d08e7bfc40c3c06c8"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "2ca19c2beb794108f7138f07d91edefa5911e6da"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "034f5d2c82e519b53afa490850ab305134c58d7d"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "66d8a48abb3fdefa2498e8bf56b5b1fffe8f61ea"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "175647bcb6c4a879887e7b5c1d1260f11980f25c"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "7bab378891240db491078084ee0904dcd8c405cf"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "71dedd0008bc788631c83ec68a2975baf7dc4ecb"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0b620b139fa436816f2f48971bdc67a829effee"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "61f93f3ed51175afec69ab1f1ced1ad89e488cec"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "ee894635e4d584635a585702cfc364f318a8b7bc"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "ffe30c5da202fe9fa068423e8b2155d38902239c"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bc7e04f5264f5c6542705e29adcf0e873fe22396"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "c3f4fe2dcd009ddad4ed4c4c25dd8fde364dbb6f"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "271e4f84495a75bdf539f5d3383a510832ead8b1"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "7d2c74454e59220f15158fb13cf896d667b70f43"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "0e02895eeeb66cb8aaea96b566745dcb83517fde"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "753c0788ab58ab390546116dbd708cba0e5ef908"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "64be3770cf6ffa3df353cac4493b07e95dae5a1d"; } - { locale = "et"; arch = "linux-i686"; sha1 = "66b7184dfb39182fc3533e0601aac3d54005e7fd"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "f5f9b0ae73a57d61d32ac143aac09286bf75c8a7"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "92a25a4fdee339eb327acd0713ecb3da0975ae6f"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "b58bb2d5b2257c1f75009ee3c53289b55dbe1f64"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "a39e96d6c082035be2dd826dfb990ba76bb85c57"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "e73e5bb35aede5957437cc0f789d035cc4cba639"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "e0c69dcae50a31788695beb9562f77bb6a101a61"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "bdd0884b3c0feabf9041ce10c7c379204b64cdf4"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "19bf8ea81a02d32253db23c4c2432b4fb5437234"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "e3c86049567412e74634bda3fa419c013b9c1e1b"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "83ed1c125a7747768980c739fe4b76b47274f47b"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "4666f31d0983b7bec54c98bcfa02e85e3097d024"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a6fe37320351b18d0ee9257522d34213c598aa3"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "eb7418db94f041d209d89ae33f20b0fa482d5c84"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "525665b9310b099c93323dccef4e434627eb517b"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "88aa7e3b35f80474f3235f6aa087b4348f372b9e"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "78b59e7934f2014b8dc99fba210a691ba0ace966"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "8b0c11b78b6cd6363a8fb0dc51f88e306b321a34"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "f1d0bc9ccfa9ade46b1caabd511f8a6359895482"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "9b2bcf8aa3a4dabd29b69ad3a102aa6ee999bebc"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "2d3fa5a189283b4f5ddc88c5526380d1bbc9ff73"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "e8d8803075e2b3bcd44470f2563fdb7d2855021e"; } - { locale = "he"; arch = "linux-i686"; sha1 = "1c7695c021832d7daab3838d333a02ad141aa22d"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "1a7fec7fbbeebdf3368ad7474ea593ab6d0d0131"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "14ffc0706fe6f00d2778a3567dc27bdbc96b4fbb"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "77431a1b81c86b8da78b6a5728cf1d054b9b9a28"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "a0796dfbb45b796a3391e697320009ac761c082a"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "98aa2c4455caf0f35946ca2c6de7ff4214e33221"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "26933524c477fcd522b98f75e9e9339d80bdddf5"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "f365032803a41c57c75d06945104add35564afcd"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "ab4cb56cb1679159d1a7cca55f26b99c5ff1a784"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "829fb1baaaba4e3e43ad72b3e0bff78f8fd828e4"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b329665bc7643e7e49461112a96fa8ab23f7d15b"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4fea5950fddc26e002f72e7a8b4763fb8620bff1"; } - { locale = "id"; arch = "linux-i686"; sha1 = "d678096e976ada75bff62309e09cc5c92f4eb885"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "f80f225ce9acd6f1aa91e18d351431d6ea3ca05e"; } - { locale = "is"; arch = "linux-i686"; sha1 = "abc31651c3c8884be2166e5d85fd09f793a9bf15"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "4e276bb56d9cf9be18788ba1a585a29c094eec0c"; } - { locale = "it"; arch = "linux-i686"; sha1 = "2a3816a56615b910915207c97b093d5c81f169d5"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "4d7cec0c6fb393a0bf208135efd0b13691d319a5"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "54d9e17ee54a969da8ec68881a1165cd1d49a351"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "fbc9ded1ab4d0714094beb4215dd0c547d931983"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "1e7ac8d7b657fc76aba70c2a1fc76cad3935aa0d"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "3d7fa92e91b29546aa4232f118984c0c7c8e7066"; } - { locale = "km"; arch = "linux-i686"; sha1 = "88e470efb8cec8a1439a7fa02684e02c801ce5ec"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "9575cc0fa4130ca5856f20a058df7850e901f531"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "ede8a5f91dd08eb8901c565462a23ec49b647b87"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "9af854901746299ee8eb542f82d8d2b302312ba7"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "55b7af838ff5c46f2c0b9593e6a621007f6207f1"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "b41e5e2ac9b2d20a2d55fcbcc34f03ac110880e3"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "fb64abf1c4b9e1cd26bafe5d0f8d8d88c59e7788"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "b2d211490dba526c2be6a71be1767ca273635229"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "e052e41cb5426e15fbb9a95ac957eb24cda7605c"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "4e37df4924c10a07dc0dc4a87e44e155dbdfa095"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "694554dd94105ba299365adacd31ccc683f33814"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "116e576e4a0dee81c98a83a15a3fbd8d2e26361c"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "1d4cdcc4809ab9dfd6368ba9fa932f658b6e05f5"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "ef6e2e49df835f2f06de46cfbaac0aa7d3a0bab0"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "f8dd4ab0936e7a1e9511290201ee7b547d3dfa96"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "2dd8f9499e9c5dee258905466ec1c9784c93e392"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "c7ac2d940151db540edf268d5649b7958157deb0"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "6b624ded66ca9f7a4b81e52b3366006830616afd"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "83a2eebb9ea12fc58fdce64d2e6cca6a642ed6c4"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "f9aeb1b9bfe90cb875967a518cc430ed78c76d34"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "31e58e62373f5482059cbdb56228e93287071c2a"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "9caa154f5f357eeff788b6069a6417f2cc6fa30d"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "96a02745a2eceb0481e72dc195754500cac1cae2"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b141df4d511d380e955a3f4c49ce6f87e687a17e"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "1cd11a61afbc4d60878d089545b74c5c7d4a24f1"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "a365160b0a1490dbf3234a2d3e05d338627dd0f2"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "cf4f384f73215fc3337775ca8933d687f19c3e51"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "b6e20b7ca13b95a17bfcab4bafa672fe814853dd"; } - { locale = "or"; arch = "linux-i686"; sha1 = "f6b4d3bfb92aa480c6bcec1ecf1e68c90201015e"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "df4538d39cce9cd7817c9b59b6aec949484fc84a"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "fdc2799e53e9290c1e68975ed1a906c4cf6e0252"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "c69c7a16743aa76ccbe8a89f33c5390a127f92bd"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "a7f253212f9aed52c95f260da1cb4683617b839b"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "792d883f300d2a9ccddd64fe88c9837926431c14"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1221b7d1b7e997964b6e6e3de1364204e81682c6"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c65f1d29b35abc7070de124422f67e2e5c48a582"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8ea761c8459bfd664cea9afddb5a716d633dd407"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77d799feca448cb187931d8fdf80859f4a1214ad"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "ee1901e059abc81b82ccd018f3cf05b2471fd7da"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "2e0615de00051dec1cb2fb4c5cb866fbd2f349b7"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "a75e667217ee3a5ed1897bc01e07e52efb96d281"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "a76447946a8273cd8ec70cbbef013563f137688f"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "93e9548ae9f3fcfea35ef08ede8da2af98d693d3"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "af0613ba8b3ce75001c2a91c977fab728a8ae36c"; } - { locale = "si"; arch = "linux-i686"; sha1 = "aba611c1658d64151ad57ca321fc0050773db894"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "7a047794eec69dbf15f60dfbda1b8611435d2fc4"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "c6225541a63f18923a241488263987c662847548"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "0ca98adb699801f93fe7cd76b1c386b18c1f67a6"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "679f7d72f705dcffdfc36e5b89e3db3b56f76b74"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "36ee186bc3b7c0868f344c02fe44a98585188e9d"; } - { locale = "son"; arch = "linux-i686"; sha1 = "f96fe078e660c69b46ae8d3e0ce3189e4725a9fd"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "700f875dbd7b16ffad92e6ce9e39de41554384e7"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "60af78da783fd8183371f7e62ea9e58b0306fa24"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "55f2172292ae2ffec2244396a3f1d8399ce4233b"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "becede293c5e225c8212e91bd97dda070ee8e677"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "0a122107f6161757744deb21bf7afd1284aa9bcb"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "0f95be8a5510fe89475346c0b3ee91bee967b4e9"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "6185a8d66a73082146fc728e1ee9108a72eb29b6"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "6a4bb348caafce8d406bb431b69161ea21290241"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "5f1c0f08d2ee49d6484f84bdd721f2e26cf09fb1"; } - { locale = "te"; arch = "linux-i686"; sha1 = "43b4166646f593e82bd5ffe3609960f3bdf8abd2"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "8f567accf4db46a669ac0da25ff48a843fd8c940"; } - { locale = "th"; arch = "linux-i686"; sha1 = "ec19b178cc82802edb2f2060c47663422d3cef2a"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "667db54905a5e539c11752f954e93ac991f958bd"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "bddfc685191b9cd686ba8911e790e4c103d2a652"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "ea92a05be86355c31fc3cbde7ce1ab3946d9239c"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "b0a25b1047e3d2a34f28750db03e9cf7247d46b3"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "2753baa3b5c486723c8ace486203ff6c7e9c1ac9"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "0d0b7a57282560bbb5e26e23f65844f0c5eac888"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "f6a44d48325d3da23cd618c78d70fd8d9201a7a4"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "44700f87ec176ffed749ae31f7dd04664a8a050b"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "24c4355e2b12886232cff0c5fe791824050d38a6"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "24f06bbdcfd94f3d0168c93f83c13fd5bbb59c5b"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ea584b5aaa279694c4550b83ddd61de586f62517"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c257cbd9ed02f699384ffb8ece286c3b8e94ea8f"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "87fff9bf03bd3208bd71d92527dbddfb0dd12a6f"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "07c101a98019482c61d81f08bd27219a96bd1f25"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "f8c6b9d816c22c70f8241f8b8f508eb1e521c5e7"; } + { locale = "af"; arch = "linux-i686"; sha1 = "6933a5a4e5320f54cf5d8f17f1b0905d6ca54736"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "f0cc0f14a46abc0d56a25e4dcd128d0fa60619a0"; } + { locale = "an"; arch = "linux-i686"; sha1 = "1d931bef5349e885d847d31a80d9b432e61c5a22"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "6d6bf623959c0f24e0f0b81b7c99672083a31f3e"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "96a1f898449c62dec9e9970972d78d42484d4c4b"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "3e10f2aef47f239c4fef828b1d72f2f7f549d94a"; } + { locale = "as"; arch = "linux-i686"; sha1 = "6ede4616158426d22adc49daf86cce9411215e3c"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "71c7d80f995fd1afe4b345d32ed10faa95a52ca2"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "17ccfe25f83845281827df64c046ee26b694ef6c"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "f10c7b5ec1f803bec50156b179bb688747772ff1"; } + { locale = "az"; arch = "linux-i686"; sha1 = "5439ded3fc618d45fdcc8e817b54b6da62f4a9f4"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "74f9d283000d7b7fe7524ed06c335447346908c7"; } + { locale = "be"; arch = "linux-i686"; sha1 = "c1279eeaac489b432a8f1068c7bc1d4d9a8550c9"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "d22bba42c1ffe3d4a5c70d06aa71bdf5904c9d18"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "0cc9b6b3f9a8b6caea713e4e42dd3a0a95a204e4"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6d2f2971545a6e669b0ecb970d774ac45cb84e9"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a1d3d7909152be32058f3f1e9c180daf96656a13"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "2df28cf71cd712fd95afbbe86c4f4fb5166c8a34"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "ebc9f6b69bc497dc5419b3bd6d67c42ca2c8de8a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "c2db141bfb5627439344126edd4e93353329aab7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "1b77d4806267e153d1f6d1d4b90076d47edba8db"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "9901af094c845b9ca9a4759d2a0ba4a241aa663a"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "ce38623e0307c94a6b78f7387862c9cb0541ced7"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "08040f7ed45174a53d8f46384781b940c41cee1c"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "3e167560bc466dc24e450cff886d4041495a7064"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "e312e2005d302cb390a72062d6314b9243d77b51"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "8ece365b6670826bd8bed8285c0e4d518c7fc97e"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "8bbf5abd8b43213c2b07ef0541c004c88483876a"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "84be0b6dc586bec5a05e43f349cf37c6bd9c0b41"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "3dc843146b4bd9d938a84ac5d4543c68e2674003"; } + { locale = "da"; arch = "linux-i686"; sha1 = "35dc75cdca3b923d3ea55ad31ecc896546b1a311"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "d7fb80133739c30a474d380542b8d66ed0e0cb03"; } + { locale = "de"; arch = "linux-i686"; sha1 = "11ef8ef607250e8fc7ffb490499d42ee78985f97"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "51ed94bb05e362453390e43b67a58b3ca5caed26"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "31360bcbb170b748bb0e56b9487988c1b620a7c0"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "9876f83cd680a8a9a1c7b30254f49cc81cfe0f96"; } + { locale = "el"; arch = "linux-i686"; sha1 = "1a25c11af8adc49ddacf23373ef227b4a7a54024"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "ac44f6191a4f78a4e390b7733d7333e026580155"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "2d9b564832107409a064620cbeccbffb4cd417fb"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "e9732da9758c7cb443d9b23a1e816042828a9719"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "b814bab9571355758dc55c2b1322f09ad2877a71"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "ca70cafbc9ab89704ef2b6b786b9c8c0bba3ff83"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "7317e2078b969d0c8af60d756a1e9c622e6a059b"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "5011dfbf020af2ed2a8986bd6976c9964b91fdbc"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "035f427d83e0d847c7a08e33d73f2c28d73bf533"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "3dfd3dbbde050591dbee842e64f7bab497028a05"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "f84fff5f42c0ab50a50ea561fdcd998846255812"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "31c485c5aebe893fbf4a1ece7ed0f4eda7c300e3"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "efa700b585a9e0e04a8fc01dd465288dc1b9caca"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "8a55a229924d71c602019382209eb78f972018ae"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "8f467c3603088f757f46d37b8138b70c63cfd514"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "a82f3188718c8166ec4cc7ac6c4e84c7f63e670b"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "5d767c2e65390380ed49e76634f5a4e2fd37ebde"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "a84e26d375d15f9d019187eed28b5c9cb3f60fbd"; } + { locale = "et"; arch = "linux-i686"; sha1 = "5b2eb8e425c30563f59293a1eba56215938eb161"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "fc63eb3f960c2b2ddd6f12e387976e08fe78209b"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "0969053a42449e957e8d05fc8526b92c5a49a5da"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "64a9c961b0246333d6fd55026d547ec77befab2e"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "f00fc446dc3aca2d50cced0a13ff0aaaa54f1716"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "afd6a5aba5c1e48eb8ec6909797214b87f755764"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "88daf24a927723587904c76bfe30b93086adfc02"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "21459a4cf6827fce2fe9476a8100ac19457dd052"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "31035303cd31cdeb9b73a308b913292ca8923ea9"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "af8e942824f8f2a64b1930ff1cfb96b070551288"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "a55bcd868b5f485e6ed0a999337e3b7e2b27838c"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "633a8328de12be374378b9193e3008ef0fde6dcc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "21e9e6619ed54ce1cc0eefe694e5ef2880f9169a"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "28746f0b1ea9cf0368a130329d37731ebfe3bf92"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6699599d8a79991422c64d7fee39bce0af33cfff"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "efd72597e9dd9857484bf46ca286985871a32852"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "35fe3bd410d244245e5d4a89afa3b72e5cd2664a"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "db0722b10c92ae4e7645df6b331abf420d6b6c8f"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "6abe5f9d2d275f3fea7dfdf7398dae5dfc8cbdb9"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "dd401355463f06e85de467310f6585ab1136df9f"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e101f80e3df8558e017361aadfafc26071122200"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "030047ebd6f2b9a320ed552d199cacc83800b4d7"; } + { locale = "he"; arch = "linux-i686"; sha1 = "d6a94c95668245aa92616fd93ea31890a9f7dc02"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "304be29ae0cdf623f8d87b841551bacb8b3fe496"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "a4dbb31547c675102173d8e52e27cce6546a1946"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "a92c5e441bccb6f35e77d1e35f1943637a47c26b"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "743ba73288965b960b7f7db5ee14437515548811"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "1bc8197e674e9e0839ebad4d1eca03fef450566f"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "26bc907a7d9c084732885711c90b63790ad4f094"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1da9080e67ccfd687a132c42bbbe431610928cf9"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "9693b4971de85ff12953d726af2c28333461460c"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "27fa6940ba4244f4c78a6463b1b6f8e744dcf64d"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "2af42b9776d43d688af74d749fede31ac33b09b0"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4a75e6a1ca0c1f2f4901a37196e1da6af13d755a"; } + { locale = "id"; arch = "linux-i686"; sha1 = "2807b1f819c9cefb9375595ceb435897d7e4a7dd"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "3825a6b08fe710871c7a2a20faf8386a1b30d3c2"; } + { locale = "is"; arch = "linux-i686"; sha1 = "0c19a8f1e80e3acccfdcd9b3dde86580e39238c6"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "5684deb431acf6e18fdc7f025ed5f323484ad120"; } + { locale = "it"; arch = "linux-i686"; sha1 = "abbaeb2915f098098fe94976dfad17aab7e48775"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "3a2be07826e851625c02623a04e80cb5bcc8a7b4"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "303f525a2f3c0afa28cdeecb3648813dff77e40b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3ef3b46ad3530fa0a748dbf76d306984f834192"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "7d9edcbef8effbcb2b542a86dc5f6efd961fdddc"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "29bf7048bf23a698484e56f62e2293e9defc1abe"; } + { locale = "km"; arch = "linux-i686"; sha1 = "1df85a1ff74b55096b6386e931c0a3ce6013496b"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "a8ed53f03435c971b4d1fca8d41cf0ec2b55c83a"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "46ce48f57d28b04c7dbe888a8d0faa1bb7f1630e"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "264d2ec87d2e46d9116e4ddb8cbb7fddf2ef9f75"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "3972269f7fadcf92938bf3f3819360839dd8307b"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "b8c0ddad810850fbbb0acab1ec2ecf983cdabfa8"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "5bcf38287b5a350539b169b5069a608bd6d53fd4"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "bc86889a61e7252a2d9951a39e371d237990c7fb"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "9bffa4628d1c79013abf94d9d123a93435fc3dd3"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "eaf685b6e1147679b6b27f11bcbd6f0458e9998c"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "fe874c7d3c26858585a8e9abe8a8acf1d0a642f0"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "e730200d162c2bc46a307389243a444577390c55"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "f91a082128370d7eb067cef5fa32cf3d15269f75"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "a7c6a211c87e7acc48a6a33db9350f735356c9c4"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "58d107b05fd47300dca824f93ba04635ed75d98d"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "bb7523230a97e5952451cfe47c25bd4103fb3acf"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "e26a244f689f9a0f2cf95fb47851bb00f66180c6"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "9a6e38907666c610d5a9e4b9af50d3997e83b088"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "9fa8d90c58006c70a8454457dc321c01dce0aa3a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "39ccd12f257d5a1d87bdb63afc9a9f02a9b5b957"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "e81c3b825aa74e8e15de274b3b5b39aa1a271968"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "1ffd3e73c3ee6952d34fe857395027e54fa8e99f"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6e0a18d5eb0f460d3d81e75c682e8d49efe681c1"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "24eb88d2caeeb1ed129f5fbf4b5d2eadb1453717"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "d69104fca536e2ecf71cd8899ee93057c2c968e4"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "85cb1c316bb3379fd2a5ff90e50d9a310b8dea8d"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca64cdb415adbaf5e91bb5b4e18b35a61444246e"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "ecaa3bda5e705e30b00af9d2cf04dd919dfff50e"; } + { locale = "or"; arch = "linux-i686"; sha1 = "7c733f7d65346eb9e6ecc6ac6d3e3645a1eb9bd2"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "7c4d1d5ff0473892cff420e5737f746591cb1de7"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "f797a2fbb789ee586d7a9aa3288caa982be4dee5"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b06d4dc6e42eacf8d8c5960d208230b3ff1f95e1"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "f479e63503d3d6513a18059ced2aeb56266da49b"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "87ea570c3ceb3d7e79ce24789dfc1702dbe387ea"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1c023fe72c192df118c727ab6646a5882650ef32"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d69ef0da3084fc4c12c057fa2892dbeb83d666dd"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fca9b7f61c1e1d19358805bf1a31b81a9d246df9"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "896626a8269084cfa35080cde367ba20d38a7e06"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "c4fcdb7fe19362d0dc68bf89f3ecc5c5de5f7f7f"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "69e7381d36c187ad7823cebdbd0d1f7df49c049a"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "a45f1f9858e0bcff7e071d3e92173283c8038417"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a0bb823fc0a0d4891b71edc4c2cc2fc315d56617"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "daaee48142a463180a9b94468039d5231e315a4c"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "886417d5f361a57af0209de6731e3d6f7e8cb437"; } + { locale = "si"; arch = "linux-i686"; sha1 = "eb1a0a28d8c5fe6f789340b5d53da63c3f67ff87"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "e63f4b81e21f3a9c1b706afcf28410dd0b469205"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "edad04ac1d8afc92190b78567d79fa745854306b"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "56cda6a10e26f2f958f24ab09e1b34c1591da0c5"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "78e28912b586b922821faf76785df8d56fc85460"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "92ee5a8d02c6bada618b309c1fab09fc764716c4"; } + { locale = "son"; arch = "linux-i686"; sha1 = "a8f48e23c63143fdfa4dba4b569e45f06f50ccca"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "f6e52004d060f268fdfc25d4de1fad68ebd4b250"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "597cf559e7466f9b40cd93f125fde29636a414c1"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "8d2d5ed7a8b4abc67d3dc96456a3625ba9b8ae2e"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "1ac71db3fdc95942e58e93038c606b8f4156db16"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "956cd3579ad1e000e3519050122443424c691e46"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "df0651f4d830d1127db54b34accb6b7e61da4c07"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "ad21f011767c133b8f9fb6270e79405f96aea7ae"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "37453def3951e2ce5d8cd242d0513fbe0b081f90"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "e09dfe3e79e85f3a37150df79f64e3285a73db10"; } + { locale = "te"; arch = "linux-i686"; sha1 = "5d329ecfe87772d85e4f57329cd1505e73ea1d09"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "83ade2a74e54204a7155d52695f6bd41f350c627"; } + { locale = "th"; arch = "linux-i686"; sha1 = "9e435d3a244f6602546549fd3a64e8229fcc8b17"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "0ba7a20912068fad8224d59b70c44f124e876199"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "5be128415171825123bfd6c09affd5adbd65fc0a"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "2803083c7c064ec5b6f2810fa56f86cfa884171a"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "eb94ca07d84bdcc4f2609b87a9742ed7007d5136"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "9167b85241f15911c42d4310961b80659ffb1989"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "216554e565e0527c1aff13a2abb733093b1aa0f6"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c89dca50e3d2fb3d1340791b7932d8ef6008333a"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "6893ef973ead9bd97d0e98bfa71bd5fe7fb4c7b6"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "8f521aa6ef56fa26d97d751391b94a9e648a3727"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "c5ecc1b8aa8dfe3ea5611e3194e719c79012cab0"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "346e508474653a9493936995e3ad224a94d2fcad"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5e50c358a8a38d1fa106373d0ab71b716ad75915"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "8c170bf247a667ea513306b2d79b95c066c4c6d4"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ea4bd309c940d87433d96e8d5c77e7578fbd4fd7"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "26f3b0500593e6a8aae3ab7f415f929d39466911"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a128e9d04a84..ec7c6047ae48 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "35.0.1"; in +let version = "36.0.4"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "cf256ee1491ee502eb4432ade5a879104ebceede"; + sha1 = "ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 02bb6a55b429..c8457427945a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = icon; + icon = browserName; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -19,13 +19,10 @@ stdenv.mkDerivation { "text/html" "text/xml" "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" "x-scheme-handler/http" "x-scheme-handler/https" "x-scheme-handler/ftp" - "x-scheme-handler/mailto" - "x-scheme-handler/webcal" - "x-scheme-handler/about" - "x-scheme-handler/unknown" ]; }; @@ -61,6 +58,9 @@ stdenv.mkDerivation { '' } + mkdir -p $out/share/icons + ln -s $out/lib/${browserName}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 4ae7fca5398c..26ba5c51480a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.442"; + version = "11.2.202.451"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "08ni1mllp98d7wawz35lx8ydymya8nspb90mq29ivbyrkx5aal28"; + sha256 = "0jlk3bgpv998ajm5wlxngxy82h3mcd847wm8mkvmyfmjn4x9dv7z"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "00728q8jp40llpsfw2n5q9w29isyy3a64xlisjizyh3chb6bkkdm"; + sha256 = "1lpvx6dz3hdf3jhs3xdf09jyh1563msq0icr832432d4a1jgqkds"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index bcd86a2fb30d..ced16da5f7ee 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { - name = "opera-12.12-1707"; + name = "opera-12.16-1860"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1212/${name}.i386.linux.tar.xz"; - sha256 = "1jkrhxjxa5kz4bhyma0zlnsszdn84sq4pks3x8bfcayn12m6yxkz"; + url = "${mirror}/linux/1216/${name}.i386.linux.tar.xz"; + sha256 = "df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1212/${name}.x86_64.linux.tar.xz"; - sha256 = "0acizxgyqblcvl91dwmvi937fi1kw6whz5qgxyl1fkygbayji90v"; + url = "${mirror}/linux/1216/${name}.x86_64.linux.tar.xz"; + sha256 = "b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7931da602d6e..c89ad0a51685 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }: +{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils }: stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "v0.5.4"; + version = "0.12.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; - rev = version; - sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk"; + rev = "v${version}"; + sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; }; buildInputs = [ makeWrapper which go iptables rsync ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin" + wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" + wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-api b/pkgs/applications/networking/cluster/panamax/api/Gemfile index 82085aa6db08..82085aa6db08 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-api +++ b/pkgs/applications/networking/cluster/panamax/api/Gemfile diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-api.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock index e0ebe72132be..597c691700ad 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-api.lock +++ b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock @@ -58,7 +58,7 @@ GEM faraday (= 0.8.9) faraday_middleware (= 0.9.0) hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) its (0.2.0) rspec-core json (1.8.1) @@ -66,7 +66,7 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - minitest (5.4.3) + minitest (5.5.1) multi_json (1.10.1) multipart-post (1.2.0) octokit (3.2.0) @@ -74,7 +74,7 @@ GEM puma (2.8.2) rack (>= 1.1, < 2.0) rack (1.5.2) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -126,7 +126,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) diff --git a/pkgs/applications/networking/cluster/panamax/api.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 415392627ea3..6cbec878a484 100644 --- a/pkgs/applications/networking/cluster/panamax/api.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -4,29 +4,31 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "panamax-api-${version}"; + version = "0.2.16"; + + env = bundlerEnv { + name = "panamax-api-gems-${version}"; + inherit ruby; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + buildInputs = [ openssl ]; + }; + bundler = bundler_HEAD.override { inherit ruby; }; + database_yml = builtins.toFile "database.yml" '' production: adapter: sqlite3 database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> timeout: 5000 ''; - env = bundlerEnv { - name = "panamax-api-gems"; - inherit ruby; - gemset = ./gemset-api.nix; - gemfile = ./Gemfile-api; - lockfile = ./Gemfile-api.lock; - }; - bundler = bundler_HEAD.override { inherit ruby; }; -in stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.11"; src = fetchgit { rev = "refs/tags/v${version}"; url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "01sz7jibn1rqfga85pr4p8wk6jfldzfaxj1726vs6znmcwhfkcgj"; + sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; }; buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; diff --git a/pkgs/applications/networking/cluster/panamax/gemset-api.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix index 62cf5dcd3afd..8182543a2bb9 100644 --- a/pkgs/applications/networking/cluster/panamax/gemset-api.nix +++ b/pkgs/applications/networking/cluster/panamax/api/gemset.nix @@ -1,6 +1,4 @@ -let - pkgs = import <nixpkgs> { }; -in { +{ "actionmailer" = { version = "4.1.7"; source = { @@ -223,10 +221,10 @@ in { }; }; "i18n" = { - version = "0.6.11"; + version = "0.7.0"; source = { type = "gem"; - sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; }; }; "its" = { @@ -271,10 +269,10 @@ in { }; }; "minitest" = { - version = "5.4.3"; + version = "5.5.1"; source = { type = "gem"; - sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4"; + sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; }; }; "multi_json" = { @@ -310,7 +308,6 @@ in { dependencies = [ "rack" ]; - buildInputs = [ pkgs.openssl ]; }; "rack" = { version = "1.5.2"; @@ -320,10 +317,10 @@ in { }; }; "rack-test" = { - version = "0.6.2"; + version = "0.6.3"; source = { type = "gem"; - sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky"; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; }; dependencies = [ "rack" @@ -491,10 +488,10 @@ in { ]; }; "sprockets-rails" = { - version = "2.2.0"; + version = "2.2.4"; source = { type = "gem"; - sha256 = "042fxqskvaa0wn9kpy02nv6p7sa355py9pi58zw96l30170sd3hl"; + sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; }; dependencies = [ "actionpack" @@ -568,4 +565,4 @@ in { "crack" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-ui b/pkgs/applications/networking/cluster/panamax/ui/Gemfile index 7efcabfd9e5c..6f7dc59d04d0 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-ui +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile @@ -13,10 +13,11 @@ gem 'zeroclipboard-rails' group :test, :development do - gem 'rspec-rails', '2.14.2' - gem 'capybara', '2.3.0' - gem 'teaspoon', '0.8.0' - gem 'phantomjs', '1.9.7.1' + gem 'rspec-rails' + gem 'its' + gem 'capybara' + gem 'teaspoon' + gem 'phantomjs' gem 'dotenv-rails', '0.11.1' gem 'pry' gem 'pry-byebug' @@ -24,7 +25,7 @@ group :test, :development do end group :test do - gem 'webmock', '1.18.0' + gem 'webmock' gem 'sinatra', '1.4.5' gem 'coveralls', '0.7.0' end diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock index 67504f41a86f..e1dfc0d4a3db 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock @@ -40,7 +40,7 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) slop (~> 3.6) - capybara (2.3.0) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -56,7 +56,7 @@ GEM thor crack (0.4.2) safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.4) + ctl_base_ui (0.0.5) haml (~> 4.0) jquery-rails (~> 3.1) jquery-ui-rails (~> 4.2) @@ -72,28 +72,31 @@ GEM dotenv-rails (0.11.1) dotenv (= 0.11.1) erubis (2.7.0) - execjs (2.2.1) + execjs (2.2.2) haml (4.0.5) tilt hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) + its (0.2.0) + rspec-core jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (1.8.1) + json (1.8.2) kramdown (1.4.0) libv8 (3.16.14.7) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (2.4.3) - mini_portile (0.6.0) - minitest (5.4.3) + mini_portile (0.6.1) + minitest (5.5.1) multi_json (1.10.1) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + netrc (0.8.0) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) phantomjs (1.9.7.1) pry (0.10.1) coderay (~> 1.1.0) @@ -110,7 +113,7 @@ GEM rack (1.5.2) rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -129,23 +132,28 @@ GEM activesupport (= 4.1.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.1) + rake (10.4.0) ref (1.0.5) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - safe_yaml (1.0.3) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.2) + safe_yaml (1.0.4) sass (3.3.9) simplecov (0.9.1) docile (~> 1.1.0) @@ -162,7 +170,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -176,13 +184,13 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.1.0) + tins (1.3.3) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) - webmock (1.18.0) + webmock (1.20.4) addressable (>= 2.3.6) crack (>= 0.3.2) xpath (2.0.0) @@ -195,23 +203,24 @@ PLATFORMS DEPENDENCIES activeresource (= 4.0.0) - capybara (= 2.3.0) + capybara coveralls (= 0.7.0) ctl_base_ui dotenv-rails (= 0.11.1) haml (= 4.0.5) + its kramdown (= 1.4.0) - phantomjs (= 1.9.7.1) + phantomjs pry pry-byebug pry-stack_explorer puma (= 2.8.2) rails (= 4.1.7) - rspec-rails (= 2.14.2) + rspec-rails sass (= 3.3.9) sinatra (= 1.4.5) - teaspoon (= 0.8.0) + teaspoon therubyracer (= 0.12.1) uglifier (= 2.5.1) - webmock (= 1.18.0) + webmock zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 4d4e4fe964d2..572deb62ba00 100644 --- a/pkgs/applications/networking/cluster/panamax/ui.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -3,24 +3,25 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "panamax-ui-${version}"; + version = "0.2.14"; + env = bundlerEnv { - name = "panamax-api-gems"; + name = "panamax-ui-gems-${version}"; inherit ruby; - gemset = ./gemset-ui.nix; - gemfile = ./Gemfile-ui; - lockfile = ./Gemfile-ui.lock; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + buildInputs = [ openssl ]; }; + bundler = bundler_HEAD.override { inherit ruby; }; -in -stdenv.mkDerivation rec { - name = "panamax-ui-${version}"; - version = "0.2.11"; src = fetchgit { rev = "refs/tags/v${version}"; url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "17j5ac8fzp377bzg7f239jdcc9j0c63bkx0ill5nl10i3h05z7jh"; + sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; }; buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; diff --git a/pkgs/applications/networking/cluster/panamax/gemset-ui.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix index 3793a2502158..cfb2b6f460f0 100644 --- a/pkgs/applications/networking/cluster/panamax/gemset-ui.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix @@ -1,6 +1,4 @@ -let - pkgs = import <nixpkgs> { }; -in { +{ "actionmailer" = { version = "4.1.7"; source = { @@ -131,10 +129,10 @@ in { ]; }; "capybara" = { - version = "2.3.0"; + version = "2.4.4"; source = { type = "gem"; - sha256 = "12x24zsn3y7sigmz45ijd9bkq7l14r2a00ay6k9mdgrbncbr3ins"; + sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; }; dependencies = [ "mime-types" @@ -183,10 +181,10 @@ in { ]; }; "ctl_base_ui" = { - version = "0.0.4"; + version = "0.0.5"; source = { type = "gem"; - sha256 = "0h0dbl0mf6cql7yp10jywv22rn0iy2188phdxvr2ladwwn2vxf5d"; + sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; }; dependencies = [ "haml" @@ -259,10 +257,10 @@ in { }; }; "execjs" = { - version = "2.2.1"; + version = "2.2.2"; source = { type = "gem"; - sha256 = "1s41g9qwq0h4452q4gp934lnkzfkxh4wrg8fd4bcynba86bf3j8b"; + sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; }; }; "haml" = { @@ -283,12 +281,22 @@ in { }; }; "i18n" = { - version = "0.6.11"; + version = "0.7.0"; source = { type = "gem"; - sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; }; }; + "its" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; + }; + dependencies = [ + "rspec-core" + ]; + }; "jquery-rails" = { version = "3.1.2"; source = { @@ -311,10 +319,10 @@ in { ]; }; "json" = { - version = "1.8.1"; + version = "1.8.2"; source = { type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; }; }; "kramdown" = { @@ -356,17 +364,17 @@ in { }; }; "mini_portile" = { - version = "0.6.0"; + version = "0.6.1"; source = { type = "gem"; - sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn"; + sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; }; }; "minitest" = { - version = "5.4.3"; + version = "5.5.1"; source = { type = "gem"; - sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4"; + sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; }; }; "multi_json" = { @@ -376,11 +384,18 @@ in { sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; }; }; + "netrc" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; + }; + }; "nokogiri" = { - version = "1.6.2.1"; + version = "1.6.5"; source = { type = "gem"; - sha256 = "0dj8ajm9hlfpa71qz1xn5prqy5qdi32ll74qh8ssjwknp1a35cnz"; + sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; }; dependencies = [ "mini_portile" @@ -436,7 +451,6 @@ in { dependencies = [ "rack" ]; - buildInputs = [ pkgs.openssl ]; }; "rack" = { version = "1.5.2"; @@ -456,10 +470,10 @@ in { ]; }; "rack-test" = { - version = "0.6.2"; + version = "0.6.3"; source = { type = "gem"; - sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky"; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; }; dependencies = [ "rack" @@ -506,10 +520,10 @@ in { ]; }; "rake" = { - version = "10.4.1"; + version = "10.4.0"; source = { type = "gem"; - sha256 = "1446zzdpwpvwkd0zk19b2smmmvdiarh4b26cdbcw4fy5p67wxkw2"; + sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; }; }; "ref" = { @@ -520,60 +534,75 @@ in { }; }; "rest-client" = { - version = "1.6.7"; + version = "1.7.2"; source = { type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; + sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; }; dependencies = [ "mime-types" + "netrc" ]; }; "rspec-core" = { - version = "2.14.8"; + version = "3.1.7"; source = { type = "gem"; - sha256 = "0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc"; + sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; }; + dependencies = [ + "rspec-support" + ]; }; "rspec-expectations" = { - version = "2.14.5"; + version = "3.1.2"; source = { type = "gem"; - sha256 = "1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9"; + sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; }; dependencies = [ "diff-lcs" + "rspec-support" ]; }; "rspec-mocks" = { - version = "2.14.6"; + version = "3.1.3"; source = { type = "gem"; - sha256 = "1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30"; + sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; }; + dependencies = [ + "rspec-support" + ]; }; "rspec-rails" = { - version = "2.14.2"; + version = "3.1.0"; source = { type = "gem"; - sha256 = "1j9nbha6p12kwy9c5g3lw541xg20yzk95lzgmsq7kvngiqz88p57"; + sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; }; dependencies = [ "actionpack" - "activemodel" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" + "rspec-support" ]; }; + "rspec-support" = { + version = "3.1.2"; + source = { + type = "gem"; + sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; + }; + }; "safe_yaml" = { - version = "1.0.3"; + version = "1.0.4"; source = { type = "gem"; - sha256 = "063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; }; }; "sass" = { @@ -635,10 +664,10 @@ in { ]; }; "sprockets-rails" = { - version = "2.2.2"; + version = "2.2.4"; source = { type = "gem"; - sha256 = "192d4vfl1gjz6phli6sqk98364x6v4jkpl5imajvimsinvgyv81b"; + sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; }; dependencies = [ "actionpack" @@ -699,10 +728,10 @@ in { }; }; "tins" = { - version = "1.1.0"; + version = "1.3.3"; source = { type = "gem"; - sha256 = "0jddc40lw8lzn421p6pjvvs7b37qyd8jgsl5nrq16rc46wgx2r2r"; + sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; }; }; "tzinfo" = { @@ -727,10 +756,10 @@ in { ]; }; "webmock" = { - version = "1.18.0"; + version = "1.20.4"; source = { type = "gem"; - sha256 = "1r21a4x7dljb3cqxp7w7mdq5a1xvw9kn6m3gldsldsfza5b4hq03"; + sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; }; dependencies = [ "addressable" @@ -757,4 +786,4 @@ in { "railties" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index f4f1e94438d8..37d4870d1818 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.5.1"; + name = "davmail-4.6.1"; src = fetchurl { - url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.5.1-2303.tgz"; - sha256 = "0y9dwxlfrfm6yf010fad1p5vsyz2ddci6vhz4sa1js2fq4rvyx7a"; + url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.6.1-2343.tgz"; + sha256 = "15kpbrmw9pcifxj4k4m3q0azbl95kfgwvgb8bc9aj00q0yi3wgiq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 51f3ae2ac8d9..1a9c7e0aa2f7 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,13 +1,14 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "1.6.2"; + version = "2.10.0"; + dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { name = "dropbox-cli-${version}"; src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3"; + sha256 = "0f765rpp357vy7zvn1jq6q48d10fi4v13yb7vv3qx3az3f3472lg"; }; buildInputs = [ pkgconfig python ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation { --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' - + sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox chmod +x "$out/bin/"* patchShebangs "$out/bin" ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index df64ea1f2d8b..bd557a27ec07 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, makeDesktopItem -, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage -, libXfixes, libXi, libXinerama, libXrandr, libXrender -, dbus, dbus_glib, fontconfig, gcc, patchelf -, atk, glib, gdk_pixbuf, gtk, pango, zlib +{ stdenv, fetchurl, makeDesktopItem, makeWrapper +, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM +, libX11, libXmu, ncurses, popt, qt5, zlib }: # this package contains the daemon version of dropbox @@ -11,10 +9,13 @@ # note: the resulting program has to be invoced as # 'dropbox' because the internal python engine takes # uses the name of the program as starting point. -# -# todo: dropbox is shipped with some copies of libraries. -# replace these libraries with the appropriate ones in -# nixpkgs. + +# Dropbox ships with its own copies of some libraries. +# Unfortunately, upstream makes changes to the source of +# some libraries, rendering them incompatible with the +# open-source versions. Wherever possible, we must try +# to make the bundled libraries work, rather than replacing +# them with our own. let arch = if stdenv.system == "x86_64-linux" then "x86_64" @@ -25,22 +26,19 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "3.2.6"; - sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry" - else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz" + version = "3.2.9"; + sha256 = if stdenv.system == "x86_64-linux" then "1w1xqizd4xhf9d3gwg9wwys2rdbacs390zf4a7z76m9h5r2lz049" + else if stdenv.system == "i686-linux" then "0lzrb0b7hi22ij7fmn7i3wkzbzv99858ah7w8ysg65za0c8qwksc" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; - # Libraries referenced by dropbox binary. - # Be aware that future versions of the dropbox binary may refer - # to different versions than are currently in these packages. - ldpath = stdenv.lib.makeSearchPath "lib" [ - libSM libX11 libXext libXcomposite libXcursor libXdamage - libXfixes libXi libXinerama libXrandr libXrender - atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf - gtk pango zlib + ldpath = stdenv.lib.makeSearchPath "lib" + [ + dbus_libs gcc glib libdrm libffi libICE libSM libX11 + libXmu ncurses popt qt5.base qt5.declarative qt5.webkit + zlib ]; desktopItem = makeDesktopItem { @@ -56,7 +54,6 @@ in stdenv.mkDerivation { name = "dropbox-${version}-bin"; src = fetchurl { name = "dropbox-${version}.tar.gz"; - url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz"; inherit sha256; }; @@ -67,15 +64,39 @@ in stdenv.mkDerivation { rm -f .dropbox-dist/dropboxd ''; + buildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p "$out/${appdir}" cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" - mkdir -p "$out/bin" - ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox" - patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ - "$out/${appdir}/dropbox" - + rm "$out/${appdir}/libdrm.so.2" + rm "$out/${appdir}/libffi.so.6" + rm "$out/${appdir}/libicudata.so.42" + rm "$out/${appdir}/libicui18n.so.42" + rm "$out/${appdir}/libicuuc.so.42" + rm "$out/${appdir}/libGL.so.1" + rm "$out/${appdir}/libpopt.so.0" + rm "$out/${appdir}/libQt5Core.so.5" + rm "$out/${appdir}/libQt5DBus.so.5" + rm "$out/${appdir}/libQt5Gui.so.5" + rm "$out/${appdir}/libQt5Network.so.5" + rm "$out/${appdir}/libQt5OpenGL.so.5" + rm "$out/${appdir}/libQt5PrintSupport.so.5" + rm "$out/${appdir}/libQt5Qml.so.5" + rm "$out/${appdir}/libQt5Quick.so.5" + rm "$out/${appdir}/libQt5Sql.so.5" + rm "$out/${appdir}/libQt5WebKit.so.5" + rm "$out/${appdir}/libQt5WebKitWidgets.so.5" + rm "$out/${appdir}/libQt5Widgets.so.5" + rm "$out/${appdir}/libX11-xcb.so.1" + + rm "$out/${appdir}/qt.conf" + rm -fr "$out/${appdir}/plugins" + + find "$out/${appdir}" -type f -a -perm +0100 \ + -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \; + RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" find "$out/${appdir}" -type f -a -perm +0100 \ @@ -83,6 +104,10 @@ in stdenv.mkDerivation { mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications + + mkdir -p "$out/bin" + makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ + --prefix LD_LIBRARY_PATH : "${ldpath}" ''; meta = { diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3f99094ffd45..257b676686b5 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.7.0"; + version = "2.9.7.2"; + name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; + sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix new file mode 100644 index 000000000000..9b16404b6208 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver +, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }: + +let + pn = "choqok"; + v = "1.5"; +in + +stdenv.mkDerivation rec { + name = "${pn}-${v}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz"; + sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4"; + }; + + buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs + automoc4 pkgconfig phonon qca2 qjson qoauth ]; + + meta = with stdenv.lib; { + description = "A KDE microblogging client"; + repositories.git = git://anongit.kde.org/choqok; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 82d11e02fe1d..fbd9954d3aab 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16"; + version = "0.16.1"; src = fetchurl { url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; - sha256 = "14x15jwgl0c6vwj02ccpzmxr3fczp632mnj50cpklbaj4bxqvgbs"; + sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index bd934b6cf737..1a9f8f8feab6 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.4.5"; + version = "0.4.6"; src = fetchurl { url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "0qzwqxcxf695z3gf94psd2x619vlp4hkkjmkrpsla1ns0f6v6dkl"; + sha256 = "17ra53c1m0w0lzm5bj63y1ysx8bv119z5h0csisxsn4r85z6cwln"; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 256b4a7ed3ab..313d2bce1b75 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { echo "patching ts3client..." patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ + --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3client ''; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index be5f6d0037c7..1da719845a33 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { echo "patching ts3server" patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ + --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3server ''; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 3739d098acc9..d5cc3fb7718f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile -, pythonPackages, cacert, cmake, makeWrapper }: +, pythonPackages, cacert, cmake, makeWrapper +, extraBuildInputs ? [] }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -15,18 +16,15 @@ stdenv.mkDerivation rec { [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper cacert cmake ] - ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; + ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" - '' + '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$NIX_PYTHONPATH" + wrapProgram "$out/bin/weechat" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$NIX_PYTHONPATH" ''; meta = { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 595272b900af..919ba008392e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,117 +4,117 @@ # ruby generate_source.rb > source.nix { - version = "31.4.0"; + version = "31.5.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha1 = "5e6592c5f0569fb56613ed34db895a2fa6c77f66"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "7f270aebf5de8c2f4a988d87b37cbdf12542a86a"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "611bbfb96b6f2b39c9a7b83311ba7f96e0294501"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "5b8dbb29e1dfce40d0414b75a2e889e40ba62b1b"; } - { locale = "be"; arch = "linux-i686"; sha1 = "8aef167276d82e3243912f1773ce42bc5831d6a8"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "81448779fcdcace457e7b3e37262345df9b100ec"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "4f82e7bfd24086e98721c6283156781a0a65e23f"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "c3ddd6613f7591ff7d4aad1e39358f7107e56b5d"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "68340eea06073ddf2c64f2808d5136295962ebb5"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c080fda6eb86414e3157a54befcd9bf7e5a87148"; } - { locale = "br"; arch = "linux-i686"; sha1 = "087a853427912f6aef3802851cf61d8c36aaad93"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "b574ee98d1771d4a4be77a5e1f7573d03329d497"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "4e56ed5b93e8aede015b4ba3b86d0121f5225e21"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "8ca5266e9ad8c1f24a9426cd41b4f9af764308b1"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "3e612559375de82f227fbdfad847bef58392ed64"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "3aeb7ca07b82258353b1085705e6f0f18c3a3813"; } - { locale = "da"; arch = "linux-i686"; sha1 = "7d09b5f73738ea9ea16c515434299df8654bbc1e"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "3c7b5dafca343afa0be3d107078c42d525149ab7"; } - { locale = "de"; arch = "linux-i686"; sha1 = "5273088e2ad5278fbec29a3d80ff81123807bdb1"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "d18893827828640ff83df8b3d340ed96312d4bfb"; } - { locale = "el"; arch = "linux-i686"; sha1 = "dc0f3ecb015568805634ee78f5ec314d2502ae63"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "ca7c336b9902c7f109c58e20d944c019cc3003dd"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "a7164e94562e7c711e0a8ca98cb9994c75aa4538"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f53acad0af7a080e310b7a875b6cb6776d691fcd"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "7c31b23b0dfe89c17c0eef61cc605f2ea6a5fca3"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f837d7d1916d687e4482abb87b74de90c4131b4d"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "80d6ad181ba25b3b65eb9fd990f03a1aadd68a7b"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f40f6514a2357aecabdc34708bbc819fb6546a70"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "7c0d9500321fe5c854ba7f1f11cd1cfcec895919"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "afa2780e35a8fb95b26f43595c2e7729e7d37360"; } - { locale = "et"; arch = "linux-i686"; sha1 = "711bf1da10758f784e5c31b3673eb612604775b9"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "02ee282d0b54ad6490e742f7a3b29763bf1d0545"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "940125468f0129138e20a048fe09d3d489bab478"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "357a64c3b49e3d058ed715de24296fa6533dbe59"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "abe4633376f244efffbd3faa7be4381a5dce0dcc"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "f401ae0b0e51603249f6a7b925166bf287023dc7"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "f563e7f6638da931c3e8b3b8055d8ea1923af204"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "5ebfc7889ad5fa147c50e70a66b42238dc289ffd"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a7c6c74459ac9ecae0b325765ae9fb3e2adab1c5"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "923de165c7eb693316d4a81ad13e32636c1de990"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6685e21a2b20ebb35da479604dfbf719b0822c3e"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "35d4f00f26c3bc18c7a6ebcc6d6d2ccd0a4499d4"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "7ad9d25363f3b98085758fb2815d4fbf0b898b28"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "ddb0b68b311e51f602248924b4b49481a64ac175"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "216df56d5dde4f27d0f14cfaafd7af08a2732bf2"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "4c30c0ba4bbe22522565679b49b06d62673fbd74"; } - { locale = "he"; arch = "linux-i686"; sha1 = "7f67f2fe2166d207f7fa39feb85faae4595cbdbc"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "f5949cb31f01b11cb6a43a045798da64abea52af"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "c6d784d2cd3f3baf6737dfd2d28c03f9b1c37623"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "b5598bc5a19b45ee17cfd259f7da581735f90430"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "21699446dbcc9e0fb53e06dafec8efdbf6ab484b"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "e64a219956f4aa017ee742cc1768567052593282"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "a60b5d60e8436355ee24029a4398168108ce8aea"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "583af341312ea29b50a7eaa86d2c9758ce2f5735"; } - { locale = "id"; arch = "linux-i686"; sha1 = "2471ebfc64a84e8711d7bc26783a16d6300ada07"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "d67b28477e36501a03ce8fd79a23090d068a696e"; } - { locale = "is"; arch = "linux-i686"; sha1 = "f53018a38f84c7e4fc8d5a3ee952478d4a1c9ebe"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "f886bcdb98af1c217a837c10a5e0737cbd357ef0"; } - { locale = "it"; arch = "linux-i686"; sha1 = "000d8e56b62768aee6dba9cb14b733f78908e751"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "27ffbd773f977b67903a62b9131b1dcda27dd7f2"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "cd743c00682001094d3a7decd8396b6ce9b1e67e"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "64b8ba26bb1f85788321bd2ba38b4813859ebede"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "445731309b578c262547f22364dfe1fd0eaf68d5"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "9bc2efd19b17c0e09b55e6ae310e59147212d726"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "35a275d39c2a780b86749891c14ee77ca36f03bf"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "c70f2f57e1fd8c40da949a18314c30380728f7bd"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c94ace97f23a6fce1e736bb334ddf6af3d5a0ff4"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b00717ab99a47ef3477fecb79d55dc5817c60c1e"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "a5864e976675278cb9fb7e65c1edb88f704557f1"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "dba80bc2bc1ec67ba932525d05253803292bc9d8"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "161e1361b1ecc5f1ee31227b7e65705ab5355432"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "8051e55e5f7fbc42c7d75b5ad28834d11b699833"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "91c8812e39baaa1974d4d1c316c7c08022f3408f"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "948a679c843cee3f8da80f0a45b5416c7cc3b37c"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "43005f6337f33171f745f2e493d8cf2a8371d143"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "78fea3bc7e24eb96aefb2e52b01657437fc9dfd6"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0a5b4e14446c0f8f44004178f873bb289176e1b6"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "727d4a82754118749ea48e4b7ab6d182570957ad"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b4418f18b3569991ff2aca4528e70dd49247d81"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0ffbee08f3e43fde37913679037d59b68a47d49b"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "79606026969e837b4b9a1be73b71b0b183757504"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "0680dfa0417688e2ad6307b10f90c766db139789"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "d06f4e7f748ffa8202bfc1dc0c4bc94894feb223"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "a998af6413eec1123c9e4698ce217dc856c2bb4e"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "062a1ba9c8a5c06972895ebb11e12d90a50c450d"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "fd149bdbdc4a697cfab1d04b818b09718a3b945c"; } - { locale = "si"; arch = "linux-i686"; sha1 = "50105a554db09e57ad99aee5c3b9c9f35eef3431"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "ed360ef7cbf2ecc70b08922c27cdf3525c392137"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "34dee72d71916209a3cad28e6adfa1b3270567c6"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "cfe76d345c17ab8711a723779d263c3baa0016ff"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "391a923ff56ba6adf15817b12eec4555ede578fe"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "b6c3ad0b50610fd2470a2366c58a2e4947a96698"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "f422d3adca0f15b70d53c9c9b9bae09d651ef535"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "d3c8c82a0531a20480ac93dc6e0c981068a327fc"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "9d7ab49903107da8cd9859d09ae62dea661130a9"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "24f770326910db0ebd3d521b7573f57c4db2afdd"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "b93a538462e364202cf0a7ef9867f3bcaad5256d"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "b2c6c917b6575002f2f9f548ba1ae0aa3bd7a064"; } - { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e0d34774514f264bb02a2c5db76270bc228e80a8"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "8119ba8f521da39af4d729fe52841c76e6a9c6f1"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "76b9c748286ac40cb77b2dfe98e44b1ebadc6d9b"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "779ed971dac93d55e45a63e0ff4d3f6118317116"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "784a6432f04dc12f6abb405e4375540bb3c1bfac"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "d6ec1ca2015c723d05e4f7a6e6006cb0f5f45667"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "e494cb50a3c99b4e96794544b1a7948663d0ae28"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "e9a8d6fb2b9328f7ea80c0d7be9943daaf37e71d"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "14624e631eb3bdfb9cde339dbf132e048f68f1c3"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1197fa99680d978b10c41ccac7183117c264f375"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "78c73c73363b41b3ae36cea01cc64bc715602278"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "76faeef7919eb2fb594773502ee5202ed11b67e4"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "d36881e451b6a2f37d915aad58d05a21bb87f7d7"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "21274f27a373bfbef19be027e5d29072ca60c9a1"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "b01f2b2b84fec43aa53b72eb1298b502f7fe710f"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "9ca6a14bd622b10e4a44d3aec496f610752c1e87"; } + { locale = "be"; arch = "linux-i686"; sha1 = "194a8808c66a48bf7da08ff119a7000088fe6cc5"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "4c2b3ee21c098894aea655b428459ae06f9d62ea"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "bc218d49b4e43fd3f05b7c4c8906b3da88e828d9"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "8bb02681a93dd6f0607b6a0b9ed53051fc628fa1"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c5cfd8d422751908cab17b741f4ed964de65a4f4"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "80a5486d4150cdc140fc7c215927b9a49de7753c"; } + { locale = "br"; arch = "linux-i686"; sha1 = "401a491875fc0bc8d80650d83f7c70e6650c99df"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "0a76c907d2bcdf877a73fb098a7a0d269e40a624"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "4da40bb96d58d1465fab3cb23825d298140c81a2"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "c9e792e8d871b942e67c7d8b7471a7c40dc1d1de"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "a0da8667faf948049adee23a8c68320eb0af0d4c"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "de9c5cb34defca191cba287a3088179b52385e51"; } + { locale = "da"; arch = "linux-i686"; sha1 = "2a4c69398a3aa4dfe2c3d79330021e243893a660"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "2a24cc02c39be286de1c0407b5187effb3f74cad"; } + { locale = "de"; arch = "linux-i686"; sha1 = "292c4de929c96302d10b235788b985281ed1a36c"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "30ff8eacbe14d0b7d0fe4c8854d0b20af1fdbddb"; } + { locale = "el"; arch = "linux-i686"; sha1 = "1092950cb1e9297a976b1e81a53b20bfa908c27f"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "8eb096336f0a585922c31905534e8314dbe69f05"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "3c18093229125d47078da68cfbf785c96d8bdcc1"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "7c9546c119585111c20bf9f0a7da38c1359e8bae"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "9a8c3ddf64900335a0da340da67e291fd9135c78"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e00004d79733ba311f7b3586228c4c481935f9e6"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "c5a60aaf75baf0cfc56575cd40bb61594c66dad0"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "e95dad323e8e6c1eb401b9528f16825b6d4defef"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "66adbf58ccd65b6b60ef4196e13cf1b246151c6e"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "35ecf91137560f06445007bbee54cbf8c5b9c438"; } + { locale = "et"; arch = "linux-i686"; sha1 = "d7ab0d4874a95cb2234b076906eeba14d9a76507"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "82f944cbc95eeb10e6b46a20d8bd5b031800c87b"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "1494e4dfdb95d0e6d62265536016601501277b7a"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "ca36606b18739f155a18637f6ce392bf466ba666"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "dce9299b7bc905377566caa7e0289620e2d7e84f"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "6477fab8e95032bc57faecbb2240844a8d0314d5"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "e8fbd234f3e35d8dcb0acb2d3fbdd2b03d9c06e1"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "e2fb441f96c407371ed02e86d42b63e7e38107fa"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "2798b02de295269ee7a0792bc89c6c9f809bfab0"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ee398047c681098af9c5ad17101d34fe1699d038"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "739d34bf1b8ab785194b6c591e636bc4826b908a"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "518bce26ebb68021c4dc6a8472e3f267648746c4"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "5791da2bc93aa945f8f21b2896b80ae3b88f1bf6"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "f576688726132e0c0b8b07f37dda5dfdac0dddd7"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "95bff6f384ae2821857b3ae71b76aa5440ddd3e2"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "7237149162123580592769f66b48be83ad358df5"; } + { locale = "he"; arch = "linux-i686"; sha1 = "8bf0ba0630601e8773eb4117ea800a2d32e5c920"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "de5ab889e9ccc204f7abfb7e3e52e4ec6edbcc47"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "3a6030ec8f310e5b1b154e0cfd9b75142df4c282"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "0af6b30a39141e887b5ad14fb16bb71047dbd28e"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "bc84640dcf855612668a0c457a01ee0239440447"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "a96c48529e7f4a50840903d212d9cacacd5d5d94"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5ae8b3ad145fd1fe9d83b450b588ae85f3371489"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6c911464a02b65f84da08717cface89029e9a2cf"; } + { locale = "id"; arch = "linux-i686"; sha1 = "19b98a36c5b64a1ac6db72b6d21e6b3c9919b3bb"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "88bbe2609b8e84050dfab1c6ae313b4ac5c1f619"; } + { locale = "is"; arch = "linux-i686"; sha1 = "24cf25824357b570ddf99445ed6ce5e02f61ac2f"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "f6cd888e6ae5c67cf35a811f087ace294ca80883"; } + { locale = "it"; arch = "linux-i686"; sha1 = "5fbeb845a3e9237b61a77e552927fd1cf41eb369"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "77015135696730a9412a2ef180564e53bfc41074"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "df807e1255871ecaa6487853798fb86e4228745c"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "cdfaf85e81edad783059b2a7b6a5af19ec48e8f3"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "3cd01ce359c500db39edefa75275bbd42244f344"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "52918cadfa61a4f3903f35e34583b9554446ad98"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "ade54d46de66db43de1490523e23434c9cb69103"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "52cd293a4329b51b40ff8d992dd2f980f6e8a7cd"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "693b2d513df0a0f6b31adf9349c6627816b5c14b"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "be7c2f7a4988998ad19d5a87c28dbe2b06dc7d75"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "3920a26c7ac2f66ab7d2ea5d37d58471d9cea804"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "f034ad4e4c347d6e2d4893b932c969c581cd51ad"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "23e21892a7b08fb320c2af2711bbb44347de07e8"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "6177e5dca5ee9b703e585489610b874ab16b67d3"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "ab89eca3573f847ce9c4757910303ec3647d010e"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "4ccde5395018e719bd5f0d835ead47a272578685"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "b1d15bc7c70deb8e00bf458082a8c2a4577ec6e2"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "fd146e4fb01ca78bcfe6ca2cd560a8252c37e561"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "bb63c5a778ab9c819b742393bdd67e347b18943b"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c619bec7acc717dc3fe7718c5b9b27a0aab2bb86"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "42c13c4381d1046d8982f2891e45cc13becc5eab"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "610d59c9b8e8bbb61937a205db70605cf99b4684"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "349481180512c188a1114e7c9c5aea6f39793137"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "b3bb61a6e2bc36af8521b1be44330f348e6019ab"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "211ef0e28c892f069c79be028cead4f484224977"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "9868443f482a00cdd0d68106afcdd002f74d8232"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "1b722932dd8b3b517c61ec50588a917bc7a5d934"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "9465eded1480ddf1e807de2ee8b2d10e7bcf9f0f"; } + { locale = "si"; arch = "linux-i686"; sha1 = "ddf30543b88f0dbab951ef76f93d4e9cef47bc00"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "5e0ecf9899cdbc63530e0b0bc72e585abb721863"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "38d6815aa5837005dfcb78cf25057a1f04b52da4"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "c5e2a1c6d67e41c318b13e81cdc7b6dc36d1798a"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "6bc59e32db280aa2300b649b175330c7d503776d"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "39f5965ead13d55c0b84f633dff645e8bc2111c0"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "a06151bcacbc504da1351cda4f84539a2ce9afc8"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "e453d23bb265d4d5e729fb7f4f65553ec8d72250"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "6c6f0e1bc7e2327d05484628298a204897b379bd"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "2044a84b1fdcae2aa2ae5aec9132543ed10792ed"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ecd19886aed7b721172be2a030e3b9d1a752a648"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "904ed03d02ceebed11505f95ccf158aa022d6aa5"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "4f9ec99fdb826957ef109a7665a97fe223a88d50"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "0bae36b2aac4e06bdf4b0b210f3179d15a074e8e"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "e0ab549d8f4df80f8b7dc4fa978142935f103140"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "2c0b7ca57916bac4846ec1702094c02452a05a0d"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "80af6c1ad5a226249f91b9ad40aa1fa2fae4e4c8"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "6a2de95d4e501fa0eed932d36e7e667746e89af5"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "7246575cd970737c8dd9ad84ad28316efcb37b7d"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "84f798a483558b24cfcbfe44af8c9d1c0acffc28"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "dda34b5b7026ffcd37b982968ac0815f02c082e2"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6a63ad1c758f639aaa8ee20b3153811514810425"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "a3b378d077ef57ed52130df662c5b68208527cc1"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "857cb387742c175e8b31a0b2171de5ab27531141"; } ]; } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index b70be1ef9800..904f69049798 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.13"; + version = "1.10.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0yz5sj960w0w6fdx32fdm4rzrav9l8ajid1d8g7n398hjh4mm0q1"; + sha256 = "0szazfknarw6ivnr4flr928ar309pz2mv6alc6pk6l1i9jchcnfs"; }; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index c9965a784e0f..9ca5ace2caf8 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { description = "A GTK+-based Usenet newsreader good at both text and binaries"; homepage = http://pan.rebelbase.com/; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index a1528dd1255b..e66f78f2602d 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -2,6 +2,7 @@ , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll , pulseaudio ? null, cups ? null, pcsclite ? null +, buildServer ? true, optimize ? true }: stdenv.mkDerivation rec { @@ -33,7 +34,10 @@ stdenv.mkDerivation rec { "-DWITH_CUNIT=OFF" ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" - ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"; + ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON" + ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" + ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON"; + meta = with stdenv.lib; { description = "A Remote Desktop Protocol Client"; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e35f8c739c54..fe89ce61604e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut -, libtool }: - -let - rev = 9690; -in -stdenv.mkDerivation { - name = "putty-${toString rev}"; - # builder = ./builder.sh; +{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: + +stdenv.mkDerivation rec { + version = "0.64"; + name = "putty-${version}"; + + src = fetchurl { + url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; + sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia"; + }; preConfigure = '' perl mkfiles.pl @@ -17,14 +18,17 @@ stdenv.mkDerivation { ./mkauto.sh cd unix ''; - - # The hash is going to change on new snapshot. - # I don't know of any better URL - src = fetchsvn { - url = svn://svn.tartarus.org/sgt/putty; - rev = rev; - sha256 = "e1fb49766e0724a12776ec3d6cd0bd420e03ebdc3383a01a12dbfd30983f81ef"; - }; buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + + meta = with stdenv.lib; { + description = "A Free Telnet/SSH Client"; + longDescription = '' + PuTTY is a free implementation of Telnet and SSH for Windows and Unix + platforms, along with an xterm terminal emulator. + It is written and maintained primarily by Simon Tatham. + ''; + homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; + license = licenses.mit; + }; } diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index fbbc85108a15..2e844fdeab4f 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -2,16 +2,14 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.2"; + version = "1.8.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; + sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; }; - patches = [ ./enable_windows_key.patch ]; - buildInputs = [openssl libX11]; configureFlags = [ @@ -24,6 +22,6 @@ stdenv.mkDerivation (rec { description = "Open source client for Windows Terminal Services"; homepage = http://www.rdesktop.org/; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; }) diff --git a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch deleted file mode 100644 index fff84c599636..000000000000 --- a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://sourceforge.net/p/rdesktop/code/1816/ -Fix constant naming and enabled windowskey by default. - -Index: trunk/rdesktop.c -=================================================================== ---- trunk/rdesktop.c (revision 1815) -+++ trunk/rdesktop.c (revision 1816) -@@ -554,7 +554,7 @@ - act.sa_flags = 0; - sigaction(SIGPIPE, &act, NULL); - -- flags = RDP_LOGON_NORMAL; -+ flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY; - prompt_password = False; - g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0; - g_embed_wnd = 0; -Index: trunk/constants.h -=================================================================== ---- trunk/constants.h (revision 1815) -+++ trunk/constants.h (revision 1816) -@@ -321,7 +321,7 @@ - #define RDP_LOGON_AUTO 0x0008 - #define RDP_LOGON_NORMAL 0x0033 - #define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */ --#define RDP_LOGON_BLOB 0x0100 -+#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100 - #define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */ - #define RDP_LOGON_LEAVE_AUDIO 0x2000 - #define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000 diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix new file mode 100644 index 000000000000..6a54a0e7ff0b --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/10.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau +, bash, patchelf, config }: + +let + topath = "${wineUnstable}/bin"; + + toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") + [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); +in +stdenv.mkDerivation { + name = "teamviewer-10.0.37742"; + src = fetchurl { + url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb"; + sha256 = config.teamviewer10.sha256 or "1j3zbvyj003gk8mm9sv1dld9x30l6fswwlhdyk46mixsqq5ayp6c"; + }; + + buildInputs = [ makeWrapper patchelf ]; + + unpackPhase = '' + ar x $src + tar xf data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/share/teamviewer $out/bin + cp -a opt/teamviewer/* $out/share/teamviewer + rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share} + + cat > $out/bin/teamviewer << EOF + #!${bash}/bin/sh + export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} + export PATH=${topath}\''${PATH:+:\$PATH} + $out/share/teamviewer/tv_bin/script/teamviewer "\$@" + EOF + chmod +x $out/bin/teamviewer + + patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd + ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/ + ''; + + meta = { + homepage = "http://www.teamviewer.com"; + license = stdenv.lib.licenses.unfree; + description = "Desktop sharing application, providing remote support and online meetings"; + }; +} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix deleted file mode 100644 index 55a5beb5093f..000000000000 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper -, bash, findutils, coreutils }: - -assert stdenv.system == "i686-linux"; -let - topath = "${wine}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wine ]); -in -stdenv.mkDerivation { - name = "teamviewer-7.0.9377"; - src = fetchurl { - url = "http://download.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz"; - sha256 = "1f8934jqj093m1z56yl6k2ah6njkk6pz1rjvpqnryi29pp5piaiy"; - }; - - buildInputs = [ makeWrapper ]; - - # I need patching, mainly for it not try to use its own 'wine' (in the tarball). - installPhase = '' - mkdir -p $out/share/teamviewer $out/bin - cp -a .tvscript/* $out/share/teamviewer - cp -a .wine/drive_c $out/share/teamviewer - sed -i -e 's/^tv_Run//' \ - -e 's/^ setup_tar_env//' \ - -e 's/^ setup_env//' \ - -e 's,^ TV_Wine_dir=.*, TV_Wine_dir=${wine},' \ - -e 's,progsrc=.*drive_c,progsrc='$out'"/share/teamviewer/drive_c,' \ - $out/share/teamviewer/wrapper - - cat > $out/bin/teamviewer << EOF - #!${bash}/bin/sh - # Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those - # paths become garbage collected, teamviewer crashes upon start because of - # those broken symlinks. An easy workaround to this behaviour is simply to - # delete all symlinks before we start teamviewer. Teamviewer will fixup the - # symlinks, just like it did the first time the user ran it. - ${findutils}/bin/find "\$HOME"/.teamviewer/*/*/"Program Files/TeamViewer/" -type l -print0 | ${findutils}/bin/xargs -0 ${coreutils}/bin/rm - - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer/wrapper wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "\$@" - EOF - chmod +x $out/bin/teamviewer - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - }; -} diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix new file mode 100644 index 000000000000..8544ccc0f79a --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: + +let version = "4.0.3.2"; in +stdenv.mkDerivation rec { + name = "x2goclient-${version}"; + + src = fetchurl { + url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; + sha256 = "0vqcz9kmnbvlj8kns68zl60019fdz97rydz4wsgnsgdf7r370npn"; + }; + + meta = with stdenv.lib; { + description = "Graphical NoMachine NX3 remote desktop client"; + homepage = http://x2go.org/; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace "lrelease-qt4" "${qt4}/bin/lrelease" \ + --replace "qmake-qt4" "${qt4}/bin/qmake" \ + --replace "-o root -g root" "" + ''; + + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + + enableParallelBuilding = true; + + installTargets = [ "install_client" "install_man" ]; + postInstall = '' + wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin"; + ''; +} diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix new file mode 100644 index 000000000000..e45f8c4f84c7 --- /dev/null +++ b/pkgs/applications/networking/sipcmd/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, opal, ptlib }: + +stdenv.mkDerivation rec { + + rev = "3090e9f"; + + name = "sipcmd-${rev}"; + + src = fetchgit { + url = "https://github.com/tmakkonen/sipcmd"; + rev = "${rev}"; + sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c"; + }; + + buildInputs = [ opal ptlib ]; + + buildPhase = '' + make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib" + ''; + + installPhase = '' + mkdir -pv $out/bin + cp sipcmd $out/bin/sipcmd + ''; + + meta = { + homepage = https://github.com/tmakkonen/sipcmd; + description = "sipcmd - the command line SIP/H.323/RTP softphone"; + platforms = with stdenv.lib.platforms; linux; + }; +} + diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index a1ad5ddc7792..cb8d168c7db1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.23"; + version = "0.10.29"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "1f1a83d9e5f1b235d62ecbd86d3afb682d88c2471354ad308f00d2ef668e797e"; + sha256 = "0zpjcl4gr0r8c0qygvks58ly1k7gp2ngd4dn2d85ci4dddvmmxvj"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch new file mode 100644 index 000000000000..ebf2f0900d98 --- /dev/null +++ b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch @@ -0,0 +1,18 @@ +Description: Add check for buffer overflow with malformed input files +Author: <eriks@debian.org> +Bug-Debian: http://bugs.debian.org/407015 +Last-Update: 2009-06-03 + +--- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200 ++++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200 +@@ -259,6 +259,10 @@ + } + tNameSize = (size_t)usGetWord(0x40, aucBytes); + tNameSize = (tNameSize + 1) / 2; ++ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) { ++ werr(0, "Name Size of PPS %d is too large", iIndex); ++ tNameSize = sizeof(atPPSlist[iIndex].szName); ++ } + vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); + atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); + if (atPPSlist[iIndex].ucType == 5) { diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index f889490a862c..ea36d59eea7c 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation { sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; - patchPhase = '' + preInstall = '' sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h ''; + patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; + installTargets = "global_install"; meta = { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index bed60fa66e49..896ac0a71a0e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -24,8 +24,8 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "4"; minor = "4"; - patch = "0"; - tweak = "3"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -80,14 +80,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0y94sry2cghc82628smka7qb1xqlgrgvy98bxd2fpqfkd1llcqfg"; + sha256 = "0a1p9jd9lgb1mxnj4c55yrlc7q2dsm5s9cyax6cwaya2q5m5xhnk"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "05al25vcz2z6fhm8vx77wa47nyi3r0hwll6mg2aclx7yp0s5k01d"; + sha256 = "042xp6xz3gb75k332xclwfjyik63zgcw5135967nclim1sl8rgh7"; }; }; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1xqc60ckay6xpljipcbm4915qqwk81dm2fbpxwfqc2l4gv9g6s6i"; + sha256 = "0pa7gf29sgsl6kxs7j1x1zl4ycv682wrj1dg22qc0kb7aijhpm2f"; }; # Openoffice will open libcups dynamically, so we link it directly diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bee1b738d124..9283ee1274c0 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, qt4, cmake, sqlite}: +{ stdenv, fetchurl, qt4, cmake, sqlite }: stdenv.mkDerivation { - name = "tagainijisho-1.0.2"; + name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.2/tagainijisho-1.0.2.tar.gz; - sha256 = "0gvwsphy2a1b2npxkzvaf91rbzb00zhi2anxd5102h6ld5m52jhl"; + url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; buildInputs = [ qt4 cmake sqlite ]; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 85ec081ea416..ac8059fc1d19 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -74,10 +74,13 @@ buildPythonPackage rec { # path to the executable in argv[0] therefore the wrapper is # modified accordingly. postFixup = '' + wrapProgram "$out/bin/zim" \ + --prefix XDG_DATA_DIRS : "$out/share" + wrapPythonPrograms - sed -i "s#sys\.argv\[0\] = 'zim'#sys.argv[0] = '$out/bin/zim'#g" \ - $out/bin/.zim-wrapped + sed -i "s#sys\.argv\[0\] = '.zim-wrapped'#sys.argv[0] = '$out/bin/zim'#g" \ + $out/bin/..zim-wrapped-wrapped if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 2b00b640d73b..1a5b1f92276e 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.62"; + name = "gtkwave-3.3.64"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1ykc5j11rkfcinsl9cza9k93jwvcj04xxz0i446lwby4svcbaa9i"; + sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 05f18334b991..0bd6f5a35c3f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.1.2"; + name = "R-3.1.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw"; + sha256 = "04kk6wd55bi0f0qsp98ckjxh95q2990vkgq4j83kiajvjciq7s87"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt @@ -54,8 +54,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - # The test suite fails when building without the recommended packages. - doCheck = withRecommendedPackages; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 2bd1aa893c55..0dbab841a81b 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - version = "2.7.2"; + version = "2.7.3"; name = "pari-${version}"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "1b0hzyhafpxhmiljyhnsh6c27ydsvb2599fshwq2fjfm96awjxmc"; + sha256 = "02k54m7p47r54lgxqanxvf7pdrss17n8if1qwk5wx0j1px22j0rq"; }; buildInputs = [gmp readline]; diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index 5cf033488393..79e5b3097696 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -6,7 +6,7 @@ buildPhase() { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done } diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index 5cf033488393..79e5b3097696 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -6,7 +6,7 @@ buildPhase() { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done } diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index 59d83f0ea944..c944fc3d68b3 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done ''; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index 17a2c502e471..b5a85415c376 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done ''; diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index 161a30d5a981..a38bc4254bbe 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done ''; diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 9691f2fe9c6b..2e51ef9ed4cf 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1 + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 ''; meta = { diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index ce4d7f116a8d..3cf85961a9bb 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { for i in bin/*; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1 + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a313a566c4e8..b206fc671b5a 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -100,4 +100,6 @@ rec { gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; git-extras = callPackage ./git-extras { }; + + git-cola = callPackage ./git-cola { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix new file mode 100644 index 000000000000..eee17911cea8 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: + +pythonPackages.buildPythonPackage rec { + name = "git-cola-${version}"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; + sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1"; + }; + + buildInputs = [ makeWrapper gettext ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ]; + + # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but + # "import __future__" must be placed above that. This removes the argv[0] line. + postFixup = '' + wrapPythonPrograms + + sed -i "$out/bin/.git-dag-wrapped" -e '{ + /import sys; sys.argv/d + }' + + sed -i "$out/bin/.git-cola-wrapped" -e '{ + /import sys; sys.argv/d + }' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/git-cola/git-cola; + description = "A sleek and powerful Git GUI"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bobvanderlinden ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d31edb04bbe3..123bb65da8d8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,11 +9,8 @@ }: let - - version = "2.3.0"; - + version = "2.3.3"; svn = subversionClient.override { perlBindings = true; }; - in stdenv.mkDerivation { @@ -21,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1jhagfsmn9as6bss0c6zppw0iydcalgmadyywz7kdxbdsqa3mcll"; + sha256 = "11s6w6dsv9kfgpfa75sas4pi6spw75ph0b0b6b12xq37hl4l8ma7"; }; patches = [ diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 36dcb2562121..a892d7decc07 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -32,9 +32,13 @@ buildPythonPackage rec { --install-lib=$out/lib/${python27.libPrefix}/site-packages \ --prefix="$out" + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + + preFixup = '' wrapProgram $out/bin/meld \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c97e9c762a5c..bd35ebb52662 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.2.4"; + version = "3.3.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1g7nfvapxj5k44dyp0p08v37s0zmrj2vl0rjgfd8297x0afidm08"; + sha256 = "1yi72lv05p6hr8ngplz56rncs9wv6c16z8ki6f96yw5c833igik7"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index e9a8f48b7aaf..af8496688755 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,14 +1,12 @@ -{stdenv, fetchgit}: +{stdenv, fetchurl}: stdenv.mkDerivation rec { - rev = "ef15aeeb0553efb698e3d4261e79eff77a136ee7"; - version = "1.20141026"; - name = "vcsh-${version}_${builtins.substring 0 7 rev}"; + version = "1.20141026-1"; + name = "vcsh-${version}"; - src = fetchgit { - inherit rev; - url = "https://github.com/RichiH/vcsh"; - sha256 = "1dg6ina2wpy406s5x0x4r7khx6gc42hfak0gjwy0i53ivkckl1nd"; + src = fetchurl { + url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz"; + sha256 = "1wgrmkygsbmk8zj88kjx9aim2fc44hh2d1a83h4mn2j714pffh33"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index e3e52425ebde..f29ad00ea9e3 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4 , phonon , makeWrapper, mlt, gettext , qimageblitz, qjson , shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies -, libv4l +, libv4l, oxygen_icons }: stdenv.mkDerivation rec { @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { shared_mime_info soprano ]; + propagatedUserEnvPkgs = [ oxygen_icons ]; + enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index e38e00bc61f7..f41d0e839ac1 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -18,7 +18,7 @@ let mkdir -p $d sauce="." [ -d ${namespace} ] && sauce=${namespace} - cp -R $sauce/* $d + cp -R "$sauce/"* $d ''; }; @@ -59,13 +59,13 @@ in plugin = "genesis"; namespace = "plugin.video.genesis"; - version = "2.4.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "lambda81"; repo = "lambda-addons"; - rev = "1eb1632063e18f3f30e9fdbed2a15cf1e9c05315"; - sha256 = "1gzx0jq4gyhkpdd21a70lhww9djr5dlgyl93b4l7dhgr3hnzxccl"; + rev = "34af083980598177684eeb6e1e73da336b84575a"; + sha256 = "1fh3j4ymkrx9flpvnlyjp1q4avfmjv5a6yfwl3cmqnslkkp6kn9n"; }; meta = with stdenv.lib; { @@ -81,17 +81,17 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.9"; + version = "4.0.14"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; - sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; + rev = "a6041aa6cf8f8461c0ebb093d901320822539094"; + sha256 = "1nxa2855i1if4vsflhb88i9s12flp2yzgan2wzdv2117cmll4pvd"; }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.org/showthread.php?tid=67110"; + homepage = "http://forum.kodi.tv/showthread.php?tid=67110"; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 1fa77128c043..74d4196e47cc 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -18,12 +18,12 @@ assert withGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.6.0"; + version = "7.7.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "1n6waln6r9jx26al3k2nh6wi8p1q6lv2fs48nbc1lj9s2fc35pkl"; + sha256 = "0a602d5jvq0ap4pa64p80al8nmyp37a380bi5i4sqdpvp298h78r"; }; buildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index dec3a5fc28da..ac106431240d 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, freetype, yasm +, aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null @@ -103,6 +104,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig freetype ] + ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext mesa ] @@ -152,7 +154,7 @@ stdenv.mkDerivation rec { ${if speexSupport then "--enable-speex" else "--disable-speex"} ${if theoraSupport then "--enable-theora" else "--disable-theora"} ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} - ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} + ${if jackaudioSupport then "" else "--disable-jack"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5f328a4cf87a..464f5130b67a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -56,16 +56,17 @@ let in +with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.7.3"; + version = "0.8.3"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "1cg82zwzi6qh8s8w3716ikm1l1sigl9h6pd9ffdrp3ja4r2drp48"; + sha256 = "1kw9hr957cxqgm2i94bgqc6sskm6bwhm0akzckilhs460b43h409"; }; - buildInputs = with stdenv.lib; + buildInputs = [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix new file mode 100644 index 000000000000..c9cffe3fa96d --- /dev/null +++ b/pkgs/applications/video/p2pvc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: + +stdenv.mkDerivation { + name = "p2pvc"; + + buildInputs = [ pkgconfig opencv ncurses portaudio ]; + + enableParallelBuilding = true; + + installPhase = "mkdir -p $out/bin; cp p2pvc $out/bin/"; + + src = fetchFromGitHub { + owner = "mofarrell"; + repo = "p2pvc"; + rev = "d7b1c70288a7750fc8f9a22dbddbe51d34b5b9e5"; + sha256 = "0d4vvrsjad5gk4rrjwgydn9ffj12jfb4aksw2px6jw75hp9pzmka"; + }; + + meta = { + description = "A point to point color terminal video chat"; + homepage = "https://github.com/mofarrell/p2pvc"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ trino ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 7f53aa07db60..5b77ec916b08 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper -, pythonPackages, gst, clutter-gst, clutter-gtk -, gobjectIntrospection, clutter, gtk3, librsvg -, gnome_icon_theme, gnome_icon_theme_symbolic, gnome3 +, pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme +, gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify }: let @@ -30,27 +29,22 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; buildInputs = [ - gobjectIntrospection clutter-gst clutter-gtk librsvg + gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop + hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ - gst-python gst-editing-services + gstreamer gst-python gst-editing-services gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ (with pythonPackages; [ python pygobject3 pyxdg numpy pycairo sqlite3 ]); - preFixup = with stdenv.lib; with gst; let - libraryPath = makeLibraryPath [ - gstreamer gst-editing-services - clutter-gst clutter-gtk clutter gtk3 - gnome3.gnome_desktop - ]; - in '' + preFixup = '' wrapProgram "$out/bin/pitivi" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix LD_LIBRARY_PATH : "${libraryPath}" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; } diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix new file mode 100644 index 000000000000..a7e8cd8c1b9a --- /dev/null +++ b/pkgs/applications/video/qarte/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: + +stdenv.mkDerivation { + name = "qarte-2.2.0"; + src = fetchbzr { + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; + rev = "146"; + sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv qarte $out/bin/ + substituteInPlace $out/bin/qarte \ + --replace '/usr/bin/python' "${python.interpreter}" \ + --replace '/usr/share' "$out/share" + wrapProgram $out/bin/qarte \ + --prefix PYTHONPATH : "${pyqt4}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ + --prefix PATH : "${rtmpdump}/bin" + + mkdir -p $out/share/man/man1/ + mv qarte.1 $out/share/man/man1/ + + mkdir -p $out/share/qarte + mv * $out/share/qarte/ + ''; + + meta = { + homepage = https://launchpad.net/qarte; + description = "A recorder for Arte TV Guide and Arte Concert"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 82930eb8bd83..e25f833eabc3 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -13,15 +13,16 @@ with stdenv.lib; -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); +assert (withQt5 -> qt5 != null); +assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; + sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy"; }; buildInputs = diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 9307b9e1d1bd..6ae4100c8275 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.7"; + name = "xine-ui-0.99.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; + sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; nativeBuildInputs = [ pkgconfig shared_mime_info ]; diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix index 105bbbfbacd5..74a203dc919c 100644 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -4,11 +4,11 @@ with stdenv; mkDerivation rec { - version = "8"; + version = "9"; name = "zdfmediathk"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%208/MediathekView_${version}.zip"; - sha256 = "1sglzk8zh6cyijyw82k49yqzjv0ywglp03w09s7wr4mzk48mfjj9"; + url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%209/MediathekView_${version}.zip"; + sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index eaf983f7bbc1..c456c9aa9f22 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l"; + sha256 = "0j1wlh0jj84ly3iykp2iqvm01g5il5v56fvlrfvx6qsslyrs35yg"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 182d89e5f22d..67e3f9ade980 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python , makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib -, avahi, dconf, spiceSupport ? true, spice_gtk +, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo }: with stdenv.lib; @@ -9,12 +9,12 @@ with pythonPackages; buildPythonPackage rec { name = "virt-manager-${version}"; - version = "1.0.1"; + version = "1.1.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1n248kack1fni8y17ysgq5xhvffcgy4l62hnd0zvr4kjw0579qq8"; + sha256 = "0hbr1wf4byfvbqlbq3w6s71ckhn626i4rb497y4z2cm12p5hc2db"; }; propagatedBuildInputs = @@ -22,7 +22,7 @@ buildPythonPackage rec { paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 - libvirt libxml2Python ipaddr vte + libvirt libxml2Python ipaddr vte libosinfo ] ++ optional spiceSupport spice_gtk; buildInputs = diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 842687cfdaf3..2fe7e0bcc232 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -11,10 +11,10 @@ with stdenv.lib; let sourceInfo = rec { baseName="virt-viewer"; - version="1.0"; + version="2.0"; name="${baseName}-${version}"; url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - hash="09sf1xzvw2yysv4c1jkqlzrazdg501r4j12hiwjdzk5swk6lppw0"; + hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9"; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7f12d2fa8f8c..af0d5c7fffb3 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let buildType = "release"; - version = "4.3.20"; # changes ./guest-additions as well + version = "4.3.24"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -35,13 +35,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "96996"; + extpackRevision = "98716"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "7e1253f7013e9cdc84a614a0db38b40de7bbd330cb5b85bd3ef3de213773450d"; + sha256 = "c6b61774e323b70da0d4f5677ef56f1c53990eccef859d3c720d814f98a01f8d"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -60,7 +60,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965"; + sha256 = "e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ba8fb4cd460a..56fe2b1083c9 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "9ab48f44ac26a6deb374cb5fe6bad103bbf4fdf5186140e2d40ebe48bd01f3ea"; + sha256 = "df4385aaa80f322ee2acda0657a53d9ca5c489e695ee5f9776574b67c649c960"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -78,6 +78,10 @@ stdenv.mkDerivation { patchelf --set-rpath $out/lib:${dbus}/lib $i done + # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions + # NixOS module) to 98vboxadd-xclient. For now, just work around it: + mv lib/VBoxGuestAdditions/98vboxadd-xclient bin/VBoxClient-all + # Remove references to /usr from various scripts and files sed -i -e "s|/usr/bin|$out/bin|" share/VBoxGuestAdditions/vboxclient.desktop sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all diff --git a/pkgs/applications/virtualization/xen/4.4.1.nix b/pkgs/applications/virtualization/xen/4.4.1.nix new file mode 100644 index 000000000000..a13a51a1d4ef --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.4.1.nix @@ -0,0 +1,46 @@ +{ callPackage, fetchurl, ... } @ args: + +let + # Xen 4.4.1 + xenConfig = { + name = "xen-4.4.1"; + version = "4.4.1"; + + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz"; + sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m"; + }; + + # Sources needed to build the xen tools and tools/firmware. + toolsGits = + [ # tag qemu-xen-4.4.1 + { name = "qemu-xen"; + url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git; + rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4"; + sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18"; + } + # tag xen-4.4.1 + { name = "qemu-xen-traditional"; + url = git://xenbits.xen.org/qemu-xen-4.4-testing.git; + rev = "6ae4e588081620b141071eb010ec40aca7e12876"; + sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded"; + } + ]; + + firmwareGits = + [ # tag 1.7.3.1 + { name = "seabios"; + url = git://xenbits.xen.org/seabios.git; + rev = "7d9cbe613694924921ed1a6f8947d711c5832eee"; + sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87"; + } + { name = "ovmf"; + url = git://xenbits.xen.org/ovmf.git; + rev = "447d264115c476142f884af0be287622cd244423"; + sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; + } + ]; + + }; + +in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix new file mode 100644 index 000000000000..176e15ea2c75 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.5.0.nix @@ -0,0 +1,58 @@ +{ callPackage, fetchurl, fetchgit, ... } @ args: + +let + # Xen 4.5.0 + xenConfig = { + name = "xen-4.5.0"; + version = "4.5.0"; + + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz"; + sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv"; + }; + + # Sources needed to build the xen tools and tools/firmware. + firmwareGits = + [ # tag 1.7.5 + { name = "seabios"; + url = git://xenbits.xen.org/seabios.git; + rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; + sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb"; + } + { name = "ovmf"; + url = git://xenbits.xen.org/ovmf.git; + rev = "447d264115c476142f884af0be287622cd244423"; + sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; + } + ]; + + toolsGits = + [ # tag qemu-xen-4.5.0 + { name = "qemu-xen"; + url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; + rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99"; + sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z"; + } + # tag xen-4.5.0 + { name = "qemu-xen-traditional"; + url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; + rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22"; + sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af"; + } + ]; + + xenserverPatches = let + patches = { + url = https://github.com/ts468/xen-4.5.pg.git; + rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; + sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; + }; + in '' + cp -r ${fetchgit patches}/master patches + quilt push -a + substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE" + ''; + }; + +in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) + diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/generic.nix index e6ad49f20351..711fd505efa4 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -3,46 +3,20 @@ , lvm2, utillinux, procps, texinfo, perl, pythonPackages , glib, bridge-utils, xlibs, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl -, checkpolicy, transfig, glusterfs, fetchgit, xz }: +, checkpolicy, transfig, glusterfs, fetchgit, xz, spice +, spice_protocol, usbredir, alsaLib, quilt +, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools +, inetutils, iptables, openvswitch, nbd, drbd, xenConfig +, xenserverPatched ? false, ... }: with stdenv.lib; let - version = "4.4.1"; libDir = if stdenv.is64bit then "lib64" else "lib"; - # Sources needed to build the xen tools and tools/firmware. - toolsGits = - [ # tag qemu-xen-4.4.1 - #{ name = "qemu-xen"; - # url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git; - # rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4"; - # sha256 = "e7abaf0e927f7a2bba4c59b6dad6ae19e77c92689c94fa0384e2c41742f8cdb6"; - #} - # tag xen-4.4.1 - { name = "qemu-xen-traditional"; - url = git://xenbits.xen.org/qemu-xen-4.4-testing.git; - rev = "6ae4e588081620b141071eb010ec40aca7e12876"; - sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded"; - } - ]; - firmwareGits = - [ # tag 1.7.3.1 - { name = "seabios"; - url = git://xenbits.xen.org/seabios.git; - rev = "7d9cbe613694924921ed1a6f8947d711c5832eee"; - sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87"; - } - { name = "ovmf"; - url = git://xenbits.xen.org/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; - } - ]; - - # Sources needed to build the stubdoms and tools + # These sources are already rather old and probably do not change frequently xenExtfiles = [ { url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz; sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp"; @@ -76,15 +50,15 @@ let } ]; + scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") + [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools + iproute inetutils iptables bridge-utils openvswitch nbd drbd ])); in -stdenv.mkDerivation { - name = "xen-${version}"; - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m"; - }; + +stdenv.mkDerivation { + inherit (xenConfig) name version src; dontUseCmakeConfigure = true; @@ -95,11 +69,15 @@ stdenv.mkDerivation { glib bridge-utils pixman iproute udev bison xlibs.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig - glusterfs cmake + glusterfs cmake spice spice_protocol usbredir + alsaLib quilt ]; pythonPath = [ pythonPackages.curses ]; + patchPhase = if ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) + then xenConfig.xenserverPatches + else ""; preConfigure = '' # Fake wget: copy prefetched downloads instead @@ -111,6 +89,13 @@ stdenv.mkDerivation { export PATH=$PATH:$PWD/wget ''; + # TODO: If multiple arguments are given with with-extra-qemuu, + # then the configuration aborts; the reason is unclear. + # If you know how to fix it, please let me know! :) + #configureFlags = "--with-extra-qemuu-configure-args='--enable-spice --enable-usb-redir --enable-linux-aio'"; + + # TODO: Flask needs more testing before enabling it by default. + #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; buildFlags = "xen tools stubdom"; @@ -136,6 +121,12 @@ stdenv.mkDerivation { substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ --replace /usr/include/pci ${pciutils}/include/pci + substituteInPlace tools/hotplug/Linux/xen-backend.rules \ + --replace /etc/xen/scripts $out/etc/xen/scripts + + # blktap is not provided by xen, but by xapi + sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't # print the GCC version number properly. substituteInPlace xen/Makefile \ @@ -157,15 +148,17 @@ stdenv.mkDerivation { # overriden at runtime. substituteInPlace tools/hotplug/Linux/init.d/xendomains \ --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ + --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \ + --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \ --replace /bin/ls ls # Xen's tools and firmares need various git repositories that it # usually checks out at time using git. We can't have that. - ${flip concatMapStrings toolsGits (x: let src = fetchgit x; in '' + ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x; in '' cp -r ${src} tools/${src.name}-dir-remote chmod +w tools/${src.name}-dir-remote '')} - ${flip concatMapStrings firmwareGits (x: let src = fetchgit x; in '' + ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x; in '' cp -r ${src} tools/firmware/${src.name}-dir-remote chmod +w tools/firmware/${src.name}-dir-remote '')} @@ -189,18 +182,24 @@ stdenv.mkDerivation { installPhase = '' - mkdir -p $out + mkdir -p $out $out/share cp -prvd dist/install/nix/store/*/* $out/ cp -prvd dist/install/boot $out/boot - cp -prvd dist/install/etc $out/etc + cp -prvd dist/install/etc $out cp -dR docs/man1 docs/man5 $out/share/man/ wrapPythonPrograms - ''; # */ + substituteInPlace $out/etc/xen/scripts/hotplugpath.sh --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\" + + shopt -s extglob + for i in $out/etc/xen/scripts/!(*.sh); do + sed -i '2s@^@export PATH=$out/bin:${scriptEnvPath}@' $i + done + ''; meta = { homepage = http://www.xen.org/; description = "Xen hypervisor and management tools for Dom0"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ eelco tstrobel ]; }; } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 20cd15abf1cb..3b655b55c9c0 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter -, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode +, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 , docbook_xsl }: let - version = "3.5.5"; + version = "3.5.6"; in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - + src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0iwd4pjvq0akm9dbipbl4m4fm24m017l06arasr445v2qkbxnc5z"; + sha256 = "1ms6a3l1i2jdhzrd1zr25cqckznmb44qgz4n635jam42hzhrvx1p"; }; meta = with stdenv.lib; { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; - + buildInputs = [ asciidoc cairo @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ - --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" + --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b8e342fb5d12..6b9a579a08ba 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.12.0"; + version="0.9.12.1"; name="${baseName}-${version}"; - hash="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; - url="https://launchpad.net/compiz/0.9.12/0.9.12.0/+download/compiz-0.9.12.0.tar.bz2"; - sha256="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; + hash="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb"; + url="https://launchpad.net/compiz/0.9.12/0.9.12.1/+download/compiz-0.9.12.1.tar.bz2"; + sha256="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index b46864b9c2e4..36e081ccfcf4 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -4,19 +4,20 @@ , libXinerama , imlib2 }: +with stdenv.lib; stdenv.mkDerivation rec { name = "fluxbox-${version}"; - version = "1.3.5"; + version = "1.3.7"; buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; src = fetchurl { - url = "mirror://sourceforge/fluxbox/${name}.tar.bz2"; - sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; + url = "mirror://sourceforge/fluxbox/${name}.tar.xz"; + sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; - meta = with stdenv.lib; { + meta = { description = "Full-featured, light-resource X window manager"; longDescription = '' Fluxbox is a X window manager based on Blackbox 0.61.1 window diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index f07c1d223109..a8d2b42bb3bd 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl -, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: +, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy, libxkbcommon }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.8"; + version = "4.9.1"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; + sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp"; }; buildInputs = [ - which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm + which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" mkdir -p $out/man/man1 cp man/*.1 $out/man/man1 + for program in $out/bin/i3-sensible-*; do + sed -i 's/which/command -v/' $program + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix new file mode 100644 index 000000000000..ad6fcddf5be4 --- /dev/null +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -0,0 +1,59 @@ +{ fetchurl +, coreutils +, libX11 +, libXrandr +, libXcursor +, libXft +, libXt +, libxcb +, xcbutil +, xcb-util-cursor +, xcbutilkeysyms +, xcbutilwm +, stdenv +}: + +stdenv.mkDerivation rec { + name = "spectrwm-${version}"; + version = "2.6.2"; + + src = fetchurl { + url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_6_2.tar.gz"; + sha256 = "1pc9p3vwa4bsv76myqkqhp4cxspr72s5igi7cs9xrpd4xx6xc90s"; + }; + + buildInputs = [ + libX11 + libxcb + libXrandr + libXcursor + libXft + libXt + xcbutil + xcb-util-cursor + xcbutilkeysyms + xcbutilwm + ]; + + sourceRoot = "spectrwm-SPECTRWM_2_6_2/linux"; + makeFlags="PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "https://github.com/conformal/spectrwm"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.isc; + platforms = platforms.all; + + longDescription = '' + spectrwm is a small dynamic tiling window manager for X11. It + tries to stay out of the way so that valuable screen real estate + can be used for much more important stuff. It has sane defaults + and does not require one to learn a language to do any + configuration. It was written by hackers for hackers and it + strives to be small, compact and fast. + ''; + }; + +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix new file mode 100644 index 000000000000..11e5460fecbc --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }: + +stdenv.mkDerivation { + name = "alsamixer.app-0.2.1"; + src = fetchgit { + url = git://repo.or.cz/dockapps.git; + rev = "38c74350b02f35824554ce0c4f0f251d71762040"; + sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext alsaLib ]; + + postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; + + installPhase = '' + mkdir -pv $out/bin; + cp AlsaMixer.app $out/bin/AlsaMixer; + ''; + + meta = { + description = "Alsa mixer application for Windowmaker"; + homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix new file mode 100644 index 000000000000..1d2683c40fdd --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: + +stdenv.mkDerivation { + name = "wmCalClock-1.25"; + src = fetchurl { + url = http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz; + sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Src"; + + buildPhase='' + make prefix=$out + ''; + + installPhase = '' + mkdir -pv $out/bin + mkdir -pv $out/man/man1 + make DESTDIR=$out install + ''; + + meta = { + description = "Clock for Windowmaker"; + homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix new file mode 100644 index 000000000000..6fe49745fa76 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: + +stdenv.mkDerivation { + name = "wmsm.app-0.2.1"; + src = fetchurl { + url = http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2; + sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; + + installPhase = '' + substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install" + mkdir -pv $out/bin; + make PREFIX=$out/bin install; + ''; + + meta = { + description = "System monitor for Windowmaker"; + homepage = "http://linux-bsd-unix.strefa.pl"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix new file mode 100644 index 000000000000..358f3d22f39d --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: + +stdenv.mkDerivation { + name = "wmsystemtray-1.4"; + src = fetchurl { + url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz; + sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ]; + + meta = { + description = "Systemtray for Windowmaker"; + homepage = "http://wmsystemtray.sourceforge.net"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index cddaeb5f799f..cb02a214d5bb 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -1,22 +1,16 @@ -{ stdenv, buildEnv, ghcWithPackages, xmessage, makeWrapper, packages }: +{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages }: let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); -drv = buildEnv { +in stdenv.mkDerivation { name = "xmonad-with-packages"; - paths = [ xmonadEnv ]; + nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - rm $out/bin - mkdir $out/bin - for i in ${xmonadEnv}/bin/*; do - ln -s $i $out/bin - done - wrapProgram $out/bin/xmonad \ - --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ + --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) +} diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix index 66e2700f192a..02862abca498 100644 --- a/pkgs/build-support/autonix/default.nix +++ b/pkgs/build-support/autonix/default.nix @@ -146,7 +146,11 @@ let mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; }); - resolveDeps = scope: map (dep: scope."${dep}" or null); + resolveDeps = scope: + let resolveDeps_go = dep: + let res = scope."${dep}" or []; + in if isList res then res else [res]; + in concatMap resolveDeps_go; userEnvPkg = dep: mapAttrs diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index ee18f86893bb..d80e2869e5e6 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -62,7 +62,7 @@ let chosenGcc bashInteractive coreutils less shadow su gawk diffutils findutils gnused gnugrep - gnutar gzip bzip2 xz + gnutar gzip bzip2 xz glibcLocales ]; # Compose a global profile for the chroot environment @@ -72,6 +72,9 @@ let mkdir -p $out/etc cat >> $out/etc/profile << "EOF" export PS1='${name}-chrootenv:\u@\h:\w\$ ' + export LOCALE_ARCHIVE='/usr/lib${if is64Bit then "64" else ""}/locale/locale-archive' + export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64 + export PATH='/bin:/sbin' ${profile} EOF ''; @@ -81,15 +84,17 @@ let staticUsrProfileTarget = nixpkgs.buildEnv { name = "system-profile-target"; paths = basePkgs ++ [ profilePkg ] ++ targetPaths; + ignoreCollisions = true; }; staticUsrProfileMulti = nixpkgs.buildEnv { name = "system-profile-multi"; paths = multiPaths; + ignoreCollisions = true; }; linkProfile = profile: '' - for i in ${profile}/{etc,bin,sbin,share,var}; do + for i in ${profile}/{bin,sbin,share,var}; do if [ -x "$i" ] then ln -s "$i" @@ -129,7 +134,7 @@ let mkdir -m0755 lib # copy content of targetPaths - cp -rsf ${staticUsrProfileTarget}/lib/* lib/ + cp -rsf ${staticUsrProfileTarget}/lib/* lib/ && chmod u+w -R lib/ ''; # setup /lib, /lib32 and /lib64 @@ -142,22 +147,56 @@ let cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/ # copy content of multiPaths (32bit libs) - [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/ + [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/ && chmod u+w -R lib/ # copy content of targetPaths (64bit libs) - cp -rsf ${staticUsrProfileTarget}/lib/* lib64/ + cp -rsf ${staticUsrProfileTarget}/lib/* lib64/ && chmod u+w -R lib64/ # most 64bit only libs put their stuff into /lib # some pkgs (like gcc_multi) put 32bit libs into and /lib 64bit libs into /lib64 # by overwriting these we will hopefully catch all these cases # in the end /lib should only contain 32bit and /lib64 only 64bit libs - cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/ + cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/ # copy gcc libs (and may overwrite exitsting wrongly placed libs) cp -rsf ${chosenGcc.cc}/lib/* lib/ cp -rsf ${chosenGcc.cc}/lib64/* lib64/ ''; + setupEtc = '' + mkdir -m0755 etc + + # copy profile content + cp -rsf ${staticUsrProfileTarget}/etc/* etc/ && chmod u+w -R etc/ + [ -d ${staticUsrProfileMulti}/etc ] && cp -rsf ${staticUsrProfileMulti}/etc/* etc/ && chmod u+w -R etc/ + + # compatibility with NixOS + ln -s /host-etc/static etc/static + + # symlink some NSS stuff + ln -s /host-etc/passwd etc/passwd + ln -s /host-etc/group etc/group + ln -s /host-etc/shadow etc/shadow + ln -s /host-etc/hosts etc/hosts + ln -s /host-etc/resolv.conf etc/resolv.conf + ln -s /host-etc/nsswitch.conf etc/nsswitch.conf + + # symlink other core stuff + ln -s /host-etc/localtime etc/localtime + ln -s /host-etc/machine-id etc/machine-id + + # symlink PAM stuff + rm -rf etc/pam.d + ln -s /host-etc/pam.d etc/pam.d + + # symlink fonts stuff + rm -rf etc/fonts + ln -s /host-etc/fonts etc/fonts + + # symlink ALSA stuff + ln -s /host-etc/asound.conf etc/asound.conf + ''; + in nixpkgs.stdenv.mkDerivation { name = "${name}-fhs"; buildCommand = '' @@ -165,6 +204,7 @@ in nixpkgs.stdenv.mkDerivation { cd $out ${setupTargetProfile} ${setupMultiProfile} + ${setupEtc} cd $out ${extraBuildCommands} cd $out diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in index f3bdad85fa74..9078a31fe46a 100644 --- a/pkgs/build-support/build-fhs-chrootenv/init.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/init.sh.in @@ -8,39 +8,12 @@ mkdir -p $chrootenvDest/{nix/store,dev,proc,sys,host-etc,home,var,run} # Symlink the software that should be part of the chroot system profile for i in @chrootEnv@/* do - if [ "$i" != "@chrootEnv@/etc" ] && [ "$i" != "@chrootEnv@/var" ] + if [ "$i" != "@chrootEnv@/var" ] then ln -s "$i" "$chrootenvDest" fi done -# Symlink the contents of the chroot software's /etc - -mkdir $chrootenvDest/etc - -for i in @chrootEnv@/etc/* -do - ln -s "$i" $chrootenvDest/etc -done - -# Symlink some NSS stuff -ln -s ../host-etc/passwd $chrootenvDest/etc/passwd -ln -s ../host-etc/group $chrootenvDest/etc/group -ln -s ../host-etc/shadow $chrootenvDest/etc/shadow -ln -s ../host-etc/hosts $chrootenvDest/etc/hosts -ln -s ../host-etc/resolv.conf $chrootenvDest/etc/resolv.conf -ln -s ../host-etc/nsswitch.conf $chrootenvDest/etc/nsswitch.conf - -# Symlink PAM stuff -rm $chrootenvDest/etc/pam.d -ln -s ../host-etc/static/pam.d $chrootenvDest/etc/pam.d - -# Symlink Font stuff -mkdir -p $chrootenvDest/etc/fonts -ln -s ../../host-etc/static/fonts/fonts.conf $chrootenvDest/etc/fonts -mkdir -p $chrootenvDest/etc/fonts/conf.d -ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fonts/conf.d - # Create root folder mkdir $chrootenvDest/root diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in index 6089fa275855..99da20c34b21 100644 --- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in @@ -3,4 +3,10 @@ chrootenvDest=/run/chrootenv/@name@ # Enter the LFS chroot environment -sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login +sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i \ + TERM="$TERM" \ + DISPLAY="$DISPLAY" \ + HOME="$HOME" \ + XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" \ + LANG="$LANG" \ + /bin/bash --login diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 857ccd58cd7f..3e140fac97e2 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -17,20 +17,6 @@ mounts = [ ['/nix/store', nil], mkdirs = ['tmp', ] -# Symlinks: [from, to (dir)] -symlinks = - # /etc symlinks: [file name, prefix in host-etc] - [ ['passwd', ''], - ['group', ''], - ['shadow', ''], - ['hosts', ''], - ['resolv.conf', ''], - ['nsswitch.conf', ''], - ['pam.d', 'static'], - ['fonts/fonts.conf', 'static'], - ['fonts/conf.d/00-nixos.conf', 'static'], - ].map! { |x| [ "host-etc/#{x[1]}/#{x[0]}", "etc/#{File.dirname x[0]}" ] } - require 'tmpdir' require 'fileutils' require 'pathname' @@ -93,7 +79,11 @@ if $cpid == 0 $unshare.call CLONE_NEWNS | CLONE_NEWUSER # Map users and groups to the parent namespace - write_file '/proc/self/setgroups', 'deny' + begin + # setgroups is only available since Linux 3.19 + write_file '/proc/self/setgroups', 'deny' + rescue + end write_file '/proc/self/uid_map', "#{uid} #{uid} 1" write_file '/proc/self/gid_map', "#{gid} #{gid} 1" @@ -111,12 +101,6 @@ if $cpid == 0 Dir.chroot root Dir.chdir '/' - # Do symlinks - symlinks.each do |x| - FileUtils.mkdir_p x[1] - FileUtils.ln_s x[0], x[1] - end - # Symlink swdir hierarchy mount_dirs = Set.new mounts.map { |x| Pathname.new x[1] } link_swdir = lambda do |swdir, prefix| @@ -136,13 +120,11 @@ if $cpid == 0 link_swdir.call swdir, Pathname.new('') # New environment - oldenv = ENV.to_h - ENV.replace({ 'PS1' => oldenv['PS1'], - 'TERM' => oldenv['TERM'], - 'DISPLAY' => oldenv['DISPLAY'], - 'HOME' => oldenv['HOME'], - 'PATH' => '/bin:/sbin', - 'XDG_RUNTIME_DIR' => oldenv['XDG_RUNTIME_DIR'], + ENV.replace({ 'TERM' => ENV['TERM'], + 'DISPLAY' => ENV['DISPLAY'], + 'HOME' => ENV['HOME'], + 'XDG_RUNTIME_DIR' => ENV['XDG_RUNTIME_DIR'], + 'LANG' => ENV['LANG'], }) # Finally, exec! diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 57864b4934bb..67484857ee16 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/${name} <<EOF #! ${stdenv.shell} - exec ${chroot-user}/bin/chroot-user ${env} $out/libexec/run + exec ${chroot-user}/bin/chroot-user ${env} $out/libexec/run "\$@" EOF chmod +x $out/bin/${name} @@ -30,7 +30,7 @@ in stdenv.mkDerivation { cat > $out/libexec/run <<EOF #! ${stdenv.shell} source /etc/profile - ${runScript} + ${runScript} "\$@" EOF chmod +x $out/libexec/run ''; diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 548b19106457..e374e1656a47 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -80,8 +80,8 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then fi if [[ "@prog@" = *++ ]]; then - if echo "$@" | grep -qvw -- -nostdlib; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE" + if echo "$@" | grep -qv -- -nostdlib; then + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" fi fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ac33a0b083c2..df43da58e3ec 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -169,6 +169,12 @@ stdenv.mkDerivation { export real_cc=cc export real_cxx=c++ + export default_cxx_stdlib_compile="${ + if stdenv.isLinux && !(cc.isGNU or false) + then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" + else "" + }" + if [ -e $ccPath/gcc ]; then wrap gcc ${./cc-wrapper.sh} $ccPath/gcc ln -s gcc $out/bin/cc diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix new file mode 100644 index 000000000000..be81e93e32ae --- /dev/null +++ b/pkgs/build-support/emacs/generic.nix @@ -0,0 +1,41 @@ +# generic builder for Emacs packages + +{ lib, stdenv, emacs, texinfo }: + +with lib; + +{ pname +, version ? null + +, buildInputs ? [] +, packageRequires ? [] + +, meta ? {} + +, ... +}@args: + +let + defaultMeta = { + broken = false; + platforms = emacs.meta.platforms; + }; +in + +stdenv.mkDerivation ({ + name = "emacs-${pname}${optionalString (version != null) "-${version}"}"; + + buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs; + propagatedBuildInputs = packageRequires; + propagatedUserEnvPkgs = packageRequires; + + setupHook = ./setup-hook.sh; + + doCheck = false; + + meta = defaultMeta // meta; +} + +// removeAttrs args [ "buildInputs" "packageRequires" + "meta" + ]) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix new file mode 100644 index 000000000000..607a1b4a5ef6 --- /dev/null +++ b/pkgs/build-support/emacs/melpa.nix @@ -0,0 +1,67 @@ +# builder for Emacs packages built for packages.el +# using MELPA package-build.el + +{ lib, stdenv, fetchurl, emacs, texinfo }: + +with lib; + +{ pname +, version + +, files ? null +, fileSpecs ? [ "*.el" "*.el.in" "dir" + "*.info" "*.texi" "*.texinfo" + "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" + ] + +, meta ? {} + +, ... +}@args: + +let + + packageBuild = fetchurl { + url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; + sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; + }; + + fname = "${pname}-${version}"; + + targets = concatStringsSep " " (if files == null then fileSpecs else files); + + defaultMeta = { + homepage = "http://melpa.org/#/${pname}"; + }; + +in + +import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ + inherit packageBuild; + + buildPhase = '' + runHook preBuild + + emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ + -f melpa2nix-build-package \ + ${pname} ${version} ${targets} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ + -f melpa2nix-install-package \ + ${fname}.* $out/share/emacs/site-lisp/elpa + + runHook postInstall + ''; + + meta = defaultMeta // meta; +} + +// removeAttrs args [ "files" "fileSpecs" + "meta" + ]) diff --git a/pkgs/build-support/melpa/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index d54e9d21e25e..d54e9d21e25e 100644 --- a/pkgs/build-support/melpa/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el diff --git a/pkgs/build-support/melpa/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index defef45b55f5..defef45b55f5 100644 --- a/pkgs/build-support/melpa/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix new file mode 100644 index 000000000000..9c97e8bf9514 --- /dev/null +++ b/pkgs/build-support/emacs/trivial.nix @@ -0,0 +1,34 @@ +# trivial builder for Emacs packages + +{ lib, ... }@envargs: + +with lib; + +args: + +import ./generic.nix envargs ({ + #preConfigure = '' + # export LISPDIR=$out/share/emacs/site-lisp + # export VERSION_SPECIFIC_LISPDIR=$out/share/emacs/site-lisp + #''; + + buildPhase = '' + eval "$preBuild" + + emacs -L . --batch -f batch-byte-compile *.el + + eval "$postBuild" + ''; + + installPhase = '' + eval "$preInstall" + + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR + + eval "$postInstall" + ''; +} + +// args) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 9050cce6ee8f..71374d1f2383 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -8,6 +8,7 @@ header "exporting $url (rev $rev) into $out" $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ + ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7dd179f4c8b2..bb89a8f55329 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -11,8 +11,8 @@ else ""; in "${if matched == null then base else builtins.head matched}${appendShort}"; in -{ url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false -, fetchSubmodules ? true +{ url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone +, fetchSubmodules ? true, deepClone ? false , name ? urlToName url rev }: @@ -39,6 +39,7 @@ in */ assert md5 != "" || sha256 != ""; +assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; @@ -50,7 +51,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev leaveDotGit fetchSubmodules; + inherit url rev leaveDotGit fetchSubmodules deepClone; GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; @@ -64,4 +65,3 @@ stdenv.mkDerivation { preferLocalBuild = true; } - diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 01605b35ef32..486fd3acafb7 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -254,6 +254,7 @@ clone_user_rev() { local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1) echo "git revision is $full_revision" echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2 + echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)" # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh index 1d7d1046d367..c6bc2a7c8bf9 100644 --- a/pkgs/build-support/gcc-cross-wrapper/builder.sh +++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh @@ -109,7 +109,7 @@ chmod +x "$out/bin/$crossConfig-ld" # Emit a setup hook. Also store the path to the original GCC and # Glibc. -test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc test -n "$libc" && echo $libc > $out/nix-support/orig-libc doSubstitute "$addFlags" "$out/nix-support/add-flags" diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index c79680712ee7..59cdd3f84ad2 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -196,7 +196,7 @@ fi # Emit a setup hook. Also store the path to the original GCC and # Glibc. -test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc test -n "$libc" && echo $libc > $out/nix-support/orig-libc doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index b2bffc781b30..7bafd78d76a3 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_18 test-patch; + else mkKernel pkgs.linux_3_19 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/build-support/melpa/default.nix b/pkgs/build-support/melpa/default.nix deleted file mode 100644 index 11cb14f93db4..000000000000 --- a/pkgs/build-support/melpa/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -# generic builder for Emacs packages - -{ stdenv, fetchurl, emacs, texinfo -, extension ? (self : super : {}) -}: - -{ pname -, version -, src -, packageRequires ? [] -, extraBuildInputs ? [] - -, files ? null -, fileSpecs ? [ "*.el" "*.el.in" "dir" - "*.info" "*.texi" "*.texinfo" - "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" - ] - -, meta ? {} - -, preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" -, configureFlags ? [], preConfigure ? "", postConfigure ? "" -, buildPhase ? "", preBuild ? "", postBuild ? "" -, preInstall ? "", postInstall ? "" -, doCheck ? false, checkPhase ? "", preCheck ? "", postCheck ? "" -, preFixup ? "", postFixup ? "" -}: - -let - inherit (stdenv.lib) concatStringsSep optionalAttrs; - - packageBuild = fetchurl { - url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; - sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; - }; - - fname = "${pname}-${version}"; - - targets = concatStringsSep " " (if files == null then fileSpecs else files); - - defaultMeta = { - broken = false; - homepage = "http://melpa.org/#/${pname}"; - platforms = emacs.meta.platforms; - }; - -in - -stdenv.mkDerivation ({ - name = "emacs-${fname}"; - - inherit src packageBuild; - - buildInputs = [emacs texinfo] ++ packageRequires ++ extraBuildInputs; - propagatedBuildInputs = packageRequires; - propagatedUserEnvPkgs = packageRequires; - - setupHook = ./setup-hook.sh; - - buildPhase = '' - runHook preBuild - - emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ - -f melpa2nix-build-package \ - ${pname} ${version} ${targets} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ - -f melpa2nix-install-package \ - ${fname}.* $out/share/emacs/site-lisp/elpa - - runHook postInstall - ''; - - meta = defaultMeta // meta; -} - -// optionalAttrs (preUnpack != "") { inherit preUnpack; } -// optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } -// optionalAttrs (patches != []) { inherit patches; } -// optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (prePatch != "") { inherit prePatch; } -// optionalAttrs (postPatch != "") { inherit postPatch; } -// optionalAttrs (preConfigure != "") { inherit preConfigure; } -// optionalAttrs (postConfigure != "") { inherit postConfigure; } -// optionalAttrs (buildPhase != "") { inherit buildPhase; } -// optionalAttrs (preBuild != "") { inherit preBuild; } -// optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (doCheck) { inherit doCheck; } -// optionalAttrs (checkPhase != "") { inherit checkPhase; } -// optionalAttrs (preCheck != "") { inherit preCheck; } -// optionalAttrs (postCheck != "") { inherit postCheck; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (postInstall != "") { inherit postInstall; } -// optionalAttrs (preFixup != "") { inherit preFixup; } -// optionalAttrs (postFixup != "") { inherit postFixup; } -) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a0dca0d59fca..fc41e8ec52ed 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -423,7 +423,7 @@ rec { set +o pipefail for i in $rpms; do echo "$i..." - ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional + ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional --extract-over-symlinks done eval "$preInstall" diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 56fa9f51a474..7696632ef92b 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-3.111"; + name = "fira-4.002"; src = fetchurl { - url = "http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip"; - sha256 = "3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457"; + url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip; + sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw"; }; buildInputs = [unzip]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.carrois.com/fira-3-1/; + homepage = http://www.carrois.com/fira-4-0/; description = "Sans-serif and monospace font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index 16642d695666..53aefe9c31a2 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -1,49 +1,39 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="0.2"; - baseName="tempora-lgc"; - name="${baseName}-${version}"; - url="http://www.thessalonica.org.ru/downloads/${baseName}.otf.zip"; - hash="18n5ml2chc1bhrv43i64sz2dz1zc2dw087wcwn5l9ysqsmf0387i"; - }; +{stdenv, fetchurl}: +let + srcs = [ + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf"; + sha256 = "1yfbi62j6gjmzglxz29m6x6lxqpxghcqjjh916qn8in74ba5v0gq"; + }) + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf"; + sha256 = "0bfbl1h9h1022km2rg1zwl9lpabhnwdsvzdp0bwmf0wbm62550cp"; + }) + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf"; + sha256 = "10m9j4bvr6c4zp691wxm4hvzhph2zlfsxk1nmbsb9vn1i6vfgz04"; + }) + (fetchurl { + url = "www.ttfotf.com/download-font/tempora-lgc-unicode.otf"; + sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i"; + }) + ]; + buildInputs = [ + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + name = "tempora-lgc"; inherit buildInputs; - - phaseNames = ["doUnpack" "installFonts"]; - - doUnpack = a.fullDepEntry '' - unzip ${src} - '' ["addInputs"]; - + inherit srcs; + phases = "installPhase"; + installPhase = '' + mkdir -p "$out/share/fonts/opentype/public" + cp ${toString srcs} "$out/share/fonts/opentype/public" + ''; meta = { - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html"; - }; + description = ''Tempora font''; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; -}) x - +} diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 1cf29db9dbc6..a0c9920177d7 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.13"; + name = "hicolor-icon-theme-0.14"; src = fetchurl { - url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3"; + url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1k9fj0lb9b44inb5q5m04910x5nfkzrxl3ys9ckihqrixzk0dvbv"; }; + setupHook = ./setup-hook.sh; + meta = { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = http://icon-theme.freedesktop.org/releases/; diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh new file mode 100644 index 000000000000..05ab9b3d65df --- /dev/null +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -0,0 +1,20 @@ +# Populate XDG_ICON_DIRS +hicolorIconThemeHook() { + + # where to find icon themes + if [ -d "$1/share/icons" ]; then + addToSearchPath XDG_ICON_DIRS $1/share + fi + +} + +envHooks+=(hicolorIconThemeHook) + +# Remove icon cache +hicolorPreFixupPhase() { + rm -f $out/share/icons/hicolor/icon-theme.cache + rm -f $out/share/icons/HighContrast/icon-theme.cache +} + +preFixupPhases="$preFixupPhases hicolorPreFixupPhase" + diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix new file mode 100644 index 000000000000..b3413dc4738d --- /dev/null +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "d7e8c4cdcf"; + + package-name = "numix-icon-theme-circle"; + + name = "${package-name}-20150304"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/numixproject/${package-name}/archive/${version}.zip"; + sha256 = "672d6f4d000c4c75a64e0297f9609afab1035d082d7ab4f7abe3e2173cba9324"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ + ''; + + meta = { + description = "Numix icon theme (circle version)"; + homepage = https://numixproject.org; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix new file mode 100644 index 000000000000..d6ca570ba52c --- /dev/null +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "2c11fbfcee"; + + package-name = "numix-icon-theme"; + + name = "${package-name}-20150302"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/numixproject/${package-name}/archive/${version}.zip"; + sha256 = "61dc170b8a70b20a9075f06e1668d6bd8907a6db0ef9e3568c473296d0f351e1"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ + ''; + + meta = { + description = "Numix icon theme"; + homepage = https://numixproject.org; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix new file mode 100644 index 000000000000..3757b10754b2 --- /dev/null +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchurl +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +}: + +let version = "20061014"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ]; + + meta = with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + homepage = "http://ddccontrol.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; + }; +} diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index a8935700166a..cc676d0b35dd 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sethwklein.net/projects/iana-etc/; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 373e7504ead7..b2bfb7bd13dc 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -15,6 +15,10 @@ in buildInputs = [ udev ]; nativeBuildInputs = [ pkgconfig python3 ]; + postPatch = '' + patchShebangs ./tools + ''; + preConfigure = '' configureFlags="$configureFlags --with-udevdir=$out/lib/udev" ''; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index df3f3ec82246..1953152fdd80 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014j"; in +let version = "2015a"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52"; + sha256 = "0k4fy5x1813az0dwh82v5dhnvivfxxjin2szkgyfga00gn8r0965"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z"; + sha256 = "06fxf9yw39wcpqifxf3lr8cn64nlwznqcyhd0cs2z1c6y88snnw8"; }) ]; diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index c29a57af54a7..8eaebaf0af38 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_12 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages ''; meta = { diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index ad0ab6fe6c17..ac7577d91fd7 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "1xvcym11j4vs8djx7v70alzyhir1gw2zsm1nl5kv1pfz1kgqc8fv"; + sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm ]; + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm + libinput ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 39197cce1671..06166dd0978d 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0ajljrr72rdz9hniqvsigw7p6dmpqnf0nijrxd2x91gx2cfrwksm"; + sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 96c791d1b932..bffc2e70f59a 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg"; + sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"; }; buildInputs = [ pkgconfig e19.efl vlc ]; preConfigure = '' diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index fc910b081c49..2cccf3a0dfda 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.3"; + version = "0.19.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1myv463agfzgva7fv0y74lk5sxfpf6mxykkc37cb7dyn3cxchdan"; + sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index bc678c6aab8c..abc63e14f2a3 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5"; + sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 7b3bcbc5e401..96028311f1e8 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19 }: stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; + sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; }; buildInputs = [ pkgconfig e19.efl e19.elementary ]; preConfigure = '' @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE" ''; meta = { description = "The best terminal emulator written with the EFL"; diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix index c4d609790fa9..c4f6741c070a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/bijiben" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix index a761c13e9595..deff8494866b 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/file-roller" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix index 5979d10fa707..4783804f200a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/glade" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix index cbb53eedd4c7..7d33933656a3 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" done - rm "$out/share/icons/hicolor/icon-theme.cache" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix index 2226f314eed0..47bcbf692ad6 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-clocks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix index 5c2206641e55..642e0044a757 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix index 028ab4832eff..ebcd4c0d01ed 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix PYTHONPATH : "$PYTHONPATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix index cc92cdd3014b..4d080039a880 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix index fb7339dd05f3..02365d6b3d5a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/seahorse" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix index e4da596ae21b..4d6c91787a37 100644 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache wrapProgram "$out/bin/baobab" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix index c6ac93b10747..a10450d93328 100644 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix index 8c8a49cb7ed7..de30f0dbbe14 100644 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index aaef1d59ed98..d1ad071d426a 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/evince" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; doCheck = false; # would need pythonPackages.dogTail, which is missing diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix index 5b4ca5c34182..49bd7ac70f48 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret , bash, makeWrapper, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake114x, autoconf }: +, libsoup, vala, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { name = "gnome-contacts-3.12.0"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.gnome_icon_theme librsvg hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - vala automake114x autoconf db ]; + vala automake autoconf db ]; preFixup = '' for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index 0aed2e7a410a..4a394b3b8975 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -47,11 +47,9 @@ stdenv.mkDerivation rec { for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; - patches = [ ./search_providers_dir.patch ]; + patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; meta = with stdenv.lib; { description = "Single sign-on framework for GNOME"; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch new file mode 100644 index 000000000000..e25105a303f4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch @@ -0,0 +1,19 @@ +diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c +index 7dc23c2..fcb1384 100644 +--- a/panels/network/connection-editor/vpn-helpers.c ++++ b/panels/network/connection-editor/vpn-helpers.c +@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) + if (!so_path) + goto next; + +- /* Remove any path and extension components, then reconstruct path +- * to the SO in LIBDIR +- */ +- so_name = g_path_get_basename (so_path); +- g_free (so_path); +- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); +- g_free (so_name); +- + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!module) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix index 56bde211105e..a68624ba0e10 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-disks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix index 6a30362f5936..7b9e2097befb 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { make -C src install ''; - buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ]; + buildInputs = [ pkgconfig iconnamingutils gtk ]; + + propagatedBuildInputs = [ gnome3.gnome_icon_theme ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix index aa0c9d24dfec..34a3b67af7e4 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "gnome-icon-theme-3.12.0"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; }; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + propagatedBuildInputs = [ hicolor_icon_theme ]; + meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh deleted file mode 100644 index d7156f3d4630..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -make_gtk_applications_find_icon_themes() { - - # where to find icon themes - if [ -d "$1/share/icons" ]; then - addToSearchPath XDG_ICON_DIRS $1/share - fi - -} - -envHooks+=(make_gtk_applications_find_icon_themes) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix index cdc4b732b97e..9abeda537447 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-system-log" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix index 976b0eaca45b..fde47a66340b 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-user-share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix index 490947519832..9c2db40f89d3 100644 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index 0d5cc4d14279..13ea6bb391cf 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower , pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection -, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf +, bash, makeWrapper, itstool, vala, sqlite, automake, autoconf , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler, libtool , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser gobjectIntrospection - automake114x autoconf libtool + automake autoconf libtool gnome3.gsettings_desktop_schemas makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix index 401d5cf2f36a..37e1975fd57b 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache rm $out/share/gitg/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index 2b8e5d313cc7..f11a139aec72 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }: let branch = "4.14"; @@ -27,6 +27,8 @@ kde.modules // kde.individual // { inherit (kde) manifest modules individual splittedModuleList; + inherit kdelibs; + akonadi = callPackage ./support/akonadi { }; qt4 = qt48; diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index d29840735abc..74d520415f35 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -48,7 +48,6 @@ hashes=builtins.listToAttrs[ {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";} {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";} {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";} - {name="kdelibs";value="17pxihhcbinr3jpwvi1iwfnqs2wiqh0jgf1is05yz13122hns87q";} {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";} {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";} {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";} diff --git a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix deleted file mode 100644 index 52e0ebf2062d..000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ kde, gcc, cmake, perl -, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi -, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver -, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee -, docbook_xml_dtd_42, docbook_xsl, polkit_qt4, acl, attr, libXtst -, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt -, pkgconfig -}: - -kde { - -# TODO: media-player-info - - buildInputs = - [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq - libdbusmenu_qt libXScrnSaver polkit_qt4 qca2 acl jasper libxslt - shared_desktop_ontologies xz udev libjpeg kerberos openexr - libXtst attr - ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - - propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; - - # TODO: make sonnet plugins (dictionaries) really work. - # There are a few hardcoded paths. - # Split plugins from libs? - - patches = [ - ../files/polkit-install.patch - ]; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" - "-DWITH_SOLID_UDISKS2=ON" - ]; - - passthru.wantsUdisks2 = true; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 2384d926fc48..dfaafa06a77a 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -108,7 +108,7 @@ let kwin = with pkgs; super.kwin // { buildInputs = with xlibs; super.kwin.buildInputs ++ [ libICE libSM libXcursor ]; - patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ./kwin/libinput-0.8.patch ]; + patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; }; libkscreen = with pkgs; super.libkscreen // { @@ -132,6 +132,10 @@ let plasma-workspace = with pkgs; super.plasma-workspace // { buildInputs = with xlibs; super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; + postPatch = '' + substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ + --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + ''; postInstall = '' # We use a custom startkde script rm $out/bin/startkde diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix index fe0b72c0daa2..e96a5afbdbc1 100644 --- a/pkgs/desktops/plasma-5.2/dependencies.nix +++ b/pkgs/desktops/plasma-5.2/dependencies.nix @@ -241,6 +241,14 @@ propagatedUserEnvPkgs = [ ]; }; + plasma-workspace-wallpaper = { + buildInputs = [ "ECM" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + plasma-workspace-wallpapers = { buildInputs = [ "ECM" ]; nativeBuildInputs = [ "cmake" ]; diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix index 23bfa7867bee..154c1aa98fd1 100644 --- a/pkgs/desktops/plasma-5.2/manifest.nix +++ b/pkgs/desktops/plasma-5.2/manifest.nix @@ -325,4 +325,328 @@ name = "kwin-5.2.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kio-extras-5.2.1.tar.xz" ".tar"; + store = "/nix/store/79invr6hmjir390chxkbqwijfl47sn44-kio-extras-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kio-extras-5.2.1.tar.xz"; + sha256 = "0b410hrwpanshvnr3qsgcpza142d178nr3hsgb0r0ssfh0wycmm8"; + name = "kio-extras-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.1.tar.xz" ".tar"; + store = "/nix/store/wp46hfmfna4343jryqnxgkx0i73w206m-kde-gtk-config-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kde-gtk-config-5.2.1.tar.xz"; + sha256 = "0d1ll4wx1wr14rczjmzxpfiwp67i0ljn172c9w8vhvrv7gy579vw"; + name = "kde-gtk-config-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-5.2.1.tar.xz" ".tar"; + store = "/nix/store/qsi6ridvxykn2qpdq6h8s85dcnn04l1a-oxygen-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/oxygen-5.2.1.tar.xz"; + sha256 = "1aj9y24ii51av8ydkk07nj666xk6igqkqqhlcpcc513qy87l041l"; + name = "oxygen-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khotkeys-5.2.1.tar.xz" ".tar"; + store = "/nix/store/98gn6w9nnzl0901dgs7kzm9j5kgf9i75-khotkeys-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/khotkeys-5.2.1.tar.xz"; + sha256 = "012hnykqwx4asmbsd84kqzrq90bwkpryh7nribpsc99kwlngdgsn"; + name = "khotkeys-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-desktop-5.2.1.tar.xz" ".tar"; + store = "/nix/store/ndkx7f2agaxdgn0l8yz9p3a0ahkhbyy8-plasma-desktop-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-desktop-5.2.1.tar.xz"; + sha256 = "08pjyvb8lzjd0pmc72k8c6jcgprzq0g8psd5vhmvw614j9pz1a5d"; + name = "plasma-desktop-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "baloo-5.6.1.tar.xz" ".tar"; + store = "/nix/store/qjcgng89qgribr5np0vrvj86jvvprsg4-baloo-5.6.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/baloo-5.6.1.tar.xz"; + sha256 = "1agf2vqkx9hb95di99c65752q9wjnyhkz1iwwvyk1n1a7jzvdqf2"; + name = "baloo-5.6.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sddm-kcm-5.2.1.tar.xz" ".tar"; + store = "/nix/store/g5lazmji9vlyiqkl6sj8h6i0yzdgnx1k-sddm-kcm-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/sddm-kcm-5.2.1.tar.xz"; + sha256 = "0jjis582j1rk8ss64ys94izsg29sik0khv3czzw5zjqns22kn2r3"; + name = "sddm-kcm-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "powerdevil-5.2.1.tar.xz" ".tar"; + store = "/nix/store/dv4cbwkmvpinz0v3s9y6p0ifci0q5fh0-powerdevil-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/powerdevil-5.2.1.tar.xz"; + sha256 = "147hpzwmw0vxysp7wv0fhmrgaw1aclap70ii7i5pz05k093xngfm"; + name = "powerdevil-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-workspace-wallpaper-5.2.1.tar.xz" ".tar"; + store = "/nix/store/mfchg5yspiyzvhhp5qh6j3zwfnwpca70-plasma-workspace-wallpaper-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpaper-5.2.1.tar.xz"; + sha256 = "0cr6s3rs2gz8cq93q7l2w2g0ibzqqlyh0v1nkzhpyxqq0vggjliw"; + name = "plasma-workspace-wallpaper-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libbluedevil-5.2.1.tar.xz" ".tar"; + store = "/nix/store/iwiksm38d0ywn3x4rvcfjiynknxmy628-libbluedevil-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libbluedevil-5.2.1.tar.xz"; + sha256 = "1wqk03pxl2bzy4f77fy1zwlrlv3k96x9xz8qnavkir9j0i3ijndp"; + name = "libbluedevil-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfilemetadata-5.6.1.tar.xz" ".tar"; + store = "/nix/store/m3f02ph2gqj8zw3p1kq86ih6m423i670-kfilemetadata-5.6.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kfilemetadata-5.6.1.tar.xz"; + sha256 = "0w6dzhng4wp4mrxnq6859np6j3h9iydj4dscp1qr3zc0y377blw3"; + name = "kfilemetadata-5.6.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "milou-5.2.1.tar.xz" ".tar"; + store = "/nix/store/f5979rdy20yxjbh9qif3wf7sylhdfr5i-milou-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/milou-5.2.1.tar.xz"; + sha256 = "1q5bfw7wbgq3gz5r3sdvx7rmsf4cbj501cy1asl6bf1grshjqiyn"; + name = "milou-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksysguard-5.2.1.tar.xz" ".tar"; + store = "/nix/store/6llw96fvpb79s3482w0v3ahb6qzn8czi-ksysguard-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/ksysguard-5.2.1.tar.xz"; + sha256 = "06sr86siw43ly1c8iqjd672szxxjqxl6n8gnxmf92h3qqh1i8a2k"; + name = "ksysguard-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmenuedit-5.2.1.tar.xz" ".tar"; + store = "/nix/store/fka4bg5h2hz93knjv2kqvz62dg5pk805-kmenuedit-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kmenuedit-5.2.1.tar.xz"; + sha256 = "0kpfxgm8jfm2lyf7wxmnnl9flligmds8f6fy1cy36fqxpzhcal98"; + name = "kmenuedit-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "systemsettings-5.2.1.tar.xz" ".tar"; + store = "/nix/store/942knn924cz51wwn3jimhcp799zlc7c8-systemsettings-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/systemsettings-5.2.1.tar.xz"; + sha256 = "0ib84irgdbjd3sga7csjx59c2wxg34yr3j9a8ajhqvdq34yb14n4"; + name = "systemsettings-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "muon-5.2.1.tar.xz" ".tar"; + store = "/nix/store/fvq7swhq8343kr70vjsl11bv1c3ayw3k-muon-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/muon-5.2.1.tar.xz"; + sha256 = "115a7q2ns0h6lszn1lq84y5bk02fm4ly3alxkig7976jh8rbykxf"; + name = "muon-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-nm-5.2.1.tar.xz" ".tar"; + store = "/nix/store/igw2v8zgczarw9ynxf473mfl76y6wd4j-plasma-nm-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-nm-5.2.1.tar.xz"; + sha256 = "1c4gkxv24kdl2b5gslljihwh5h0v970f70802swblgrp87819bfj"; + name = "plasma-nm-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksysguard-5.2.1.tar.xz" ".tar"; + store = "/nix/store/zkrwgpjsa2761wpmic225szjs4503kss-libksysguard-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libksysguard-5.2.1.tar.xz"; + sha256 = "0f0s3hafdvgvscfbvkkdll95rzxa44j89qm7cmsclaqclmnwcfa2"; + name = "libksysguard-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.1.tar.xz" ".tar"; + store = "/nix/store/gsni5ny5qx2j1vic0q1pa0xb0126x2z0-polkit-kde-agent-1-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/polkit-kde-agent-1-5.2.1.tar.xz"; + sha256 = "0scmsiwwmmz1by8yzh5waa8ngp13hk7yihxh0bf0mfph8zkv3jf4"; + name = "polkit-kde-agent-1-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwin-5.2.1.tar.xz" ".tar"; + store = "/nix/store/n8bydi50mqc41sxh95v1zyncfh157am1-kwin-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kwin-5.2.1.tar.xz"; + sha256 = "1cp7rak0y7jjizj9ampx2wcvra0kffxjs7grd2j57s4qy3z9az6i"; + name = "kwin-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.1.tar.xz" ".tar"; + store = "/nix/store/cmrfclyx47g0byimi9fk2vgc92mi8vjd-plasma-workspace-wallpapers-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpapers-5.2.1.tar.xz"; + sha256 = "0dhbwygbxzjxzklcrqa2429k1harl9gz33l9183bz3q62iwcxf0x"; + name = "plasma-workspace-wallpapers-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bluedevil-5.2.1.tar.xz" ".tar"; + store = "/nix/store/5mj21ln4sm2i32xbhzbadjhgxhig0fjs-bluedevil-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/bluedevil-5.2.1.tar.xz"; + sha256 = "1jahp2a8v4hmar8qfiw04miiih5br5s3jpkqlqmmpc56vn1czx6m"; + name = "bluedevil-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinfocenter-5.2.1.tar.xz" ".tar"; + store = "/nix/store/cww4i8a48yhm0mddak67lqy9lld20wy3-kinfocenter-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kinfocenter-5.2.1.tar.xz"; + sha256 = "141mkk1gnhmnxxk0j1mn4p5zzwyjkbbwmwbpqq2adaar18p917i8"; + name = "kinfocenter-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscreen-5.2.1.tar.xz" ".tar"; + store = "/nix/store/h65gaypalzzqfgq3vcc495cdan9k4p5v-kscreen-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kscreen-5.2.1.tar.xz"; + sha256 = "164vwvqrvzjczg2nbi9wkpnk8yki240iz2h5j50n5gkqvgg0w7df"; + name = "kscreen-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.1.tar.xz" ".tar"; + store = "/nix/store/hlcr09wkzjs62vwawsi9d611n0gxrixp-oxygen-fonts-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/oxygen-fonts-5.2.1.tar.xz"; + sha256 = "0xnhh135yihmv40imd3mibwzcfdxgbn1mk4rjrsj5fqni113f0lm"; + name = "oxygen-fonts-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkscreen-5.2.1.tar.xz" ".tar"; + store = "/nix/store/6xs5v03w12rmqpz235sk9scxap51s2db-libkscreen-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libkscreen-5.2.1.tar.xz"; + sha256 = "0i7vm73gs1f715fnmacrdnvk1hij03d72fr70wwa3x18cdcg4qas"; + name = "libkscreen-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "breeze-5.2.1.tar.xz" ".tar"; + store = "/nix/store/8sr3b4ah8ds74wgfna9zcnq6vm5s3kn3-breeze-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/breeze-5.2.1.tar.xz"; + sha256 = "0qdps15mr897s2pcjdci4nyg81n3j90ksz7jybqfkd0gr9l14iy5"; + name = "breeze-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libmm-qt-5.2.1.tar.xz" ".tar"; + store = "/nix/store/cgj3wzm22izb1hvbx3wdd18zw3wswgil-libmm-qt-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libmm-qt-5.2.1.tar.xz"; + sha256 = "0n3q4bgj4ijrx7hdrnbbhxfnw4w97vgj5ba341qwf89hkhc4dhwn"; + name = "libmm-qt-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwrited-5.2.1.tar.xz" ".tar"; + store = "/nix/store/l3swq17a373a0z131mvqn4xa0nwsvjp5-kwrited-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kwrited-5.2.1.tar.xz"; + sha256 = "006y89c7pxzc55lrkjrvyrywj4j95641n3j0b5vjr2mgxcnv8q7a"; + name = "kwrited-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.1.tar.xz" ".tar"; + store = "/nix/store/06vk8iv3k4xb96rghh6jva6zj8q9a7ha-kdeplasma-addons-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kdeplasma-addons-5.2.1.tar.xz"; + sha256 = "1lfb6f5h1qjbl0zyqw5q98b27hw16lszyk1nacgncp3ig1y177r3"; + name = "kdeplasma-addons-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksshaskpass-5.2.1.tar.xz" ".tar"; + store = "/nix/store/fydms9jaal65yga60hngnz7hmz268wi2-ksshaskpass-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/ksshaskpass-5.2.1.tar.xz"; + sha256 = "18wa7naxv7g7zrrkrbh9iljd4h479cq6xmair5iqc0cbbfw7znm0"; + name = "ksshaskpass-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.1.tar.xz" ".tar"; + store = "/nix/store/1rm663f8mdif77m0wrkib534yskj0g6n-kde-cli-tools-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kde-cli-tools-5.2.1.tar.xz"; + sha256 = "0zxrn1j4lmlj0s6j5245sd0ykg9wa93i0d8qzca4rjxn5mh87v9q"; + name = "kde-cli-tools-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdecoration-5.2.1.tar.xz" ".tar"; + store = "/nix/store/06pjfn5j8lwbd7dj808mjs2bsfwbc3hr-kdecoration-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kdecoration-5.2.1.tar.xz"; + sha256 = "0910hgh64xbap213sjj1bbxwmibi74chdyyp2qc149f5anqs3fcy"; + name = "kdecoration-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwayland-5.2.1.tar.xz" ".tar"; + store = "/nix/store/03np6kr81s99j3ijzq236ywc8nkxpy0j-kwayland-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kwayland-5.2.1.tar.xz"; + sha256 = "1c7h9csiam65jkrlg81iqi9y7q3mf63af87zkf6nfalbmz6j0p8l"; + name = "kwayland-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khelpcenter-5.2.1.tar.xz" ".tar"; + store = "/nix/store/2ws6508gv1m375l4xcyf6pa8q5c26748-khelpcenter-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/khelpcenter-5.2.1.tar.xz"; + sha256 = "17sl0va35p420s8lmyz1pzyhzmrssvakc3w06xjj7f6hvgh8iqxw"; + name = "khelpcenter-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-workspace-5.2.1.tar.xz" ".tar"; + store = "/nix/store/04b1cp5432y80dl8a55xy4nvw586f33c-plasma-workspace-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-5.2.1.tar.xz"; + sha256 = "0ldls1q5f88imc4cvxizssizswfgalh9ix95ab7p5f6ylizagp63"; + name = "plasma-workspace-5.2.1.tar.xz"; + }; + } ] diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh index 6d0b6ef14525..9b76cca08406 100755 --- a/pkgs/desktops/plasma-5.2/manifest.sh +++ b/pkgs/desktops/plasma-5.2/manifest.sh @@ -6,6 +6,7 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ http://download.kde.org/stable/plasma/5.2.0/ \ + http://download.kde.org/stable/plasma/5.2.1/ \ -A '*.tar.xz' else diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.2/startkde/startkde.in index ff67ed769e2a..0693f1027817 100644 --- a/pkgs/desktops/plasma-5.2/startkde/startkde.in +++ b/pkgs/desktops/plasma-5.2/startkde/startkde.in @@ -63,15 +63,8 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else - # This is the default - # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html - configDir=${HOME}/.config; -fi - -mkdir -p $configDir +configDir=$(@qt5@/bin/qtpaths --writable-path GenericConfigLocation) +mkdir -p "$configDir" # This is basically setting defaults so we can use them with kstartupconfig5 cat @startupconfigkeys@ >$configDir/startupconfigkeys @@ -177,8 +170,7 @@ fi # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. -# TODO: Use GenericConfigLocation once we depend on Qt 5.4 -scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'` +scriptpath=$(@qt5@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') # Add /env/ to the directory to locate the scripts to be sourced for prefix in `echo $scriptpath`; do diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 1e1ef0cf8468..4d6ac29f53d5 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4 -, gtk, gtksourceview, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util +, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }: stdenv.mkDerivation rec { p_name = "mousepad"; - ver_maj = "0.3"; + ver_maj = "0.4"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; + sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libxfce4util libxfcegui4 - gtk gtksourceview dbus dbus_glib + [ pkgconfig intltool libxfce4util + gtk gtksourceview dbus dbus_glib makeWrapper ]; - # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax - # highlighting (in fact Mousepad segfaults without it). - propagatedUserEnvPkgs = [ gtksourceview ]; + preFixup = '' + wrapProgram "$out/bin/mousepad" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" + ''; meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index de7fe5975947..b38b97b90438 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 694db49f589e..7588616ac1f0 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "exo"; ver_maj = "0.10"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; + sha256 = "1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 44f5a95224e4..8f8cfff76cd4 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }: stdenv.mkDerivation rec { p_name = "garcon"; - ver_maj = "0.2"; - ver_min = "1"; + ver_maj = "0.4"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1xq14wayk07cil04yhrdkjhacz9dbldcl9i59sbrgrgznaw49dj8"; + sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib libxfce4util ]; + buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 360e4a0a2503..b66faf2390b9 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, enableGtk3Support ? false, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk }: stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; - ver_maj = "3.0"; + ver_maj = "2.10"; ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb"; + sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: gtk3 - buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk3; + buildInputs = [ pkgconfig intltool gtk ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index cb2975d8214f..1739cfbb87a2 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "libxfce4ui"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; + sha256 = "11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 8483aec7a46f..6893d7cfb20b 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "libxfce4util"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78"; + sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic utility non-GUI functions for Xfce"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 5ce88921fa83..b53ee4c45c55 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { p_name = "thunar-volman"; ver_maj = "0.8"; - ver_min = "0"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; + sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + buildInputs = [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index fdf4211f099a..abcfd656c502 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { p_name = "thunar"; ver_maj = "1.6"; - ver_min = "3"; + ver_min = "6"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; - sha256 = "17api7nc3h93k2mzrfmw6ygc0fqmg78ja0qbkzd9rhhsi3v0c9ws"; + sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index fab6152c99a4..1fc895ea412a 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -4,11 +4,11 @@ libgsf, poppler, bzip2 }: stdenv.mkDerivation rec { p_name = "tumbler"; ver_maj = "0.1"; - ver_min = "30"; + ver_min = "31"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7"; + sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index 01848d66696a..25bd04f9ec40 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-appfinder"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5"; + sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index 671f57faeb35..5541011a5019 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-dev-tools"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y1byfjciqhxqfxbjfp22bn5lxk3a01ng7zfjha8h5mzzfxlk5pp"; + sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 7fa8862ea3be..5a8cc9dc0e52 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-panel"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1mkmhhmy70izja6d6di65hay9ybqi8615pwjbx0lgqk53gnm4c2p"; + sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 2a1e772e4a5e..c75eb787757d 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; - ver_maj = "1.3"; - ver_min = "2"; + ver_maj = "1.4"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0lv29ycws185qr89xn01vcddkvpddk7q6hni0s6d0nqvjavycg0j"; + sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index ac268184ded5..0f2c30befb78 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -6,23 +6,15 @@ stdenv.mkDerivation rec { p_name = "xfce4-session"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "10zwki7v55a325abr57wczcb5g7ml99cqk1p8ls8qycqqfyzlm01"; + sha256 = "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - patches = [(fetchpatch { - name = "suspend+hibernate-via-logind.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch" - + "?h=packages/xfce4-session&id=f84637fa2b"; - sha256 = "1pnm1w9invyxjdbfm7p0brf9krl9jy8ab2ilwvizymp5i0vnj0xc"; - })]; - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch index 51ac265dcb1f..2683b3c3dfdd 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch +++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch @@ -1,12 +1,11 @@ -diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml ---- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml 2013-05-05 18:12:54.000000000 +0200 -+++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml 2013-08-15 15:57:48.538586286 +0200 +--- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100 ++++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100 @@ -7,7 +7,7 @@ <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> <property name="ThemeName" type="empty"/> - <property name="IconThemeName" type="empty"/> + <property name="IconThemeName" type="string" value="Rodent"/> - <property name="DoubleClickTime" type="int" value="250"/> + <property name="DoubleClickTime" type="int" value="400"/> <property name="DoubleClickDistance" type="int" value="5"/> - <property name="DndDragThreshold" type="int" value="8"/> + <property name="DndDragThreshold" type="int" value="8"/> \ No newline at end of file diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index ee5ae15fca1a..4c2de64561d5 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }: +, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }: #TODO: optional packages stdenv.mkDerivation rec { p_name = "xfce4-settings"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi"; + sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./xfce4-settings-default-icon-theme.patch ]; buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade + [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon - #gtk libxfce4util libxfcegui4 libwnck dbus_glib - #xfconf libglade xorg.iceauth ]; configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 9ed2be4a7402..f12f96895cd9 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfconf"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; + sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 6353f6d6c330..45a89b93748d 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; - ver_maj = "4.10"; - ver_min = "3"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kkj6axcbj82v3n2hkzsdranpqrxaarnyjxkpfs29dyqajjjpjh9"; + sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index 4b190889c850..7e4c57ad9415 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { p_name = "xfwm4"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0h57gwjs3j5f8ly0gmhl620338fg4qvlzs8gpqs9wxzblvxl831q"; + sha256 = "0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: kde systray, docs buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf libwnck libstartup_notification diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index d769072acb74..459158a136ac 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,4 +1,6 @@ -{ config, pkgs, newScope }: let +{ config, pkgs, newScope }: + +let callPackage = newScope (deps // xfce_self); diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index f2a8ef4d9eae..072da2bc5768 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-cpufreq-plugin"; - ver_maj = "1.0"; - ver_min = "0"; + ver_maj = "1.1"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; + sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index ad9c45820af2..7aca910b8a82 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index ede0495b8de5..3be77ab77caa 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Dictionary plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 8e402edbeb6a..eba05af69c05 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index e73ad9256308..603a68cc5f67 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-verve-plugin"; ver_maj = "1.0"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "18zi8lam82xwjm5zdnilg3ffxpp5z8vjad3kjvdsyxdhsdza84fh"; + sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index 18fe0ffe2046..002f34daa13b 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats-${version}"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6"; + sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; }; # this is necessary because atxt files usually include some .hats files diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 18f23416e802..43ac75271bea 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.4"; + version = "0.1.9"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "174kxdvdgp2rlb0qq7d854n6m9gzy0g8annk3bmbqb23m36n2g39"; + sha256 = "0zcki97zj9r1dvlfriwfckp9b9z7iavw09q21v6i5ld90hw9588q"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index a1eec63af561..3b9d4d391188 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -5,9 +5,9 @@ let platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" - else if isBSD then "bsd" + else if (isFreeBSD || isOpenBSD) then "bsd" else if isSunOS then "solaris" - else "linux"; # Should be a sane default + else "linux"; # Should be a sane default lib = stdenv.lib; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index aea58867a447..b42261638650 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \ --force-rpath \ '{}' \; || true ''; diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index 558034721efe..49a52fe5d32e 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \ --force-rpath \ '{}' \; || true ''; diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix new file mode 100644 index 000000000000..17156cd06647 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/6.5.nix @@ -0,0 +1,65 @@ +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib +}: + +let version = "6.5.19"; in + +stdenv.mkDerivation rec { + name = "cudatoolkit-${version}"; + + dontPatchELF = true; + dontStrip = true; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${version}_linux_64.run"; + sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; + } + else throw "cudatoolkit does not support platform ${stdenv.system}"; + + outputs = [ "out" "sdk" ]; + + buildInputs = [ perl ]; + + runtimeDependencies = [ + ncurses expat python zlib + xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + gtk2 glib fontconfig freetype unixODBC alsaLib + ]; + + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64"; + + unpackPhase = '' + sh $src --keep --noexec + cd pkg/run_files + sh cuda-linux64-rel-${version}-*.run --keep --noexec + sh cuda-samples-linux-${version}-*.run --keep --noexec + cd pkg + ''; + + buildPhase = '' + find . -type f -executable -exec patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + '{}' \; || true + find . -type f -exec patchelf \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \ + --force-rpath \ + '{}' \; || true + ''; + + installPhase = '' + mkdir $out $sdk + perl ./install-linux.pl --prefix="$out" + rm $out/tools/CUDA_Occupancy_Calculator.xls + perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include + ''; + + setupHook = ./setup-hook.sh; + + meta = { + license = lib.licenses.unfree; + }; +} + diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index d2c26487c0f4..be65061c544c 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="13.5.1"; + version="15.3.7"; name="${baseName}-${version}"; - hash="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; - url="mirror://sourceforge/project/ecls/ecls/13.5/ecl-13.5.1.tgz"; - sha256="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; + hash="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; + url="mirror://sourceforge/project/ecls/ecls/15.3/ecl-15.3.7.tgz"; + sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; }; buildInputs = [ libffi diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 02747d90567b..7de8a140c0ab 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -475,7 +475,7 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; }; + { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; isGNU = true; }; inherit enableParallelBuilding; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 3c5a52c0c403..ee7ca20ddf7f 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -5,16 +5,14 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; - homepage = "http://haskell.org/ghc"; - src = fetchurl { - url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; buildInputs = [ghc libedit perl gmp]; - configureFlags=[ + configureFlags = [ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" "--with-gcc=${stdenv.cc}/bin/gcc" @@ -23,38 +21,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; meta = { - inherit homepage; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; inherit (ghc.meta) license platforms; }; - - passthru = { - corePackages = [ - [ "Cabal" "1.6.0.3" ] - [ "array" "0.2.0.0" ] - [ "base" "3.0.3.1" ] - [ "base" "4.1.0.0" ] - [ "bytestring" "0.9.1.4" ] - [ "containers" "0.2.0.1" ] - [ "directory" "1.0.0.3" ] - [ "extensible-exceptions" "0.1.1.0" ] - [ "filepath" "1.1.0.2" ] - [ "ghc" "6.10.4" ] - [ "ghc-prim" "0.1.0.0" ] - [ "haddock" "2.4.2" ] - [ "haskell98" "1.0.1.0" ] - [ "hpc" "0.5.0.3" ] - [ "integer" "0.1.0.1" ] - [ "old-locale" "1.0.0.1" ] - [ "old-time" "1.0.0.2" ] - [ "packedstring" "0.1.0.1" ] - [ "pretty" "1.0.1.0" ] - [ "process" "1.0.1.1" ] - [ "random" "1.0.0.1" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.1" ] - [ "template-haskell" "2.3.0.1" ] - [ "unix" "2.3.2.0" ] - ]; - }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 05eff1b5d908..2364fe1d5b9f 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "${buildMK}" > mk/build.mk ''; - configureFlags=[ + configureFlags = [ "--with-gcc=${stdenv.cc}/bin/gcc" ]; @@ -36,50 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; - - # TODO: requires a comment as to what it does and why it is needed. - passthru = { - corePackages = [ - [ "Cabal" "1.8.0.2" ] - [ "array" "0.3.0.0" ] - [ "base" "3.0.3.2" ] - [ "base" "4.2.0.0" ] - [ "bin-package-db" "0.0.0.0" ] - [ "bytestring" "0.9.1.5" ] - [ "containers" "0.3.0.0" ] - [ "directory" "1.0.1.0" ] - [ "dph-base" "0.4.0" ] - [ "dph-par" "0.4.0" ] - [ "dph-prim-interface" "0.4.0" ] - [ "dph-prim-par" "0.4.0" ] - [ "dph-prim-seq" "0.4.0" ] - [ "dph-seq" "0.4.0" ] - [ "extensible-exceptions" "0.1.1.1" ] - [ "ffi" "1.0" ] - [ "filepath" "1.1.0.3" ] - [ "ghc" "6.12.1" ] - [ "ghc-binary" "0.5.0.2" ] - [ "ghc-prim" "0.2.0.0" ] - [ "haskell98" "1.0.1.1" ] - [ "hpc" "0.5.0.4" ] - [ "integer-gmp" "0.2.0.0" ] - [ "old-locale" "1.0.0.2" ] - [ "old-time" "1.0.0.3" ] - [ "pretty" "1.0.1.1" ] - [ "process" "1.0.1.2" ] - [ "random" "1.0.0.2" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.2" ] - [ "template-haskell" "2.4.0.0" ] - [ "time" "1.1.4" ] - [ "unix" "2.4.0.0" ] - [ "utf8-string" "0.3.4" ] - ]; - }; } diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 47888679f246..09d89b80f34b 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150123"; + version = "7.10.0.20150316"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/${name}-src.tar.xz"; - sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn"; + url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; + sha256 = "0cqazqf90rsp2nl7pk46gki7lln9jks0h166i0bd1qsp5gc1xv13"; }; buildInputs = [ ghc perl ]; diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index e9e1e1eafd03..c4000fc86c25 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0363855977f7..4cde21dbcc2a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,6 +7,7 @@ let libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index b8e3c172739a..a209e392bc6f 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { set +e for a in $out/bin/* ; do patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib $a + --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a done set -e mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 9acb399aa1b4..371496250056 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }: +{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }: let loader386 = "${glibc}/lib/ld-linux.so.2"; @@ -6,8 +6,8 @@ let loaderArm = "${glibc}/lib/ld-linux.so.3"; srcs = { golang = fetchurl { - url = https://github.com/golang/go/archive/go1.4.1.tar.gz; - sha256 = "1q21i08nymy30vszbcah8l8yjxm32x2wmjs44kn2x2r4556y1mgi"; + url = https://github.com/golang/go/archive/go1.4.2.tar.gz; + sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac"; }; tools = fetchgit { url = https://github.com/golang/tools.git; @@ -18,12 +18,14 @@ let in stdenv.mkDerivation { - name = "go-1.4.1"; + name = "go-1.4.2"; src = srcs.golang; # perl is used for testing go vet - buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ; + buildInputs = [ bison bash makeWrapper perl ] + ++ lib.optionals stdenv.isLinux [ glibc ] + ++ lib.optionals stdenv.isDarwin [ Security ]; # I'm not sure what go wants from its 'src', but the go installation manual # describes an installation keeping the src. @@ -76,10 +78,13 @@ stdenv.mkDerivation { else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = if stdenv.isDarwin then 0 else 1; + CGO_ENABLED = 1; + + # The go build actually checks for CC=*/clang and does something different, so we don't + # just want the generic `cc` here. + CC = if stdenv.isDarwin then "clang" else "cc"; installPhase = '' - export CC=cc mkdir -p "$out/bin" export GOROOT="$(pwd)/" export GOBIN="$out/bin" diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 3173b8922612..8e6828bce468 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml ''; + patches = [ ./haxelib-nix.patch ]; + buildFlags = [ "all" "tools" ]; installPhase = '' @@ -26,6 +28,8 @@ stdenv.mkDerivation { cp -vr std "$out/lib/haxe" ''; + setupHook = ./setup-hook.sh; + dontStrip = true; meta = { diff --git a/pkgs/development/compilers/haxe/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch new file mode 100644 index 000000000000..da7e4c8dacb8 --- /dev/null +++ b/pkgs/development/compilers/haxe/haxelib-nix.patch @@ -0,0 +1,126 @@ +diff --git a/extra/haxelib_src/src/tools/haxelib/Main.hx b/extra/haxelib_src/src/tools/haxelib/Main.hx +index a44a785..0eb811a 100644 +--- a/extra/haxelib_src/src/tools/haxelib/Main.hx ++++ b/extra/haxelib_src/src/tools/haxelib/Main.hx +@@ -996,21 +996,26 @@ class Main { + } + + function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) { +- var pdir = getRepository() + Data.safe(prj); +- if( !FileSystem.exists(pdir) ) +- throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; +- var version = if( version != null ) version else getCurrent(pdir); +- var vdir = pdir + "/" + Data.safe(version); +- if( vdir.endsWith("dev") ) +- vdir = getDev(pdir); +- if( !FileSystem.exists(vdir) ) +- throw "Library "+prj+" version "+version+" is not installed"; +- for( p in l ) +- if( p.project == prj ) { +- if( p.version == version ) +- return; +- throw "Library "+prj+" has two version included "+version+" and "+p.version; +- } ++ var vdir = this.getNixLib(prj); ++ if (vdir == null) { ++ var pdir = getRepository() + Data.safe(prj); ++ if( !FileSystem.exists(pdir) ) ++ throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; ++ var version = if( version != null ) version else getCurrent(pdir); ++ var vdir = pdir + "/" + Data.safe(version); ++ if( vdir.endsWith("dev") ) ++ vdir = getDev(pdir); ++ if( !FileSystem.exists(vdir) ) ++ throw "Library "+prj+" version "+version+" is not installed"; ++ for( p in l ) ++ if( p.project == prj ) { ++ if( p.version == version ) ++ return; ++ throw "Library "+prj+" has two version included "+version+" and "+p.version; ++ } ++ } else { ++ version = null; ++ } + var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null; + var inf = Data.readData(json,false); + l.add({ project : prj, version : version, info: inf }); +@@ -1025,15 +1030,21 @@ class Main { + var a = args[argcur++].split(":"); + checkRec(a[0],a[1],list); + } +- var rep = getRepository(); + for( d in list ) { +- var pdir = Data.safe(d.project)+"/"+Data.safe(d.version)+"/"; +- var dir = rep + pdir; +- try { +- dir = getDev(rep+Data.safe(d.project)); ++ var dir = this.getNixLib(d.project); ++ var pdir = Data.safe(d.project)+"/"; ++ if (dir == null) { ++ var rep = getRepository(); ++ pdir += Data.safe(d.version)+"/"; ++ dir = rep + pdir; ++ try { ++ dir = getDev(rep+Data.safe(d.project)); ++ dir = Path.addTrailingSlash(dir); ++ pdir = dir; ++ } catch( e : Dynamic ) {} ++ } else { + dir = Path.addTrailingSlash(dir); +- pdir = dir; +- } catch( e : Dynamic ) {} ++ } + var ndir = dir + "ndll"; + if( FileSystem.exists(ndir) ) { + var sysdir = ndir+"/"+Sys.systemName(); +@@ -1153,21 +1164,39 @@ class Main { + print(' Path: $devPath'); + } + ++ function getNixLib(project:String):Null<String> ++ { ++ var hlibPath = Sys.getEnv("HAXELIB_PATH"); ++ if (hlibPath != null) { ++ for (libDir in hlibPath.split(":")) { ++ var fullpath = libDir; ++ fullpath += libDir.substr(-1, 1) == "/" ? "" : "/"; ++ fullpath += Data.safe(project); ++ if (FileSystem.exists(fullpath)) ++ return fullpath; ++ } ++ } ++ return null; ++ } ++ + function run() { +- var rep = getRepository(); + var project = param("Library"); + var temp = project.split(":"); + project = temp[0]; +- var pdir = rep + Data.safe(project); +- if( !FileSystem.exists(pdir) ) +- throw "Library "+project+" is not installed"; +- pdir += "/"; +- var version = temp[1] != null ? temp[1] : getCurrent(pdir); +- var dev = try getDev(pdir) catch ( e : Dynamic ) null; +- var vdir = dev!=null ? dev : pdir + Data.safe(version); +- var rdir = vdir + "/run.n"; +- if( !FileSystem.exists(rdir) ) +- throw "Library "+project+" version "+version+" does not have a run script"; ++ var vdir = this.getNixLib(project); ++ if (vdir == null) { ++ var rep = getRepository(); ++ var pdir = rep + Data.safe(project); ++ if( !FileSystem.exists(pdir) ) ++ throw "Library "+project+" is not installed"; ++ pdir += "/"; ++ var version = temp[1] != null ? temp[1] : getCurrent(pdir); ++ var dev = try getDev(pdir) catch ( e : Dynamic ) null; ++ vdir = dev!=null ? dev : pdir + Data.safe(version); ++ var rdir = vdir + "/run.n"; ++ if( !FileSystem.exists(rdir) ) ++ throw "Library "+project+" version "+version+" does not have a run script"; ++ } + args.push(Sys.getCwd()); + Sys.setCwd(vdir); + var cmd = "neko run.n"; diff --git a/pkgs/development/compilers/haxe/hxcpp.nix b/pkgs/development/compilers/haxe/hxcpp.nix new file mode 100644 index 000000000000..56b43fc128ef --- /dev/null +++ b/pkgs/development/compilers/haxe/hxcpp.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchzip, haxe, neko, pcre, sqlite, zlib }: + +stdenv.mkDerivation rec { + name = "hxcpp-3.2.27"; + + src = let + zipFile = stdenv.lib.replaceChars ["."] [","] name; + in fetchzip { + inherit name; + url = "http://lib.haxe.org/files/3.0/${zipFile}.zip"; + sha256 = "1hw4kr1f8q7f4fkzis7kvkm7h1cxhv6cf5v1iq7rvxs2fxiys7fr"; + }; + + NIX_LDFLAGS = "-lpcre -lz -lsqlite3"; + + outputs = [ "out" "lib" ]; + + patchPhase = '' + rm -rf bin lib project/thirdparty project/libs/sqlite/sqlite3.[ch] + find . -name '*.n' -delete + sed -i -re '/(PCRE|ZLIB)_DIR|\<sqlite3\.c\>/d' project/Build.xml + sed -i -e 's/mFromFile = "@";/mFromFile = "";/' tools/hxcpp/Linker.hx + sed -i -e '/dll_ext/s,HX_CSTRING("./"),HX_CSTRING("'"$lib"'/"),' \ + src/hx/Lib.cpp + ''; + + buildInputs = [ haxe neko pcre sqlite zlib ]; + + targetArch = "linux-m${if stdenv.is64bit then "64" else "32"}"; + + buildPhase = '' + haxe -neko project/build.n -cp tools/build -main Build + haxe -neko run.n -cp tools/run -main RunMain + haxe -neko hxcpp.n -cp tools/hxcpp -main BuildTool + (cd project && neko build.n "ndll-$targetArch") + ''; + + installPhase = '' + for i in bin/Linux*/*.dso; do + install -vD "$i" "$lib/$(basename "$i")" + done + find *.n toolchain/*.xml build-tool/BuildCommon.xml src include \ + -type f -exec install -vD -m 0644 {} "$out/lib/haxe/hxcpp/{}" \; + ''; + + meta = { + homepage = "http://lib.haxe.org/p/hxcpp"; + description = "Runtime support library for the Haxe C++ backend"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh new file mode 100644 index 000000000000..a29e04a989b6 --- /dev/null +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -0,0 +1,5 @@ +addHaxeLibPath() { + addToSearchPath HAXELIB_PATH "$1/lib/haxe" +} + +envHooks+=(addHaxeLibPath) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index bc2629513a55..e38c37360f09 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,39 +1,34 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre +{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog +, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype, gdb +, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libvpx, imagemagick, fribidi }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.3.0"; + version = "3.6.0"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; - sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; + rev = "6ef13f20da20993dc8bab9eb103f73568618d3e8"; + sha256 = "29a2d4b56cfd348b199d8f90b4e4b07de85dfb2ef1538479cd1e84f5bc1fbf96"; fetchSubmodules = true; }; - patches = [ - ./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch - ./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch - ]; - buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5 + gmp libyaml libedit libvpx imagemagick fribidi ]; enableParallelBuilding = true; dontUseCmakeBuildDir = true; - dontUseCmakeConfigure = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; - USE_HHVM=1; MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; MYSQL_DIR=mariadb; @@ -46,19 +41,8 @@ stdenv.mkDerivation rec { substituteInPlace ./configure \ --replace "/usr/bin/env bash" ${stdenv.shell} ''; - installPhase = '' - mkdir -p $out/bin $out/lib - mv hphp/hhvm/hhvm $out/bin - mv hphp/hack/bin/hh_server $out/bin - mv hphp/hack/bin/hh_client $out/bin - mv hphp/hack/hhi $out/lib/hack-hhi - cat > $out/bin/hhvm-hhi-copy <<EOF - #!${stdenv.shell} - cp -R $out/lib/hack-hhi \$1 - EOF - chmod +x $out/bin/hhvm-hhi-copy - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; meta = { description = "High-performance JIT compiler for PHP/Hack"; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index a95b77c08b63..93e0056fb92d 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -1,6 +1,7 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: - -stdenv.mkDerivation { +let + gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; +in stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' @@ -17,6 +18,8 @@ stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ + # Maybe with compiler-rt this won't be needed? + (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); patches = [ ./clang-purity.patch ]; @@ -36,6 +39,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 9a25401a874b..92ba4108a4d2 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; + broken = true; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index bacd0b26643e..7e11caa66f0f 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_REQUIRES_RTTI=1" ] ++ stdenv.lib.optionals (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" diff --git a/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch new file mode 100644 index 000000000000..fbe9489d8e2c --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch @@ -0,0 +1,29 @@ +diff -Naur clang-3.6.0.src-orig/CMakeLists.txt clang-3.6.0.src/CMakeLists.txt +--- clang-3.6.0.src-orig/CMakeLists.txt 2015-03-05 05:56:20.788520896 +0100 ++++ clang-3.6.0.src/CMakeLists.txt 2015-03-05 06:02:15.589365469 +0100 +@@ -362,6 +362,7 @@ + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libclang") + install(TARGETS ${name} ++ EXPORT ClangTargets + LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} + ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} + RUNTIME DESTINATION bin) +@@ -516,15 +517,15 @@ + set(CLANG_INSTALL_PACKAGE_DIR share/clang/cmake) + set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") + get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) +- export(TARGETS ${CLANG_EXPORTS} FILE ${clang_cmake_builddir}/ClangTargets.cmake) + + # Install a <prefix>/share/clang/cmake/ClangConfig.cmake file so that + # find_package(Clang) works. Install the target list with it. + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake +- ${CLANG_BINARY_DIR}/share/clang/cmake/ClangTargets.cmake + DESTINATION share/clang/cmake) + ++ install(EXPORT ClangTargets DESTINATION share/clang/cmake) ++ + # Also copy ClangConfig.cmake to the build directory so that dependent projects + # can build against a build directory of Clang more easily. + configure_file( diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix new file mode 100644 index 000000000000..2216dad3ef8e --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: + +let + gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; +in stdenv.mkDerivation { + name = "clang-${version}"; + + unpackPhase = '' + unpackFile ${fetch "cfe" "0b8825mvdhfk5r9gwcwp1j2dl9kw5glgyk7pybq2dzhrh4vnj3my"} + mv cfe-${version}.src clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + buildInputs = [ cmake libedit libxml2 llvm ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_FLAGS=-std=c++11" + ] ++ + # Maybe with compiler-rt this won't be needed? + (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ + (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); + + patches = [ ./purity.patch ./cmake-exports.patch ]; + + postPatch = '' + sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + ''; + + # Clang expects to find LLVMgold in its own prefix + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ + ln -sv $out/bin/clang $out/bin/cpp + ''; + + enableParallelBuilding = true; + + passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/clang/purity.patch b/pkgs/development/compilers/llvm/3.6/clang/purity.patch new file mode 100644 index 000000000000..dc3b54e304fc --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/clang/purity.patch @@ -0,0 +1,22 @@ +diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp +index 198e82e..810d006 100644 +--- a/lib/Driver/Tools.cpp ++++ b/lib/Driver/Tools.cpp +@@ -7355,17 +7355,6 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, + CmdArgs.push_back("-shared"); + } + +- if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::armeb || +- ToolChain.getArch() == llvm::Triple::thumb || +- ToolChain.getArch() == llvm::Triple::thumbeb || +- (!Args.hasArg(options::OPT_static) && +- !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString( +- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); +- } +- + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); + diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix new file mode 100644 index 000000000000..624fc68c21ad --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -0,0 +1,35 @@ +{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: +let + callPackage = newScope (self // { inherit isl version fetch; }); + + version = "3.6.0"; + + fetch = fetch_v version; + fetch_v = ver: name: sha256: fetchurl { + url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz"; + inherit sha256; + }; + + compiler-rt_src = fetch "compiler-rt" "04bbn946jninynkrjyp337xqs8ihn4fkz5xgvmywxkddwmwznjbz"; + clang-tools-extra_src = fetch "clang-tools-extra" "04n83gsmy2ghvn7vp9hamsgn332rx2g7sa4paskr0d4ihax4ka9s"; + + self = { + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src stdenv; + }; + + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; + }; + + clang = wrapCC self.clang-unwrapped; + + stdenv = overrideCC stdenv self.clang; + + lldb = callPackage ./lldb.nix {}; + + libcxx = callPackage ./libc++ {}; + + libcxxabi = callPackage ./libc++abi.nix {}; + }; +in self diff --git a/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch new file mode 100644 index 000000000000..bf83f169cfc3 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++/darwin.patch @@ -0,0 +1,30 @@ +diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt +--- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 ++++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 +@@ -56,7 +56,7 @@ + "-compatibility_version 1" + "-current_version ${LIBCXX_VERSION}" + "-install_name /usr/lib/libc++.1.dylib" +- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" ++ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" + "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" + "/usr/lib/libSystem.B.dylib") + else() +@@ -64,14 +64,14 @@ + list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) + if (OSX_HAS_ARMV7) + set(OSX_RE_EXPORT_LINE +- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" ++ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" + "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") + else() + set(OSX_RE_EXPORT_LINE +- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") ++ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") + endif() + else() +- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") ++ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") + endif() + + list(APPEND link_flags diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix new file mode 100644 index 000000000000..a01d15e186ba --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: + +stdenv.mkDerivation rec { + name = "libc++-${version}"; + + src = fetch "libcxx" "1dzvhyrzj54v823biadag5lwxfz37gm8a65aq72pjsh8n211x719"; + + # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, + # force it to link with our copy + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace lib/CMakeLists.txt \ + --replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \ + 'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \ + --replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \ + '"${libcxxabi}/lib/libc++abi.dylib"' + ''; + + patches = [ ./darwin.patch ]; + + buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + enableParallelBuilding = true; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh new file mode 100644 index 000000000000..8a45be7e85a2 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh @@ -0,0 +1,4 @@ +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" + +export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++" diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix new file mode 100644 index 000000000000..ddc9c267edda --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix @@ -0,0 +1,47 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: + +stdenv.mkDerivation { + name = "libc++abi-${version}"; + + src = fetch "libcxxabi" "1xclv63l7cmrxkl129w6j9fsxgdm8jjlcm8gswl2y9qmh3dwz2zp"; + + buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + export NIX_CFLAGS_COMPILE+=" -I$PWD/include" + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # http://www.cmake.org/Wiki/CMake_RPATH_handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/cxxabi.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 ../include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix new file mode 100644 index 000000000000..d4f496a1749d --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, llvm +, clang-unwrapped +, python +, version +}: + +stdenv.mkDerivation { + name = "lldb-${version}"; + + src = fetch "lldb" "1cphxbc8c0yqs2rxn94vcn8his465m97rnynklpzm8sf5kad26ib"; + + patchPhase = '' + sed -i 's|/usr/bin/env||' \ + scripts/Python/finish-swig-Python-LLDB.sh \ + scripts/Python/build-swig-Python.sh + ''; + + buildInputs = [ cmake python which swig ncurses zlib libedit ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" + "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" + ]; + + enableParallelBuilding = true; + + meta = { + description = "A next-generation high-performance debugger"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix new file mode 100644 index 000000000000..a679ab3babd5 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetch +, perl +, groff +, cmake +, python +, libffi +, binutils +, libxml2 +, valgrind +, ncurses +, version +, zlib +, compiler-rt_src +}: + +let + src = fetch "llvm" "1kmr5vlnz1419nnvyc7lsrcfx09n65ravjbmzxrqz7ml07jnk6mk"; +in stdenv.mkDerivation rec { + name = "llvm-${version}"; + + unpackPhase = '' + unpackFile ${src} + mv llvm-${version}.src llvm + sourceRoot=$PWD/llvm + unpackFile ${compiler-rt_src} + mv compiler-rt-* $sourceRoot/projects/compiler-rt + ''; + + buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; + + propagatedBuildInputs = [ ncurses zlib ]; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + ] ++ stdenv.lib.optionals (!isDarwin) [ + "-DBUILD_SHARED_LIBS=ON" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + ] ++ stdenv.lib.optionals ( isDarwin) [ + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCAN_TARGET_i386=false" + ]; + + postBuild = '' + rm -fR $out + + paxmark m bin/{lli,llvm-rtdyld} + + paxmark m unittests/ExecutionEngine/JIT/JITTests + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/Support/SupportTests + ''; + + enableParallelBuilding = true; + + passthru.src = src; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index a9f2fba9409f..9ed5b8950e95 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchgit, vim, avrdude, avrgcclibc, makeWrapper }: +{ stdenv, fetchzip, vim, avrdude, avrgcclibc, makeWrapper }: stdenv.mkDerivation rec { name = "microscheme-${version}"; - version = "2015-02-04"; + version = "0.9.2"; - # externalize url/rev/sha256 to permit easier override - rev = "2f14781034a67adc081a22728fbf47a632f4484e"; - sha256 = "15bdlmchzbhxj262r2fj78wm4c4hfrap4kyzv8n5b624svszr0zd"; - url = https://github.com/ryansuchocki/microscheme.git; - - src = fetchgit { - inherit rev; - inherit sha256; - inherit url; + src = fetchzip { + name = "${name}-src"; + url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; + sha256 = "0ly1cphvnsip70kng9q0blb07pkyp9allav42sr6ybswqfqg60j9"; }; buildInputs = [ makeWrapper vim ]; installPhase = '' - mkdir -p $out/bin && make install PREFIX=$out - - mkdir -p $out/share/microscheme/ - cp -r examples/ $out/share/microscheme + make install PREFIX=$out wrapProgram $out/bin/microscheme \ --prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin" diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index fad8a584ed2a..a30a97ce9ce5 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.05"; # do not update until syslinux is fixed with that version + version = "2.11.08"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; + sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/openjdk/nonreparenting-wm.patch b/pkgs/development/compilers/openjdk/nonreparenting-wm.patch deleted file mode 100644 index 49db6fb1ea6f..000000000000 --- a/pkgs/development/compilers/openjdk/nonreparenting-wm.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:41:39.018530981 -0400 -+++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:46:43.098540372 -0400 -@@ -104,7 +104,8 @@ - COMPIZ_WM = 12, - LG3D_WM = 13, - CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -596,7 +597,7 @@ - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -786,6 +787,9 @@ - } else if (doIsIceWM && isIceWM()) { - awt_wmgr = XWM.ICE_WM; - } -+ else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } - /* - * We don't check for legacy WM when we already know that WM - * supports WIN or _NET wm spec. -@@ -1332,6 +1336,7 @@ - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; \ No newline at end of file diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 7ef238e03bc3..55b7ff36f8fa 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,41 +1,41 @@ { stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl } : let - update = "31"; - build = "13"; - baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; + update = "40"; + build = "25"; + baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34"; + sha256 = "05s5j0rq45n8piymv9c1n0hxr4bk3j8lz6fw2wbp0m8kam6zzpza"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4"; + sha256 = "0p1z38szm63cf5f83697awbqwpf7b8q1ymrqc0v6r9hb5yf0p22r"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3"; + sha256 = "0sl0ima3zlbd1ai7qrg4msy5ibg64qpwdrv7z4l8cpalwby26y6p"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347"; + sha256 = "1ahvhap8av519813yf20v3hbvg82j9bq3gnqlayng1qggfivsb5s"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a"; + sha256 = "0n86fcy1z4z22jcgfnn9agzfi949709hn2x6s8wyhwwa055rjd1a"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf"; + sha256 = "0hp19hq0dw3j8zz4mxd6bjk9zqlyr56fhwzgjwmm56b6pwkcmsn7"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2"; + sha256 = "037za0hjiwvzvbzsckfxnrrbak1vbd52pmrnd855vxkik08jxp8c"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3"; + sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; }; in stdenv.mkDerivation { @@ -47,7 +47,7 @@ stdenv.mkDerivation { xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir cups freetype alsaLib openjdk perl ]; setSourceRoot = '' - sourceRoot="jdk8u-jdk8u${update}-b${build}"; + sourceRoot="jdk8u${update}-jdk8u${update}-b${build}"; ''; prePatch = '' # despite --with-override-jdk the build still searchs here @@ -58,7 +58,6 @@ stdenv.mkDerivation { ./fix-java-home.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ./nonreparenting-wm.patch ]; preConfigure = '' chmod +x configure diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index fbb6ae30f513..ea1c01ec5e56 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "31"; + patchVersion = "40"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1sr3q9y0cd42cqpf98gsv3hvip0r1vw3d0jh6yml6krzdm96zp8s"; - sha256_x86_64 = "0dz4k3xds1ydqr77hmrjc1w0niqq3jm3h18nk3ibqr1083l1bq7g"; + sha256_i686 = "1bfabnmbar0kfx3i37wnxh97j7whkib8m6wqxrb1d9zf6k13bw50"; + sha256_x86_64 = "0nfm4xqd57s8dmkgd0jsrhys8dhfw0fx5d57mq70ramq9dl2jq66"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 83255824ac2b..e6a418c18956 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.licenses.bsd3; - platform = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/compilers/rustc/1.0.0-alpha.nix b/pkgs/development/compilers/rustc/1.0.0-alpha.nix index fa80bcb5e02c..7a2e485c9c62 100644 --- a/pkgs/development/compilers/rustc/1.0.0-alpha.nix +++ b/pkgs/development/compilers/rustc/1.0.0-alpha.nix @@ -1,90 +1,17 @@ -{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind, procps, coreutils -}: - -assert !stdenv.isFreeBSD; - -/* Rust's build process has a few quirks : - -- It requires some patched in llvm that haven't landed upstream, so it - compiles its own llvm. This might change in the future, so at some - point we may be able to switch to nix's llvm. - -- The Rust compiler is written is Rust, so it requires a bootstrap - compiler, which is downloaded during the build. To make the build - pure, we download it ourself before and put it where it is - expected. Once the language is stable (1.0) , we might want to - switch it to use nix's packaged rust compiler. - -*/ - -with ((import ./common.nix) {inherit stdenv; version = "1.0.0-alpha"; }); - -let snapshotHash = if stdenv.system == "i686-linux" - then "d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4" - else if stdenv.system == "x86_64-linux" - then "697880d3640e981bbbf23284363e8e9a158b588d" - else if stdenv.system == "i686-darwin" - then "a73b1fc03e8cac747aab0aa186292bb4332a7a98" - else if stdenv.system == "x86_64-darwin" - then "e4ae2670ea4ba5c2e5b4245409c9cab45c9eeb5b" - else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2015-01-07"; - snapshotRev = "9e4e524"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2"; - -in stdenv.mkDerivation { - inherit name; - inherit version; - inherit meta; - - src = fetchurl { - url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0p62gx3s087n09d2v3l9iyfx5cmsa1x91n4ysixcb7w3drr8a8is"; - }; - - # We need rust to build rust. If we don't provide it, configure will try to download it. - snapshot = stdenv.mkDerivation { - name = "rust-stage0"; - src = fetchurl { - url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; - sha1 = snapshotHash; - }; - dontStrip = true; - installPhase = '' - mkdir -p "$out" - cp -r bin "$out/bin" - '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ - "$out/bin/rustc" - '' else ""); - }; - - configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] - ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; - - # The compiler requires cc, so we patch the source to tell it where to find it - patches = [ ./hardcode_paths.patch ./local_stage0.patch ] - ++ stdenv.lib.optional stdenv.needsPax ./grsec.patch; - - postPatch = '' - substituteInPlace src/librustc_trans/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" - substituteInPlace src/librustc_back/archive.rs \ - --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" - - substituteInPlace src/rust-installer/gen-install-script.sh \ - --replace /bin/echo "${coreutils}/bin/echo" - substituteInPlace src/rust-installer/gen-installer.sh \ - --replace /bin/echo "${coreutils}/bin/echo" - ''; - - buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; - - enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 - - preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; - - doCheck = true; +{ stdenv, callPackage }: +callPackage ./makeRustcDerivation.nix { + shortVersion = "1.0.0-alpha"; + isRelease = true; + srcSha = "0p62gx3s087n09d2v3l9iyfx5cmsa1x91n4ysixcb7w3drr8a8is"; + snapshotHashLinux686 = "d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4"; + snapshotHashLinux64 = "697880d3640e981bbbf23284363e8e9a158b588d"; + snapshotHashDarwin686 = "a73b1fc03e8cac747aab0aa186292bb4332a7a98"; + snapshotHashDarwin64 = "e4ae2670ea4ba5c2e5b4245409c9cab45c9eeb5b"; + snapshotDate = "2015-01-07"; + snapshotRev = "9e4e524"; + patches = [ + ./patches/hardcode_paths.alpha.patch + ./patches/local_stage0.alpha.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; } + diff --git a/pkgs/development/compilers/rustc/1.0.0-alpha2.nix b/pkgs/development/compilers/rustc/1.0.0-alpha2.nix new file mode 100644 index 000000000000..94bdd995592f --- /dev/null +++ b/pkgs/development/compilers/rustc/1.0.0-alpha2.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage }: +callPackage ./makeRustcDerivation.nix { + shortVersion = "1.0.0-alpha.2"; + isRelease = true; + srcSha = "1j2n34w0hdz7jrl100c9q9hl80l8nsc3xwnzizv9sh4gx52vjcd9"; + snapshotHashLinux686 = "191ed5ec4f17e32d36abeade55a1c6085e51245c"; + snapshotHashLinux64 = "acec86045632f4f3f085c072ba696f889906dffe"; + snapshotHashDarwin686 = "9d9e622584bfa318f32bcb5b9ce6a365febff595"; + snapshotHashDarwin64 = "e96c1e9860b186507cc75c186d1b96d44df12292"; + snapshotDate = "2015-02-17"; + snapshotRev = "f1bb6c2"; + patches = [ + ./patches/alpha2.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; +} + diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix deleted file mode 100644 index 8debb4342dac..000000000000 --- a/pkgs/development/compilers/rustc/common.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, version}: - -{ - inherit version; - - platform = if stdenv.system == "i686-linux" - then "linux-i386" - else if stdenv.system == "x86_64-linux" - then "linux-x86_64" - else if stdenv.system == "i686-darwin" - then "macos-i386" - else if stdenv.system == "x86_64-darwin" - then "macos-x86_64" - else abort "no snapshot to bootstrap for this platform (missing platform url suffix)"; - - target = if stdenv.system == "i686-linux" - then "i686-unknown-linux-gnu" - else if stdenv.system == "x86_64-linux" - then "x86_64-unknown-linux-gnu" - else if stdenv.system == "i686-darwin" - then "i686-apple-darwin" - else if stdenv.system == "x86_64-darwin" - then "x86_64-apple-darwin" - else abort "no snapshot to bootstrap for this platform (missing target triple)"; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman ]; - license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux; - }; - - name = "rustc-${version}"; -} diff --git a/pkgs/development/compilers/rustc/grsec.HEAD.patch b/pkgs/development/compilers/rustc/grsec.HEAD.patch deleted file mode 100644 index 84582ab7d70f..000000000000 --- a/pkgs/development/compilers/rustc/grsec.HEAD.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile -index 2fcdd32..2d9ddb0 100644 ---- a/src/test/run-make/relocation-model/Makefile -+++ b/src/test/run-make/relocation-model/Makefile -@@ -5,9 +5,11 @@ all: - $(call RUN,foo) - - $(RUSTC) -C relocation-model=default foo.rs -+ paxctl -czexm $(TMPDIR)/foo - $(call RUN,foo) - - $(RUSTC) -C relocation-model=static foo.rs -+ paxctl -czexm $(TMPDIR)/foo - $(call RUN,foo) - - $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch deleted file mode 100644 index 2a9cb09dcbd3..000000000000 --- a/pkgs/development/compilers/rustc/hardcode_paths.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index 7ea192b..cd5d01b 100644 ---- a/src/librustc_back/archive.rs -+++ b/src/librustc_back/archive.rs -@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, - paths: &[&Path]) -> ProcessOutput { - let ar = match *maybe_ar_prog { - Some(ref ar) => &ar[], -- None => "ar" -+ None => "@arPath@" - }; - let mut cmd = Command::new(ar); - -diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs -index dacf620..815ce60 100644 ---- a/src/librustc_trans/back/link.rs -+++ b/src/librustc_trans/back/link.rs -@@ -348,8 +348,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri - - pub fn get_cc_prog(sess: &Session) -> String { - match sess.opts.cg.linker { -- Some(ref linker) => return linker.to_string(), -- None => sess.target.target.options.linker.clone(), -+ Some(ref linker) => linker.to_string(), -+ None => "@ccPath@".to_string(), - } - } - diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index dd73449d5fd0..2d4503886691 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,101 +1,18 @@ -{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind, procps, coreutils -}: - -assert !stdenv.isFreeBSD; - -/* Rust's build process has a few quirks : - -- It requires some patched in llvm that haven't landed upstream, so it - compiles its own llvm. This might change in the future, so at some - point we may be able to switch to nix's llvm. - -- The Rust compiler is written is Rust, so it requires a bootstrap - compiler, which is downloaded during the build. To make the build - pure, we download it ourself before and put it where it is - expected. Once the language is stable (1.0) , we might want to - switch it to use nix's packaged rust compiler. - - -NOTE : some derivation depend on rust. When updating this, please make -sure those derivations still compile. (racer, for example). - -*/ - -let shortVersion = "1.0.0-dev"; - rev = "a833337943300db1c310a4cf9c84b7b4ef4e9468"; - revShort = builtins.substring 0 7 rev; -in - -with ((import ./common.nix) {inherit stdenv; version = "${shortVersion}-g${revShort}"; }); - -let snapshotHash = if stdenv.system == "i686-linux" - then "0197ad7179d74eba06a8b46432548caf226aa03d" - else if stdenv.system == "x86_64-linux" - then "03459f8b216e96ed8b9abe25a42a75859195103d" - else if stdenv.system == "i686-darwin" - then "b5c004883ddff84159f11a3329cde682e0b7f75b" - else if stdenv.system == "x86_64-darwin" - then "b69ea42e1c995682adf0390ed4ef8a762c001a4e" - else abort "no snapshot for platform ${stdenv.system}"; - snapshotDate = "2015-01-15"; - snapshotRev = "9ade482"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2"; -in - -stdenv.mkDerivation { - inherit name; - inherit version; - inherit meta; - - src = fetchgit { - url = https://github.com/rust-lang/rust; - inherit rev; - sha256 = "1b9rnx3j37ckxa3vf20g8amsbffzvk2m9lzv5x1m04ci54w85f56"; - }; - - # We need rust to build rust. If we don't provide it, configure will try to download it. - snapshot = stdenv.mkDerivation { - name = "rust-stage0"; - src = fetchurl { - url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; - sha1 = snapshotHash; - }; - dontStrip = true; - installPhase = '' - mkdir -p "$out" - cp -r bin "$out/bin" - '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ - "$out/bin/rustc" - '' else ""); - }; - - configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] - ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; - - # The compiler requires cc, so we patch the source to tell it where to find it - patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ] - ++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch; - - postPatch = '' - substituteInPlace src/librustc_trans/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" - substituteInPlace src/librustc_back/archive.rs \ - --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" - - substituteInPlace src/rust-installer/gen-install-script.sh \ - --replace /bin/echo "${coreutils}/bin/echo" - substituteInPlace src/rust-installer/gen-installer.sh \ - --replace /bin/echo "${coreutils}/bin/echo" - ''; - - buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; - - enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 - - preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; - - doCheck = true; +{ stdenv, callPackage }: +callPackage ./makeRustcDerivation.nix { + shortVersion = "1.0.0-dev"; + isRelease = false; + # src rev for master on 2015/03/09 + srcRev = "91bdf23f504f79ed59617cde3dfebd3d5e39a476"; + srcSha = "1s1v1q630d88idz331n4m0c3ninzipmvfzmkvdaqqm28wsn69xx7"; + snapshotHashLinux686 = "50a47ef247610fb089d2c4f24e4b641eb0ba4afb"; + snapshotHashLinux64 = "ccb20709b3c984f960ddde996451be8ce2268d7c"; + snapshotHashDarwin686 = "ad263bdeadcf9bf1889426e0c1391a7cf277364e"; + snapshotHashDarwin64 = "01c8275828042264206b7acd8e86dc719a2f27aa"; + snapshotDate = "2015-03-07"; + snapshotRev = "270a677"; + patches = [ + ./patches/head.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; } + diff --git a/pkgs/development/compilers/rustc/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch deleted file mode 100644 index 2f38d7c1757c..000000000000 --- a/pkgs/development/compilers/rustc/local_stage0.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh -index e78f231..6b6773b 100755 ---- a/src/etc/local_stage0.sh -+++ b/src/etc/local_stage0.sh -@@ -53,11 +53,6 @@ - fi - - cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ --cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ --cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ --cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ --cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ --cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ - - # do not fail if one of the above fails, as all we need is a working rustc! - exit 0 diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix new file mode 100644 index 000000000000..913e65de59aa --- /dev/null +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -0,0 +1,140 @@ +{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper +, tzdata, git, valgrind, procps, coreutils + +, shortVersion, isRelease +, srcSha, srcRev ? "" +, snapshotHashLinux686, snapshotHashLinux64 +, snapshotHashDarwin686, snapshotHashDarwin64 +, snapshotDate, snapshotRev + +, patches +}: + +assert !stdenv.isFreeBSD; + +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +NOTE : some derivation depend on rust. When updating this, please make +sure those derivations still compile. (racer, for example). + +*/ + +assert (if isRelease then srcRev == "" else srcRev != ""); + +let version = if isRelease then + "${shortVersion}" + else + "${shortVersion}-g${builtins.substring 0 7 srcRev}"; + + name = "rustc-${version}"; + + platform = if stdenv.system == "i686-linux" + then "linux-i386" + else if stdenv.system == "x86_64-linux" + then "linux-x86_64" + else if stdenv.system == "i686-darwin" + then "macos-i386" + else if stdenv.system == "x86_64-darwin" + then "macos-x86_64" + else abort "no snapshot to bootstrap for this platform (missing platform url suffix)"; + + target = if stdenv.system == "i686-linux" + then "i686-unknown-linux-gnu" + else if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else if stdenv.system == "i686-darwin" + then "i686-apple-darwin" + else if stdenv.system == "x86_64-darwin" + then "x86_64-apple-darwin" + else abort "no snapshot to bootstrap for this platform (missing target triple)"; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan wizeman globin ]; + license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; + platforms = platforms.linux; + }; + + snapshotHash = if stdenv.system == "i686-linux" + then snapshotHashLinux686 + else if stdenv.system == "x86_64-linux" + then snapshotHashLinux64 + else if stdenv.system == "i686-darwin" + then snapshotHashDarwin686 + else if stdenv.system == "x86_64-darwin" + then snapshotHashDarwin64 + else abort "no snapshot for platform ${stdenv.system}"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2"; +in + +stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; + + src = if isRelease then + fetchurl { + url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = srcSha; + } + else + fetchgit { + url = https://github.com/rust-lang/rust; + rev = srcRev; + sha256 = srcSha; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + snapshot = stdenv.mkDerivation { + name = "rust-stage0"; + src = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha1 = snapshotHash; + }; + dontStrip = true; + installPhase = '' + mkdir -p "$out" + cp -r bin "$out/bin" + '' + (if stdenv.isLinux then '' + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ + "$out/bin/rustc" + '' else ""); + }; + + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] + ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; + + inherit patches; + + postPatch = '' + substituteInPlace src/librustc_trans/back/link.rs \ + --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" + substituteInPlace src/librustc_back/archive.rs \ + --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" + + substituteInPlace src/rust-installer/gen-install-script.sh \ + --replace /bin/echo "${coreutils}/bin/echo" + substituteInPlace src/rust-installer/gen-installer.sh \ + --replace /bin/echo "${coreutils}/bin/echo" + ''; + + buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; + + enableParallelBuilding = true; + + preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; + + doCheck = true; +} diff --git a/pkgs/development/compilers/rustc/patches/alpha2.patch b/pkgs/development/compilers/rustc/patches/alpha2.patch new file mode 100644 index 000000000000..8165a42cf85c --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/alpha2.patch @@ -0,0 +1,55 @@ +diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh +index b506aff..b4b346b 100755 +--- a/src/etc/local_stage0.sh ++++ b/src/etc/local_stage0.sh +@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then + fi + + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ +-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 +diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs +index c45ee25..0f91672 100644 +--- a/src/librustc_back/archive.rs ++++ b/src/librustc_back/archive.rs +@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, + paths: &[&Path]) -> ProcessOutput { + let ar = match *maybe_ar_prog { + Some(ref ar) => &ar[..], +- None => "ar" ++ None => "@arPath@" + }; + let mut cmd = Command::new(ar); + +diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs +index ef849bb..e090b99 100644 +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -350,8 +350,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri + + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => sess.target.target.options.linker.clone(), ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string(), + } + } + +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl<S: Strategy> Iterator for Subpaths<S> { + } + + fn main() { +- let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } diff --git a/pkgs/development/compilers/rustc/grsec.patch b/pkgs/development/compilers/rustc/patches/grsec.patch index 84582ab7d70f..84582ab7d70f 100644 --- a/pkgs/development/compilers/rustc/grsec.patch +++ b/pkgs/development/compilers/rustc/patches/grsec.patch diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch index 2a9cb09dcbd3..2a9cb09dcbd3 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch +++ b/pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch new file mode 100644 index 000000000000..f82f85fb1626 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -0,0 +1,55 @@ +diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh +index ca59b1c..65ee7bf 100755 +--- a/src/etc/local_stage0.sh ++++ b/src/etc/local_stage0.sh +@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then + fi + + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ +-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 +diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs +index ed44bf8..2b84627 100644 +--- a/src/librustc_back/archive.rs ++++ b/src/librustc_back/archive.rs +@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, + paths: &[&Path]) -> Output { + let ar = match *maybe_ar_prog { + Some(ref ar) => &ar[..], +- None => "ar" ++ None => "@arPath@" + }; + let mut cmd = Command::new(ar); + +diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs +index 3087a8e..578448f 100644 +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri + + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => sess.target.target.options.linker.clone(), ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string(), + } + } + +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl<S: Strategy> Iterator for Subpaths<S> { + } + + fn main() { +- let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } diff --git a/pkgs/development/compilers/rustc/local_stage0.HEAD.patch b/pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch index 2f38d7c1757c..2f38d7c1757c 100644 --- a/pkgs/development/compilers/rustc/local_stage0.HEAD.patch +++ b/pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix index 4ca477442a9f..6c0fa874f3eb 100644 --- a/pkgs/development/compilers/sbcl/1.2.5.nix +++ b/pkgs/development/compilers/sbcl/1.2.5.nix @@ -80,6 +80,5 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; inherit version; - updateWalker = true; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 94a17c483aba..32a73b68d5e1 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0ab9lw056yf6y0rjmx3iirn5n59pmssqxf00fbmpyl6qsnpaja1d"; + sha256 = "0pws10ylnsxj17dagqcdv0l36k3ax5k3hkc6c91n9yxh2nziagk0"; }; buildInputs = [ which ] diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index d7e7ecf1ce2e..b518a9a0e0ec 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.10.4"; + name = "scala-2.10.5"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1hqhm1xvd7g78jspvl30zgdzw79xq5zl837h47p6w1n6qlwbcvdl"; + sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci"; }; buildInputs = [ jre makeWrapper ] ; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 82cd9fd9087d..9e55d9f3ac2c 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.11.5"; + name = "scala-2.11.6"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0ip2nb4n68q8gqbc15dq55xfpvr0yi8fwsn8ycz4marl6qb0rhyv"; + sha256 = "10v58jm0wbb4v71sfi03gskd6n84jqn6nvd62x166104c3j4bfj1"; }; buildInputs = [ jre makeWrapper ] ; diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix new file mode 100644 index 000000000000..ce3f805bec32 --- /dev/null +++ b/pkgs/development/compilers/uhc/default.nix @@ -0,0 +1,46 @@ +{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages, + shuffle, + hashable, mtl, network, uhc-util, uulib +}: + +let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); +in stdenv.mkDerivation rec { + version = "1.1.8.7"; + name = "uhc-${version}"; + + src = fetchgit { + url = "https://github.com/UU-ComputerScience/uhc.git"; + rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f"; + sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl"; + }; + + postUnpack = "sourceRoot=\${sourceRoot}/EHC"; + + buildInputs = [ m4 wrappedGhc clang libtool shuffle ]; + + configureFlags = [ "--with-gcc=${clang}/bin/clang" ]; + + # UHC builds packages during compilation; these are by default + # installed in the user-specific package config file. We do not + # want that, and hack the build process to use a temporary package + # configuration file instead. + preConfigure = '' + p=`pwd`/uhc-local-packages + echo '[]' > $p + sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in + sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in + sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk + sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/config.mk.in + sed -i "s|--make|--make -package-db=$p|g" src/ehc/files2.mk + sed -i "s|--make|--make -package-db=$p|g" src/gen/files.mk + ''; + + inherit clang; + + meta = with stdenv.lib; { + homepage = "http://www.cs.uu.nl/wiki/UHC"; + description = "Utrecht Haskell Compiler"; + maintainers = [ maintainers.phausmann ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index e6460b5d509a..71271ee7ed87 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20141206"; + version = "20150214"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "077yakksxvdjlmwgc9wlz9jnkr345sikqjchvmxyv0axga5bw4rj"; + sha256 = "f7b7587fe72c04f14581ded11588777f7bb61e392634966cc0354e13d69f236d"; }; buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ]; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 5bab88e9c41a..f9b587c05049 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; + broken = !stdenv.is64bit; # the linux 32 bit build fails. }; } diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix index fe01fbf58913..d01c32bdb0af 100644 --- a/pkgs/development/coq-modules/contribs/all.nix +++ b/pkgs/development/coq-modules/contribs/all.nix @@ -47,7 +47,7 @@ EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb"; EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6"; ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1"; Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p"; -#FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; +FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy"; FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js"; Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6"; @@ -135,10 +135,10 @@ RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr"; SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1"; Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6"; SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb"; -#Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; +Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq"; SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl"; -Ssreflect = "1capfvkdnsv95ik0yj9kpwj4smm7i7n2n98d6rlv68bdd2abw9f3"; +Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz"; Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz"; Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc"; String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni"; diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index fb231bfdeac6..289a4d759214 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -4,6 +4,15 @@ let mkContrib = import ./mk-contrib.nix; all = import ./all.nix; overrides = { + Additions = self: { + patchPhase = '' + for p in binary_strat dicho_strat generation log2_implementation shift + do + substituteInPlace $p.v \ + --replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.' + done + ''; + }; BDDs = self: { buildInputs = self.buildInputs ++ [ contribs.IntMap ]; patchPhase = '' @@ -13,6 +22,7 @@ let 32d30 < extraction EOF + coq_makefile -f Make -o Makefile ''; postInstall = '' mkdir -p $out/bin @@ -25,6 +35,7 @@ let 17d16 < rauzy/algorithme1/extraction EOF + coq_makefile -f Make -o Makefile ''; postInstall = '' mkdir -p $out/bin @@ -38,6 +49,7 @@ let 2d1 < -R ../QArithSternBrocot QArithSternBrocot EOF + coq_makefile -f Make -o Makefile ''; }; CoRN = self: { @@ -47,7 +59,9 @@ let 2d1 < -R ../MathClasses/ MathClasses EOF + coq_makefile -f Make -o Makefile.coq ''; + enableParallelBuilding = true; installFlags = self.installFlags + " -f Makefile.coq"; }; Counting = self: { @@ -70,6 +84,7 @@ let < -I ../Counting/src < -R ../Counting/theories Counting EOF + coq_makefile -f Make -o Makefile ''; }; FingerTree = self: { @@ -78,6 +93,22 @@ let 21d20 < extraction EOF + coq_makefile -f Make -o Makefile + ''; + }; + FOUnify = self: { + patchPhase = '' + patch Make <<EOF + 8c8 + < -custom "\$(CAMLOPTLINK) -pp '\$(CAMLBIN)\$(CAMLP4)o' -o unif unif.mli unif.ml main.ml" unif.ml unif + --- + > -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif + EOF + coq_makefile -f Make -o Makefile + ''; + postInstall = '' + mkdir -p $out/bin + cp unif $out/bin/ ''; }; Goedel = self: { @@ -85,8 +116,9 @@ let patchPhase = '' patch Make <<EOF 2d1 - < -R ../../Eindhoven/Pocklington Pocklington + < -R ../../Eindhoven/Pocklington Pocklington EOF + coq_makefile -f Make -o Makefile ''; }; Graphs = self: { @@ -96,6 +128,7 @@ let 2d1 < -R ../../Cachan/IntMap IntMap EOF + coq_makefile -f Make -o Makefile ''; postInstall = '' mkdir -p $out/bin @@ -110,6 +143,7 @@ let 2d1 < -R ../../Sophia-Antipolis/Algebra/ Algebra EOF + coq_makefile -f Make -o Makefile ''; }; Markov = self: { configurePhase = "coq_makefile -o Makefile -R . Markov markov.v"; }; @@ -129,6 +163,7 @@ let < -R ../../Sophia-Antipolis/Algebra Algebra < -R ../../Nijmegen/LinAlg LinAlg EOF + coq_makefile -f Make -o Makefile ''; }; PTSF = self: { @@ -138,6 +173,7 @@ let 1d0 < -R ../../Paris/PTSATR/ PTSATR EOF + coq_makefile -f Make -o Makefile ''; }; RelationExtraction = self: { @@ -146,6 +182,20 @@ let 31d30 < test EOF + coq_makefile -f Make -o Makefile + ''; + }; + Semantics = self: { + patchPhase = '' + patch Make <<EOF + 18a19 + > interp.mli + EOF + ''; + configurePhase = '' + coq_makefile -f Make -o Makefile + make extract_interpret.vo + rm -f str_little.ml.d ''; }; SMC = self: { @@ -155,12 +205,13 @@ let 2d1 < -R ../../Cachan/IntMap IntMap EOF + coq_makefile -f Make -o Makefile ''; }; Ssreflect = self: { patchPhase = '' substituteInPlace Makefile \ - --replace "/bin/mkdir" "mkdir" + --replace "/bin/mkdir" "mkdir" ''; }; Stalmarck = self: { @@ -173,6 +224,7 @@ let 2d1 < -R ../ZornsLemma ZornsLemma EOF + coq_makefile -f Make -o Makefile ''; }; TreeAutomata = self: { @@ -182,6 +234,7 @@ let 2d1 < -R ../../Cachan/IntMap IntMap EOF + coq_makefile -f Make -o Makefile ''; }; }; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7240f8112721..ffd2e209999a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -7,8 +7,8 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; - Cabal_1_22_1_0 = dontCheck super.Cabal_1_22_1_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_0; }); + Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1; + cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; @@ -25,6 +25,9 @@ self: super: { # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; + # Use the default version of mysql to build this package (which is actually mariadb). + mysql = super.mysql.override { inherit (pkgs) mysql; }; + # Please also remove optparse-applicative special case from # cabal2nix/hackage2nix.hs when removing the following. elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; }; @@ -43,6 +46,24 @@ self: super: { hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; + # CUDA needs help finding the SDK headers and libraries. + cuda = overrideCabal super.cuda (drv: { + extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11]; + configureFlags = (drv.configureFlags or []) ++ + pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ + "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" + "--extra-include-dirs=${pkgs.cudatoolkit}/usr_include" + ]; + preConfigure = '' + unset CC # unconfuse the haskell-cuda configure script + sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure + ''; + }); + + # The package doesn't know about the AL include hierarchy. + # https://github.com/phaazon/al/issues/1 + al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; + # Depends on code distributed under a non-free license. bindings-yices = dontDistribute super.bindings-yices; yices = dontDistribute super.yices; @@ -100,9 +121,11 @@ self: super: { hxt = dontHaddock super.hxt; # https://github.com/UweSchmidt/hxt/issues/38 markdown-unlit = dontHaddock super.markdown-unlit; network-conduit = dontHaddock super.network-conduit; + shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15 wai-test = dontHaddock super.wai-test; + zlib-conduit = dontHaddock super.zlib-conduit; # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. darcs = overrideCabal super.darcs (drv: { @@ -136,12 +159,6 @@ self: super: { # http://openradar.appspot.com/10207999 and similar issues fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify; - # Doesn't properly handle nonsense byte sequences on HFS+ - # https://github.com/fpco/haskell-filesystem/issues/5 - system-fileio = if pkgs.stdenv.isDarwin - then dontCheck super.system-fileio - else super.system-fileio; - # Prevents needing to add security_tool as a build tool to all of x509-system's # dependencies. # TODO: use pkgs.darwin.security_tool once we can build it @@ -186,6 +203,12 @@ self: super: { # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; + hs-mesos = overrideCabal super.hs-mesos (drv: { + # Pass _only_ mesos; the correct protobuf is propagated. + extraLibraries = [ pkgs.mesos ]; + preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; + }); + # Upstream notified by e-mail. permutation = dontCheck super.permutation; @@ -206,17 +229,23 @@ self: super: { # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw + dbmigrations = dontCheck super.dbmigrations; + euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1 filestore = dontCheck super.filestore; graceful = dontCheck super.graceful; hakyll = dontCheck super.hakyll; Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; memcached-binary = dontCheck super.memcached-binary; + persistent-zookeeper = dontCheck super.persistent-zookeeper; + pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; postgrest = dontCheck super.postgrest; snowball = dontCheck super.snowball; + test-sandbox = dontCheck super.test-sandbox; + users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; - wai-middleware-throttle = dontCheck super.wai-middleware-throttle; + wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1 xmlgen = dontCheck super.xmlgen; # These packages try to access the network. @@ -257,15 +286,15 @@ self: super: { # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw + aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # http://hydra.cryp.to/build/497379/log/raw + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; - boundingboxes = dontCheck super.boundingboxes; # https://github.com/fumieval/boundingboxes/issues/1 buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw @@ -296,7 +325,7 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; - GLFW-b = dontCheck super.GLFW-b; + GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; @@ -311,6 +340,7 @@ self: super: { hedn = dontCheck super.hedn; hgdbmi = dontCheck super.hgdbmi; hi = dontCheck super.hi; + hierarchical-clustering = dontCheck super.hierarchical-clustering; hmatrix-tests = dontCheck super.hmatrix-tests; hPDB-examples = dontCheck super.hPDB-examples; hquery = dontCheck super.hquery; @@ -348,7 +378,7 @@ self: super: { persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; - postgresql-binary = dontCheck super.postgresql-binary;# needs a running postgresql server + postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-simple-migration = dontCheck super.postgresql-simple-migration; process-streaming = dontCheck super.process-streaming; punycode = dontCheck super.punycode; @@ -376,9 +406,11 @@ self: super: { WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw webdriver-angular = dontCheck super.webdriver-angular; webdriver = dontCheck super.webdriver; - xcffib = dontCheck super.xcffib; xsd = dontCheck super.xsd; + # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test + hspec-webdriver = markBroken super.hspec-webdriver; + # The build fails with the most recent version of c2hs. ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; }; @@ -396,10 +428,7 @@ self: super: { snappy = dontCheck super.snappy; # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm; - - # https://github.com/chrisdone/hindent/issues/83 - hindent = dontCheck super.hindent; + bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm_34; # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; @@ -413,9 +442,6 @@ self: super: { # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; - # https://github.com/rrnewton/haskell-lockfree/issues/44 - chaselev-deque = markBrokenVersion "0.5.0.3" super.chaselev-deque; - # https://github.com/zouppen/stratum-tool/issues/14 stratum-tool = markBrokenVersion "0.0.4" super.stratum-tool; @@ -481,15 +507,9 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/ekmett/exceptions/issues/40 - exceptions = dontCheck super.exceptions; - # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/anton-k/temporal-csound/issues/2 - temporal-csound = markBrokenVersion "0.4.1" super.temporal-csound; - # https://github.com/seanparsons/wiring/issues/1 wiring = markBrokenVersion super.wiring; @@ -504,6 +524,7 @@ self: super: { # Depends on broken lmdb package. vcache = markBroken super.vcache; + vcache-trie = markBroken super.vcache-trie; # https://github.com/afcowie/http-streams/issues/80 http-streams = dontCheck super.http-streams; @@ -520,7 +541,6 @@ self: super: { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; # Depends on QuickCheck 1.x. - ersatz = dontCheck (super.ersatz.override { QuickCheck = self.QuickCheck_1_2_0_1; }); # https://github.com/ekmett/ersatz/issues/8 HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; @@ -550,26 +570,7 @@ self: super: { # https://github.com/fumieval/karakuri/issues/1 karakuri = markBroken super.karakuri; - # https://github.com/jtdaugherty/dbmigrations/issues/19 - dbmigrations = dontCheck super.dbmigrations; - - # https://github.com/chadaustin/buffer-builder/issues/2 - buffer-builder = markBroken super.buffer-builder; - buffer-builder-aeson = markBroken super.buffer-builder-aeson; - - # https://github.com/osa1/language-lua/issues/19 - language-lua = addBuildTool super.language-lua self.alex; - - # https://github.com/kawu/crf-chain1-constrained/issues/8 - crf-chain1-constrained = markBroken super.crf-chain1-constrained; - concraft = markBroken super.concraft; - concraft-pl = markBroken super.concraft-pl; - - # https://github.com/kawu/crf-chain2-tiers/issues/2 - crf-chain2-tiers = markBroken super.crf-chain2-tiers; - # Upstream notified by e-mail. - snowglobe = markBroken super.snowglobe; gearbox = markBroken super.gearbox; # https://github.com/deech/fltkhs/issues/7 @@ -588,31 +589,81 @@ self: super: { lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins; lambdabot-social-plugins = markBroken super.lambdabot-social-plugins; + # Upstream provides no issue tracker and no contact details. + vivid = markBroken super.vivid; + + # Test suite wants to connect to $DISPLAY. + hsqml = dontCheck super.hsqml; + + # https://github.com/megantti/rtorrent-rpc/issues/1 + rtorrent-rpc = markBroken super.rtorrent-rpc; + + # https://github.com/PaulJohnson/geodetics/issues/1 + geodetics = dontCheck super.geodetics; + + # https://github.com/AndrewRademacher/aeson-casing/issues/1 + aeson-casing = dontCheck super.aeson-casing; + + # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 + test-sandbox-compose = dontCheck super.test-sandbox-compose; + + # Broken by GLUT update. + Monadius = markBroken super.Monadius; + + # We don't have the groonga package these libraries bind to. + haroonga = markBroken super.haroonga; + haroonga-httpd = markBroken super.haroonga-httpd; + + # Cannot find pkg-config data for "webkit-1.0". + webkit = markBroken super.webkit; + websnap = markBroken super.websnap; + + # Build is broken and no contact info available. + hopenpgp-tools = markBroken super.hopenpgp-tools; + + # https://github.com/hunt-framework/hunt/issues/99 + hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server; + + # https://github.com/bjpop/blip/issues/16 + blip = markBroken super.blip; + + # https://github.com/tych0/xcffib/issues/37 + xcffib = dontCheck super.xcffib; + + # https://github.com/afcowie/locators/issues/1 + locators = dontCheck super.locators; + + # https://github.com/scravy/hydrogen-syntax/issues/1 + hydrogen-syntax = markBroken super.hydrogen-syntax; + hydrogen-cli = dontDistribute super.hydrogen-cli; + } // { # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; - version = "2.0"; + version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - sha256 = "5cc98f530303a82885e2f23d2c83f67f1a3767bfdd5ed3340e45858f1a0f04e1"; - rev = "6a445468030b064e4f71b43c269ba506e7e2f779"; + rev = "a8eaadbe6529cabd5088b8ae24fb325fc85a50c1"; + sha256 = "08q6c6g6syf4qgmgmicq8gf3fmp2cvy9mm6wm0vi7wjll3i2dns1"; + deepClone = true; }; isLibrary = false; isExecutable = true; buildDepends = with self; [ - aeson base bytestring Cabal containers deepseq deepseq-generics - directory filepath hackage-db monad-par monad-par-extras mtl pretty - prettyclass process QuickCheck regex-posix SHA split transformers - utf8-string + aeson base bytestring Cabal containers deepseq-generics directory + filepath hackage-db lens monad-par monad-par-extras mtl pretty + prettyclass process regex-posix SHA split transformers utf8-string cartel ]; testDepends = with self; [ aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec monad-par + directory doctest filepath hackage-db hspec lens monad-par monad-par-extras mtl pretty prettyclass process QuickCheck regex-posix SHA split transformers utf8-string ]; + buildTools = [ pkgs.gitMinimal ]; + preConfigure = "runhaskell $setupCompileFlags generate-cabal-file >cabal2nix.cabal"; homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; license = pkgs.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index bc558a7821e5..cccf5833c8a5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -38,14 +38,14 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_3_0; + binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1; deepseq = self.deepseq_1_3_0_1; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index dace434fda5d..36afb31ffcd5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -32,13 +32,13 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_3_0; + binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_0_0; + deepseq = self.deepseq_1_4_1_0; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 2a038a438776..df44501aadd2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -89,9 +89,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - # https://github.com/peti/jailbreak-cabal/issues/5 - ReadArgs = dontCheck super.ReadArgs; - # Until the changes have been pushed to Hackage haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; @@ -99,7 +96,7 @@ self: super: { }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; - sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl"; + sha256 = "0q4gs3xkazh644ff7qn2mp2q1nq3jq71x82g7iaacxclkiv0bphx"; }); persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch { url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch"; @@ -128,4 +125,10 @@ self: super: { sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq"; stripLen = 1; }); + + # https://github.com/batterseapower/ansi-wl-pprint/issues/13 + ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch { + url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch"; + sha256 = "0j20cwbph1wg82gfad5a6gfc5gy42cf4vz514jrpfg8d9qvyfhlj"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index dc79fba84071..23e939853afc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -32,15 +32,15 @@ self: super: { unix = null; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_0_0; + deepseq = self.deepseq_1_4_1_0; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index c627d6705868..0188be27a65f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -32,12 +32,12 @@ self: super: { unix = null; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 9210df486e84..827ea9895e6a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -31,16 +31,16 @@ self: super: { unix = null; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; # haskeline and terminfo are not core libraries for this compiler. - haskeline = self.haskeline_0_7_1_3; - terminfo = self.terminfo_0_4_0_0; + haskeline = self.haskeline_0_7_2_0; + terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; }; + Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -87,7 +87,7 @@ self: super: { presburger pretty process QuickCheck random smtLib syb text tf-random transformers utf8-string ]; - buildTools = with self; [ alex happy Cabal_1_22_1_0 ]; + buildTools = with self; [ alex happy Cabal_1_22_1_1 ]; patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; description = "Cryptol: The Language of Cryptography"; license = pkgs.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 5aec41b6c0fa..96447d9d90bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -35,7 +35,7 @@ self: super: { xhtml = null; # mtl 2.2.x needs the latest transformers. - mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_2_0; }; + mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_3_0; }; # Configure build for mtl 2.1.x. mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; @@ -43,9 +43,9 @@ self: super: { # Idris requires mtl 2.2.x. idris = overrideCabal (super.idris.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); - transformers = super.transformers_0_4_2_0; + transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_1_3; + haskeline = self.haskeline_0_7_2_0; mtl = super.mtl_2_2_1; })) (drv: { jailbreak = true; # idris is scared of lens 4.7 @@ -75,69 +75,27 @@ self: super: { seqid-streams = super.seqid-streams_0_1_0; # Need binary >= 0.7.2, but our compiler has only 0.7.1.0. - hosc = dontDistribute super.hosc; - tidal-midi = dontDistribute super.tidal-midi; - - # Needs mtl 2.2.x due to "plailude". - clac = dontDistribute super.clac; - - # https://github.com/junjihashimoto/test-sandbox-compose/issues/1 - hspec-test-sandbox = markBroken super.hspec-test-sandbox; - test-framework-sandbox = markBroken super.test-sandbox-quickcheck; - test-sandbox = markBroken super.test-sandbox; - test-sandbox-compose = markBroken super.test-sandbox-compose; - test-sandbox-hunit = markBroken super.test-sandbox-hunit; - test-sandbox-quickcheck = markBroken super.test-sandbox-quickcheck; + hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); # These packages need mtl 2.2.x directly or indirectly via dependencies. + amazonka = markBroken super.amazonka; apiary-purescript = markBroken super.apiary-purescript; + clac = dontDistribute super.clac; highlighter2 = markBroken super.highlighter2; hypher = markBroken super.hypher; + miniforth = markBroken super.miniforth; purescript = markBroken super.purescript; + xhb-atom-cache = markBroken super.xhb-atom-cache; + xhb-ewmh = markBroken super.xhb-ewmh; yesod-purescript = markBroken super.yesod-purescript; yet-another-logger = markBroken super.yet-another-logger; # https://github.com/frosch03/arrowVHDL/issues/2 ArrowVHDL = markBroken super.ArrowVHDL; -} + # https://ghc.haskell.org/trac/ghc/ticket/9625 + wai-middleware-preprocessor = dontCheck super.wai-middleware-preprocessor; + incremental-computing = dontCheck super.incremental-computing; -// # packages relating to amazonka - -(let - Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; - amazonkaEnv = self: super: { - mkDerivation = drv: super.mkDerivation (drv // { - doCheck = false; - hyperlinkSource = false; - buildTools = (drv.buildTools or []) ++ [ ( - if pkgs.stdenv.lib.elem drv.pname [ - "Cabal" - "time" - "unix" - "directory" - "process" - "jailbreak-cabal" - ] then null else Cabal - ) ]; - }); - mtl = self.mtl_2_2_1; - transformers = self.transformers_0_4_2_0; - transformers-compat = disableCabalFlag super.transformers-compat "three"; - hscolour = super.hscolour; - time = self.time_1_5_0_1; - unix = self.unix_2_7_1_0; - directory = self.directory_1_2_1_0; - process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; }); - inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch amazonka-glacier amazonka-ecs; - }; - amazonka = super.amazonka.overrideScope amazonkaEnv; - amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv; - amazonka-core = super.amazonka-core.overrideScope amazonkaEnv; - amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv; - amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv; - amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv; -in { - inherit amazonkaEnv; - inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier; -}) +} diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 6b2926ef2d2d..faf1ce4046e2 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation ({ name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; prePhases = ["setupCompilerEnvironmentPhase"]; - preConfigurePhases = ["jailbreakPhase" "compileBuildDriverPhase"]; + preConfigurePhases = ["compileBuildDriverPhase"]; preInstallPhases = ["haddockPhase"]; inherit src; @@ -120,7 +120,14 @@ stdenv.mkDerivation ({ propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; + + prePatch = optionalString (editedCabalFile != null) '' + echo "Replacing Cabal file with edited version ${newCabalFile}." + cp ${newCabalFile} ${pname}.cabal + '' + optionalString jailbreak '' + echo "Running jailbreak-cabal to lift version restrictions on build inputs." + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + '' + prePatch; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment @@ -129,7 +136,7 @@ stdenv.mkDerivation ({ export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - packageConfDir="$TMP/package.conf.d" + packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir setupCompileFlags="${concatStringsSep " " setupCompileFlags}" @@ -147,31 +154,15 @@ stdenv.mkDerivation ({ if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi - for d in lib{,64}; do - if [ -d "$p/$d" ]; then - configureFlags+=" --extra-lib-dirs=$p/$d" - fi - done + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi done ghc-pkg --${packageDbFlag}="$packageConfDir" recache runHook postSetupCompilerEnvironment ''; - jailbreakPhase = '' - runHook preJailbreak - - ${optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." - cp ${newCabalFile} ${pname}.cabal - ''}${optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." - ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal - ''} - - runHook postJailbreak - ''; - compileBuildDriverPhase = '' runHook preCompileBuildDriver @@ -286,7 +277,6 @@ stdenv.mkDerivation ({ // optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (prePatch != "") { inherit prePatch; } // optionalAttrs (postPatch != "") { inherit postPatch; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } @@ -300,4 +290,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b53e69619a58..d39ea7b700fe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1748,6 +1748,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "CLI" = callPackage + ({ mkDerivation, base, directory, doctest, split, time }: + mkDerivation { + pname = "CLI"; + version = "0.1.0.0"; + sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall"; + buildDepends = [ base directory split time ]; + testDepends = [ base doctest ]; + description = "CLI tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "CMCompare" = callPackage ({ mkDerivation, array, base, BiobaseInfernal, BiobaseXNA, cmdargs , containers, lens @@ -2026,7 +2038,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Cabal_1_22_1_0" = callPackage + "Cabal_1_22_1_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, extensible-exceptions, filepath, HUnit , pretty, process, QuickCheck, regex-posix, test-framework @@ -2034,8 +2046,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "1.22.1.0"; - sha256 = "19jk3fjvx2rz9czh2kan7pr338ahgq1zvzd85l17clsap5g6lmnj"; + version = "1.22.1.1"; + sha256 = "1m9yyan2f6l2r00f0sibikcj2kdrk313r5lhr20dyiyw2dlm33iy"; buildDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -2159,6 +2171,7 @@ self: { array base colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -2176,6 +2189,7 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2196,6 +2210,7 @@ self: { data-default-class diagrams-core diagrams-lib diagrams-postscript diagrams-svg lens mtl old-locale operational SVGFonts text time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2362,8 +2377,8 @@ self: { ({ mkDerivation, base, cmdargs, parsec }: mkDerivation { pname = "ClustalParser"; - version = "1.0.1"; - sha256 = "0rslkg7hr6j414qpsgmjbrw474bhhrv36ns19smysx7lpkn955w4"; + version = "1.0.2"; + sha256 = "0y1w2lp5kqxb9rp9rarhnqpspa64z02mbhnnvkpagi534mgnx93k"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs parsec ]; @@ -2492,12 +2507,16 @@ self: { }) {}; "ConcurrentUtils" = callPackage - ({ mkDerivation, array, base, containers, mtl, parallel }: + ({ mkDerivation, array, base, binary, bytestring, containers + , network, parallel, process + }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.3.0.0"; - sha256 = "0m3dy21xlmr17aig5mia160rbz9y8ly8mhxvld61jlxhchgdlfrc"; - buildDepends = [ array base containers mtl parallel ]; + version = "0.4.1.0"; + sha256 = "05a5v9g95by4v05zxvjma8hvn5rrvwz0c3r8q0iqqchglljs39xr"; + buildDepends = [ + array base binary bytestring containers network parallel process + ]; homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; license = stdenv.lib.licenses.gpl2; @@ -3974,8 +3993,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "EstProgress"; - version = "0.1.0.0"; - sha256 = "16krghh2x6m0bzwrzgalry5rl9gp7x19w5n00dhbg0q28mk668sv"; + version = "0.2.0.0"; + sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3"; buildDepends = [ base mtl ]; homepage = "http://alkalisoftware.net"; description = "Methods for estimating the progress of functions"; @@ -4098,6 +4117,7 @@ self: { pname = "Euterpea"; version = "1.0.0"; sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds"; + editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd"; buildDepends = [ array arrows base bytestring CCA containers deepseq ghc-prim HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm @@ -4288,8 +4308,8 @@ self: { ({ mkDerivation, base, QuickCheck, template-haskell }: mkDerivation { pname = "FenwickTree"; - version = "0.1.2"; - sha256 = "0kxlz0x4lzkn7xkilpcwpphp5hwr7nq56wh9vmh5zmsyr4adg3zy"; + version = "0.1.2.1"; + sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww"; buildDepends = [ base QuickCheck template-haskell ]; testDepends = [ base QuickCheck template-haskell ]; homepage = "https://github.com/mgajda/FenwickTree"; @@ -4733,6 +4753,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base bimap ]; + jailbreak = true; homepage = "https://github.com/xnil/GGg"; description = "GGg cipher"; license = stdenv.lib.licenses.mit; @@ -4784,8 +4805,8 @@ self: { }: mkDerivation { pname = "GLFW-b"; - version = "1.4.6"; - sha256 = "1d9vacb9nsf5cqqwxhn49wsfbhmw1263kgimk5qxpqpg1jiy35hy"; + version = "1.4.7.2"; + sha256 = "1hjsv6yqkwqi18c1vha105jl56xjvb5dqwqs4bgjkk99qcqq70rd"; buildDepends = [ base bindings-GLFW ]; testDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit @@ -4848,12 +4869,12 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw }: + ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; - version = "1.4.0.2"; - sha256 = "10sy0zag1wfrrq137azv3xazcgs21zb6bp84xzh518qbhiiycjhg"; - buildDepends = [ base OpenGLRaw ]; + version = "1.5.0.0"; + sha256 = "1y3qbq1qaxnylrb86all96xdja1d62adilyyky0glsbl9dqnzr4j"; + buildDepends = [ base OpenGLRaw transformers ]; extraLibraries = [ freeglut mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -4884,11 +4905,11 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.3"; - sha256 = "0r99nv60zkr88nhiz438wy0grcgqz6nwlzbp9aj4jv5bwdiph7j9"; + version = "0.8.5"; + sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; buildDepends = [ - array base bytestring containers cpphs directory filepath - JuicyPixels linear OpenGL OpenGLRaw transformers vector + array base bytestring containers directory filepath JuicyPixels + linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; @@ -5204,6 +5225,7 @@ self: { pname = "Glob"; version = "0.7.5"; sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0"; + editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b"; buildDepends = [ base containers directory dlist filepath transformers ]; @@ -6491,8 +6513,8 @@ self: { ({ mkDerivation, base, hashable, mtl, unordered-containers }: mkDerivation { pname = "HMap"; - version = "1.2.1"; - sha256 = "12dbjjvq7qlr2clbzbhwcbvmwd9amlkwmf55cn46qvvakinv6x2i"; + version = "1.2.3"; + sha256 = "0gxs0l5v2kzgy8lfyz0l3ivv1w6cb8sm30h6yv91np1nvj231nf3"; buildDepends = [ base hashable mtl unordered-containers ]; homepage = "https://github.com/atzeus/HMap"; description = "Fast heterogeneous maps and unconstrained typeable like functionality"; @@ -7250,8 +7272,8 @@ self: { }: mkDerivation { pname = "HaTeX-qq"; - version = "0.0.0.0"; - sha256 = "1frqwgvjbr3pjzm9z98q1wn93q065vg773267p20la3h0ybq10rv"; + version = "0.0.1.1"; + sha256 = "1kjhdg9vm7n07zxgdkmqkgwpf2204hrjwslnyhg8i7f07cd3pdrl"; buildDepends = [ antiquoter base haskell-src-meta HaTeX template-haskell text uniplate @@ -7764,6 +7786,7 @@ self: { version = "5.2.0.16"; sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s"; buildDepends = [ array base containers StateVar transformers ]; + jailbreak = true; homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; @@ -7968,6 +7991,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HostAndPort" = callPackage + ({ mkDerivation, base, doctest, hspec, parsec }: + mkDerivation { + pname = "HostAndPort"; + version = "0.1.0"; + sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8"; + buildDepends = [ base parsec ]; + testDepends = [ base doctest hspec ]; + homepage = "https://github.com/bacher09/hostandport"; + description = "Parser host and port pairs like localhost:22"; + license = stdenv.lib.licenses.mit; + }) {}; + "Hricket" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -8139,11 +8175,11 @@ self: { ({ mkDerivation, base, bytestring, hashtables, syb, utf8-string }: mkDerivation { pname = "HsSyck"; - version = "0.52"; - sha256 = "1hdckbm60pzmydaz4rsw3kz9byd205987jcddakyhmgfinzvqwvc"; + version = "0.53"; + sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf"; buildDepends = [ base bytestring hashtables syb utf8-string ]; description = "Fast, lightweight YAML loader and dumper"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "HsTools" = callPackage @@ -8666,8 +8702,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.2"; - sha256 = "145d47gh7i73blibbw5ka7ii0hahrdksyj8hr4lgkv7f92rmhf8z"; + version = "3.2.3"; + sha256 = "0nfq6c1kgmw1jj20686bp4rf52vpb8qc3whmz3jh0pwk489b2lwm"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -8784,6 +8820,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Kalman" = callPackage + ({ mkDerivation, base, hmatrix }: + mkDerivation { + pname = "Kalman"; + version = "0.1.0.0"; + sha256 = "0l4z7l90s14z24rlzdpl1rh7vjgpk7adbavza6k3144p1an5rfqp"; + buildDepends = [ base hmatrix ]; + homepage = "https://github.com/idontgetoutmuch/Kalman"; + description = "A slightly extended Kalman filter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "KdTree" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -8804,8 +8852,8 @@ self: { }: mkDerivation { pname = "Ketchup"; - version = "0.4.2"; - sha256 = "0kxaz49iz195bbby73cva6c68h9f8f4pk0a8jamcsiyvbx4yw69x"; + version = "0.4.3"; + sha256 = "1f5dnxfch3xrhxbgn74adzj7lalx1fpz3cicnhvvxj2aay62a7d1"; buildDepends = [ base base64-bytestring bytestring directory mime-types network text ]; @@ -9261,9 +9309,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; - version = "0.5.1"; - sha256 = "1hgkal8jh035bs0z6z8i899dc0888fhdx8940y27aaxxbmlzfy1p"; - editedCabalFile = "0fce39feed0d5ae7ea041b886d5440e288b705212b1869beec6419b9c0ca9982"; + version = "0.5.2"; + sha256 = "1b7ar17d2sq6ibgbiqbsrhk2zlxcxiwfv2xsfbya5hs8nflzkp97"; buildDepends = [ base transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "List monad transformer and class"; @@ -9904,15 +9951,16 @@ self: { }) {}; "MonadCompose" = callPackage - ({ mkDerivation, base, ghc-prim, MaybeT, mmorph, monad-products - , mtl, transformers + ({ mkDerivation, base, data-default, ghc-prim, MaybeT, mmorph + , monad-products, mtl, random, transformers }: mkDerivation { pname = "MonadCompose"; - version = "0.5.0.0"; - sha256 = "0vmrfng90bn09sci2vzlhhvvkrbis1hpi9hsba0h8a8b9ac1bjax"; + version = "0.8.2.0"; + sha256 = "1nzb4x8az1m4d5i75cshgjfr4xnkfi3s27rq6jkib9i67my0hsrq"; buildDepends = [ - base ghc-prim MaybeT mmorph monad-products mtl transformers + base data-default ghc-prim MaybeT mmorph monad-products mtl random + transformers ]; homepage = "http://alkalisoftware.net"; description = "Methods for composing monads"; @@ -10142,6 +10190,7 @@ self: { version = "0.1.0.1"; sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb"; buildDepends = [ array base bimap containers Munkres ]; + jailbreak = true; description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -10747,12 +10796,12 @@ self: { winmm = null; winspool = null;}; "ObjectName" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "ObjectName"; - version = "1.0.1.1"; - sha256 = "18bqaqxzafhmnf1r4qc0qnxdiv00i4zis89yinvpwjqbiwlwakda"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg"; + buildDepends = [ base transformers ]; homepage = "https://github.com/svenpanne/ObjectName"; description = "Explicitly handled object names"; license = stdenv.lib.licenses.bsd3; @@ -10928,8 +10977,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "2.10.0.2"; - sha256 = "05w6yvn1bj4p7sqr8qnhabb5qjnigir7sxgf74k0fwk1aniikgys"; + version = "2.11.1.0"; + sha256 = "0fsk5jrap27rzv70q2257jwyrwr4g5qbv7kzi0fblydf7m1nq8hp"; buildDepends = [ base bytestring GLURaw OpenGLRaw text ]; extraLibraries = [ libX11 mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -10950,12 +10999,12 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, mesa }: + ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.3.0.0"; - sha256 = "03hlk0j03a963534swqvagrckl9y2s8hh07a7pczc104nw45jxln"; - buildDepends = [ base ]; + version = "2.4.0.0"; + sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -10979,14 +11028,14 @@ self: { }: mkDerivation { pname = "OpenSCAD"; - version = "0.2.0.0"; - sha256 = "1gg5x50631piay35jifh70nq88av71ar896q9vci65isz9a51yvb"; + version = "0.2.1.0"; + sha256 = "0b451v2sa9gaslhg03y6nyvjwbhwlg2qxwahcj6qpyx4qlmiywnh"; buildDepends = [ base colour filepath ]; testDepends = [ base Cabal colour filepath HUnit test-framework test-framework-hunit ]; - homepage = "https://graphics-openscad.googlecode.com/"; + homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/"; description = "ADT wrapper and renderer for OpenSCAD models"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -11458,18 +11507,19 @@ self: { }) {}; "Plot-ho-matic" = callPackage - ({ mkDerivation, base, Chart, Chart-cairo, containers - , data-default-class, glib, gtk, lens, linear, stm, text, time + ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers + , data-default-class, generic-accessors, glib, gtk, lens, text + , time }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.4.0.4"; - sha256 = "1d6nrhk2wyyii6wwwk1mlxa46sdd6xjghyp3cn6qh1i6dwq7i604"; + version = "0.5.0.3"; + sha256 = "17zn4sqyfl48fp25wicp5vd518wn26g5qn071zhb989imiqbnvmq"; isLibrary = true; isExecutable = true; buildDepends = [ - base Chart Chart-cairo containers data-default-class glib gtk lens - linear stm text time + base cairo Chart Chart-cairo containers data-default-class + generic-accessors glib gtk lens text time ]; description = "Real-time line plotter for protobuf-like data"; license = stdenv.lib.licenses.bsd3; @@ -11850,6 +11900,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_8" = callPackage + ({ mkDerivation, base, containers, random, template-haskell + , test-framework, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.8"; + sha256 = "04xs6mq22bcnkpi616qrbm7jlivh9csnhmvjgp1ifq52an1wr4rx"; + buildDepends = [ + base containers random template-haskell tf-random transformers + ]; + testDepends = [ base containers template-haskell test-framework ]; + jailbreak = true; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -12127,14 +12195,14 @@ self: { }) {}; "Random123" = callPackage - ({ mkDerivation, array, base, HUnit, QuickCheck, random + ({ mkDerivation, array, base, data-dword, HUnit, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "Random123"; - version = "0.1.2"; - sha256 = "1y58rj2c80fv1qv9v0dcrfp8n6n03njr5fkkm4wdb18rp92dydxi"; - buildDepends = [ array base random ]; + version = "0.2.0"; + sha256 = "18q6nf63qapypj10iifpc1qdaq7pndmv2p7jz0f96y113z33nqy4"; + buildDepends = [ array base data-dword random ]; testDepends = [ base HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 @@ -12237,8 +12305,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.5.0.3"; - sha256 = "0yhcshc6hdkny6llxab027ndyshy9ghk5jb86jrzp9rkzd8z965j"; + version = "0.5.1"; + sha256 = "1h3sfgxkr002n4sb0rrc5562mbpwrjndkjl3ab4wfsm5zh6q3gl2"; buildDepends = [ base dlist FontyFruity free JuicyPixels mtl primitive vector vector-algorithms @@ -12270,8 +12338,8 @@ self: { }: mkDerivation { pname = "Redmine"; - version = "0.0.1"; - sha256 = "0ifs2gca5sgmaqrby3fc410n5k357102c8jh3fh77rhdc3m8l8bd"; + version = "0.0.3"; + sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit MissingH network old-locale old-time resourcet text @@ -12566,7 +12634,7 @@ self: { description = "Binding to libSDL-ttf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) SDL2; SDL2_ttf = null;}; + }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "SFML" = callPackage ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network @@ -12731,8 +12799,8 @@ self: { ({ mkDerivation, array, base, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.2"; - sha256 = "1cl5bsc5mr3silcmbjylgw5qa04pf2np9mippxnsa4p3dk089gkh"; + version = "0.3.3"; + sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr"; buildDepends = [ array base mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; @@ -13472,12 +13540,12 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.0.1.1"; - sha256 = "0h2cykrbnq4aq8dmi59mmnagvzz00lfagqx3476y2ygqc7v1iisl"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1"; + buildDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; @@ -14220,6 +14288,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "TypeNat" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "TypeNat"; + version = "0.1.0.0"; + sha256 = "1j5v4kmd3hxzzm6xrhxf2vh7rn3b8n4gzb1yppgvxng06p642snb"; + buildDepends = [ base ]; + homepage = "https://github.com/avieth/TypeNat"; + description = "Some Nat-indexed types for GHC"; + license = stdenv.lib.licenses.mit; + }) {}; + "TypingTester" = callPackage ({ mkDerivation, base, containers, directory, time }: mkDerivation { @@ -14490,6 +14570,18 @@ self: { license = "unknown"; }) {}; + "ViennaRNAParser" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "ViennaRNAParser"; + version = "1.0.1"; + sha256 = "0j4vcbbw0f1khrqna33b1dfs4fadfk53arsj8ndjzcwp0za58ji0"; + editedCabalFile = "312de9a09fbd46cd8785a4761d369ddd022b2589096b857cafa0b4ee610426e0"; + buildDepends = [ base parsec ]; + description = "Libary for parsing ViennaRNA package output"; + license = "GPL"; + }) {}; + "WAVE" = callPackage ({ mkDerivation, base, bytestring, containers, parseargs }: mkDerivation { @@ -14776,10 +14868,9 @@ self: { ({ mkDerivation, base, template-haskell, text, Win32 }: mkDerivation { pname = "Win32-errors"; - version = "0.2.1"; - sha256 = "13rqqk06r3rc9j6j72qcna26lj0r2fbrzys9zgr91knik9msl5di"; + version = "0.2.2"; + sha256 = "158p8130x1dmis08zaqm8zdhdhj0xjdmli5gn2w3f7rsz748rhvw"; buildDepends = [ base template-haskell text Win32 ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/win32-errors"; description = "Alternative error handling for Win32 foreign calls"; license = stdenv.lib.licenses.bsd3; @@ -14804,10 +14895,9 @@ self: { ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { pname = "Win32-junction-point"; - version = "0.2"; - sha256 = "1cbk6d47h83pp77522j55yy90vhi0d1jjb7rd1s98k6422fb316s"; + version = "0.2.1"; + sha256 = "0d2hpzrbcvqfaw6vp03n56k5zjs6kk582hr3pd25j93g3rcyc8mf"; buildDepends = [ base text Win32 Win32-errors ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/Win32-junction-point"; description = "Support for manipulating NTFS junction points"; license = stdenv.lib.licenses.bsd3; @@ -14897,9 +14987,9 @@ self: { ({ mkDerivation, base, boxes, cmdargs }: mkDerivation { pname = "Wordlint"; - version = "0.1.0.2"; - sha256 = "0v3kl5cfwjigrhxw534h628qlzw52w6gd4n6ri8cqjmvkgklr5vp"; - isLibrary = false; + version = "0.2.0.4"; + sha256 = "08d02h4ynkwxqxxqzk8hfmdj9y7rg23biybb969pk0scgvg7iyd5"; + isLibrary = true; isExecutable = true; buildDepends = [ base boxes cmdargs ]; homepage = "https://github.com/gbgar/Wordlint"; @@ -15121,17 +15211,17 @@ self: { }) {}; "Xauth" = callPackage - ({ mkDerivation, base, xau }: + ({ mkDerivation, base, libXau }: mkDerivation { pname = "Xauth"; version = "0.1"; sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs"; buildDepends = [ base ]; - pkgconfigDepends = [ xau ]; + pkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { xau = null;}; + }) { inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -16086,6 +16176,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "acme-miscorder" = callPackage + ({ mkDerivation, base, random }: + mkDerivation { + pname = "acme-miscorder"; + version = "0.1.0.0"; + sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4"; + buildDepends = [ base random ]; + description = "Miscellaneous newtypes for orderings of discutable use"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "acme-missiles" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -16252,8 +16353,8 @@ self: { }: mkDerivation { pname = "active"; - version = "0.1.0.17"; - sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb"; + version = "0.1.0.18"; + sha256 = "1q2j7mx8a3mwsb809iyrr2d66bwn4na3y7hmisy6dq8jx4ajfrbk"; buildDepends = [ array base newtype semigroupoids semigroups vector-space ]; @@ -16611,6 +16712,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-casing" = callPackage + ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck + , tasty-th + }: + mkDerivation { + pname = "aeson-casing"; + version = "0.1.0.0"; + sha256 = "0mlgrs6rb9vz67ggyrc51z1bm4586m6gwx54wg9dp8qb8jv3pknr"; + buildDepends = [ aeson base ]; + testDepends = [ + aeson base tasty tasty-hunit tasty-quickcheck tasty-th + ]; + description = "Tools to change the formatting of field names in Aeson instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-lens" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, lens, text , unordered-containers, vector @@ -17112,6 +17229,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "al" = callPackage + ({ mkDerivation, base, c2hs, openal }: + mkDerivation { + pname = "al"; + version = "0.1.1.3"; + sha256 = "09ppkvzkka3c5hiawkz7lcrwp6sa8bhbg10m9hfp9rk4g9339czy"; + buildDepends = [ base ]; + buildTools = [ c2hs ]; + extraLibraries = [ openal ]; + homepage = "http://github.com/phaazon/al"; + description = "OpenAL 1.1 raw API."; + license = stdenv.lib.licenses.bsd3; + }) { inherit (pkgs) openal;}; + "alarmclock" = callPackage ({ mkDerivation, base, stm, time, unbounded-delays }: mkDerivation { @@ -17680,8 +17811,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "0.3.0"; - sha256 = "0zjdd50rhkhb31y1c65wqggc1dgvl9ycxkr8hnqgsvq4q1nz0hn1"; + version = "0.3.2"; + sha256 = "1vyy8gsj31zxjnphzw1y3ylxdzxsgxx034a0s6i1g8vpqpf59n8a"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph @@ -17698,8 +17829,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.0"; - sha256 = "1kp82bkcmpigidppb2a7isxjl9kls76csd85q4aym50apzhfvmqr"; + version = "0.3.2"; + sha256 = "11rx798qdqqk67djrfaknw3z7z5gf2m0ahi0nh4icgfljv8hzcda"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -17711,8 +17842,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.0"; - sha256 = "1rxdlygbr423f4g6y5aizv3anpcyq56nx3yp5363v3k9xi96dnzq"; + version = "0.3.2"; + sha256 = "0bbymf4cmlfp812nyk9y648hg8d2j57kf31g46w2a0rg4157rwqh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -17724,8 +17855,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.0"; - sha256 = "02b09208amcv91jcc8lmznbjvvf1bgz9cp3vc9f1s69mb4b09azr"; + version = "0.3.2"; + sha256 = "1lcl16j4wk19gf3i4jhh85jx4gx3lhacfd4yzrp54ycsgy689y7p"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -17737,8 +17868,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.0"; - sha256 = "0hjx5cxpf7wmz7pyc4ry7g8khp40f1i4fx366c7va48cmw42zkjl"; + version = "0.3.2"; + sha256 = "0ss8raa4dvzz55x23kb7lrfgjkr0hrp7k6khbjpwp7ff2kk9yvwb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -17750,8 +17881,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.0"; - sha256 = "0kgrgc6l901y5vf6z8has0610cd29k6x3iicb3pwpq00vamiq1b4"; + version = "0.3.2"; + sha256 = "06as3a91061wy6wxd5ci37aisgghfm1w4k40id8b65yh8i0xwjd9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -17763,8 +17894,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.0"; - sha256 = "09xalcrw56wbba86ibhjkxpcmj4sdxkfzxy2s2n0i9zb0nk4asfw"; + version = "0.3.2"; + sha256 = "1zyf8w88r5827i2l1x29kanqhmq8glgx01739g7hlya5hd30lv4y"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -17776,8 +17907,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.0"; - sha256 = "1pzaqavz86h9a44gyby5qxjh5sikc105kh2kkpa6h3lhvpp4ka59"; + version = "0.3.2"; + sha256 = "1a3zj57nik0ffayq99y0pn8aqsvhdsi3fc4ynfkn9x0yxhgxx0kz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -17789,8 +17920,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.0"; - sha256 = "1xbqcid23k6y6b48fv4p3clbzd1inbm47lwyqyakxgk1ch6bgpzp"; + version = "0.3.2"; + sha256 = "1l6rz3zvnsfym54bs2s1njrpf9rj1s7rdhli5d2yacj7kabb1hlz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17801,8 +17932,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.0"; - sha256 = "00qlqrdzlljqy8cdi52qwxq3jxqh9rzif8pbz5r9ps3zw1ris1q7"; + version = "0.3.2"; + sha256 = "1yr0xp1camsw7qapnp5w9jlrg8zy275n3izhl5i8z1wc5wln229d"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -17814,8 +17945,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.0"; - sha256 = "12bqpl3xvf9sk2aldxpjr98131j56yyjzwy01pynr9pid132c3a1"; + version = "0.3.2"; + sha256 = "038n7290q9a1hsk0k832q3a782x053jfmh1j6ydk8c245q807544"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -17827,8 +17958,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.0"; - sha256 = "1v07fb55rc80w0pddryvn2qnxsd7g2j6rjpmydrflg3090jq8zbf"; + version = "0.3.2"; + sha256 = "094j0m4kjijz6ihr7q4jklnb8gmyrqgk1bxw1z94xqb3s60fwy9c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -17840,8 +17971,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.0"; - sha256 = "16cv000pmp9n0312sp9wnsj7h2z23w6657r0gi1q4z9xqwj4nkkz"; + version = "0.3.2"; + sha256 = "1z9p672zwiihaj83wv1wpvqj70m9795pay44qps4as1xcb1skwc4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -17853,8 +17984,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.0"; - sha256 = "1znrz1gp52fv8qjyzlbygxcn10w687bakrczixcvwqnrw3krsi25"; + version = "0.3.2"; + sha256 = "0ha6adx6m27dmh6dxyha7kk344190hd151rp1lcihchhsnr283hk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -17873,8 +18004,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "0.3.0"; - sha256 = "1pgxap976rc5sfqd1cy3092r6ckfnjswk44gccfy2rcxn0cxvmsj"; + version = "0.3.2"; + sha256 = "0byp43084jinc8pabplcmjr1spkx5gy666rwpl7xxmzcqlacdjzi"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra @@ -17883,7 +18014,7 @@ self: { transformers unordered-containers vector xml-conduit ]; testDepends = [ - aeson base tasty tasty-hunit template-haskell text time + aeson base tasty tasty-hunit template-haskell text ]; jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; @@ -17895,8 +18026,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.0"; - sha256 = "1q69c2chhnkz9sajcy6cpbzc3dlnq5fi7qppf63lfa3291a7pkpl"; + version = "0.3.2"; + sha256 = "0hxgzdbv8fc0rl00afny3j1ka2fib98bamjphfdrjkb6ic37a2mx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -17908,8 +18039,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.0"; - sha256 = "0cvainbvqb2b9kn8l1jm6rvc16hwd8nd91bz46sm6r4i30yv0848"; + version = "0.3.2"; + sha256 = "1nby1qs901k8xc3ykpvi1097b92bcd5c9l3d0sx7dci6i4hnbqlf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -17921,8 +18052,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.0"; - sha256 = "1wyslkbj7jkz8y72djfwa9gknjxwckpm8k369slhqsrj3z0yhi3k"; + version = "0.3.2"; + sha256 = "08034a5nwcja147rkc0bsgmcj33xv1w6cvz7fpyi4jwip1ffngr9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -17934,8 +18065,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.0"; - sha256 = "1ip5x1g6khnywmr0l0naswl02j1s35hxmklra07hz86v6zrlnxhh"; + version = "0.3.2"; + sha256 = "1x5xqlk0gh9ac2721j444nzz98q749mvkwhdgb476hi6lmc7g9gn"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -17947,8 +18078,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.0"; - sha256 = "0wm7si0yvn3xh5ad6ycz181yjqlil1l056asw73c8yxfy3g3n0q6"; + version = "0.3.2"; + sha256 = "02w1zxcs7sz5xgdpr3iq5yd1d3w15rkjnkcqyxhkbgwcv6w4c2zc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -17959,8 +18090,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.0"; - sha256 = "0s97ssb4bgkc5ahrjm5dbydnjp7k3sqms1885d978bfnsmrrc91l"; + version = "0.3.2"; + sha256 = "1a743l0hr7mb337xw3ql7mg4256w0w5c2vss12al9kzpnrgi2lh3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -17972,8 +18103,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.0"; - sha256 = "02mznpghvzz6inf918dzv3cdid3yamnxfbq136aah97j8vzcj0g1"; + version = "0.3.2"; + sha256 = "16g5v9y3y9wdxiw5cw3z8i4b67y1acvz74d1qdk7by1s2smb4dkf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -17985,8 +18116,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.0"; - sha256 = "0kbh30rz2zx7zw5sh32806g3kr19ijhp71c5wi07i1j949r2ixss"; + version = "0.3.2"; + sha256 = "1mymjy2dq4dz1r7yllgxdpbyddg7x7pvaarl395dffrapgqkh0n2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -17998,8 +18129,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.0"; - sha256 = "14wvh8r63q5kyyfhh0nh5sq29wn19dy6kjj62k8ysph54bm7d7i2"; + version = "0.3.2"; + sha256 = "0jxa9c8y9i1rffxfb2wrpb1fv6niplj2mwwc591k74c99ynjwj6i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18011,8 +18142,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.0"; - sha256 = "09f3yclyg0hjqybkpfi61wrsfvxa7mlcai8il3maya78sbrz8bj9"; + version = "0.3.2"; + sha256 = "1n6q77riz31xqk5qywiqs75avwdni1d9x9955jgs8s1phk48654c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18024,8 +18155,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.0"; - sha256 = "1gj17z7k63a0cdqhjn6f4ylawa8hv5b45hrdqw103fn13qn860hr"; + version = "0.3.2"; + sha256 = "1cphxr7a60z18zh543nva7v18zh05r4iircfbgifj98w33gvcvqd"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18036,8 +18167,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.0"; - sha256 = "0lch80bl2p5c78qqam1hwffslzdnqwc5paiyja70z41n4cf9zw9d"; + version = "0.3.2"; + sha256 = "1v869rmqbihn1314nd1ryqpgrwfxicnjh7i41zbn5hq60c4xkn4z"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18049,8 +18180,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.0"; - sha256 = "0kbsnbwnlxxnn58mwr7pkqc6jzkwlryq3h7vmzgvnm2xa0gv9vrp"; + version = "0.3.2"; + sha256 = "03bzizq6mchxk79gqnp8v4avw4alyccd51ks3wl2ljgq0ywl41xs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18062,8 +18193,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.0"; - sha256 = "157ayynhc847hc2mk14hkcxbx0z15r5ymfykhf909qwv6js70xs4"; + version = "0.3.2"; + sha256 = "16gqc9d9s3fz2qs1l4b4wjylsyl2p7ncyfibadkp8an6bfdylx31"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18075,8 +18206,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.0"; - sha256 = "00psl8hffvgbl2zl24pfp7lrhis5j971cvyrazr4vgr43iss3ww4"; + version = "0.3.2"; + sha256 = "10xjddl0mwpkcgz9ydy0lvmwpg3d3hb7kliqsqvfwlqgslhvhs18"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18087,8 +18218,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.0"; - sha256 = "0il89vnwywqisfl4lyibjfi1ihpxba58drbvag4x5rf19nw1glc1"; + version = "0.3.2"; + sha256 = "0i4cy5x7br58lmzndx4x8mj81xkwx50nf1r8cszbjwjpml6fc2pz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18100,8 +18231,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.0"; - sha256 = "07gz564x624jzh7yca4vkla770ly1781kyj5qg70qs3k4kf2b7gm"; + version = "0.3.2"; + sha256 = "0xgj4r8zj0f2wmmpr63p3dlgfvgr5lmd43ngn5ignkmha6m6lcys"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18113,8 +18244,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.0"; - sha256 = "1bzxim2mafgb3gaxzj7vx04w4b1cljywwf3vyq9gn3p9i3dc2qh2"; + version = "0.3.2"; + sha256 = "0p73yn82pd0i1wi98vfy9kndf1ax0c3wza30nj6dra5xl4jnl73p"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18126,8 +18257,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.0"; - sha256 = "1x5dbzdqrkdf47fixqajb13lqh9j5zpb1src45pszjgy1pnf9zkc"; + version = "0.3.2"; + sha256 = "0w75vc1khlncfx82mcbpp41c8svjm7yy7si0p5rqi6cvx0an1k2v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18139,8 +18270,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.0"; - sha256 = "1pb5f2yl640kikqz83arwcnjxz5abwpx04klnp6ypay7sxnpl0sq"; + version = "0.3.2"; + sha256 = "0gsfgkcdprqanjfgcw4lj77b4fvhlq47h636kh87yvjg70migyrx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18152,8 +18283,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.0"; - sha256 = "15sk43545qbnh4r3chm44fxsjr1rjjafhqc8pmy0p08r45v82bf2"; + version = "0.3.2"; + sha256 = "0kzhn1mdk79a8vn0kj5jk5w0vfywh89bf5khjv08m3qwwdyb0mnw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -18165,8 +18296,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.0"; - sha256 = "0akkfj6yzjpfgrpzi2mscv03hdhv3ym8vslms17xdp5f9ydba0wv"; + version = "0.3.2"; + sha256 = "0ws7dy9bnv7qx43mx6s1lkj4z1r3v7b0pph6kl3s5q60s1f9qr64"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -18178,8 +18309,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.0"; - sha256 = "10vm8jr7ljkmpa8xwn96262jf2i8cb3c1cxw0dagry101im7wxdg"; + version = "0.3.2"; + sha256 = "1im0lzgxzxxpb6dmigp9vcwwk79bs9m9y3lhcjn7bcspql426c7a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -18191,8 +18322,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.0"; - sha256 = "1vmwkjb37w2jgrvfhj3mx3z6h3q52jkqh3c2fkc27a9q5jyi43p5"; + version = "0.3.2"; + sha256 = "0l9v7kagssnzg1f4w63q4dza5gyxlm3v6hrjcspdlaxw695vn7j8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -18204,8 +18335,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.0"; - sha256 = "1njvanj7bw0r4l1fhg7nq89sz8sx9cahxjwczr7ab3cf7a03ndra"; + version = "0.3.2"; + sha256 = "1crlyx87j5iw7dvjngnrqqhkx24f0zd48l2cz37ldqymrsfn7kqb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -18217,8 +18348,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.0"; - sha256 = "06786g4mdy58ca1hdwi6dfa3xlkzf2la8x7c8zqyf6848a573yb1"; + version = "0.3.2"; + sha256 = "1mr2ra4857j4n4lpf5zlrqxmvf5adk6l0ycbwah4cypd3ki7b7l6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -18226,12 +18357,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-ssm" = callPackage + ({ mkDerivation, amazonka-core, base }: + mkDerivation { + pname = "amazonka-ssm"; + version = "0.3.2"; + sha256 = "0hb35i65j2zl6v1y3drd2kacg5ahvl14isx1f8b7a1k48l90qccn"; + buildDepends = [ amazonka-core base ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Simple Systems Management Service SDK"; + license = "unknown"; + }) {}; + "amazonka-storagegateway" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.0"; - sha256 = "1d75q42z3yvwdav95na5xdxssk4zjgbr77fs1j63x1991p0ar06c"; + version = "0.3.2"; + sha256 = "08c74hniznflx7xvlk41r2aym1h3xal68lbr2r0qlmh846pfyiqa"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -18243,8 +18386,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.0"; - sha256 = "1xxkch0n5f89s7qqv14vfichv5ldlx6qk8gwzccqvf1wxwcgpbhc"; + version = "0.3.2"; + sha256 = "0sq6ws9qyga1giiv2pkfgfaigni5k33mzq3k1psliwjxscxcjknw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -18256,8 +18399,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.0"; - sha256 = "0c5fh50qyr8wfl7031x4gksablp3g9kyj6phjpxndzy6hh4cfim2"; + version = "0.3.2"; + sha256 = "1j3vwpjmmlv3c4n4jrgj2vvvcirky1ja7grv5ax790i5p0ll0iw8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -18269,8 +18412,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.0"; - sha256 = "0s60jgyps1mgaa0kqpi7acqss8j1wn2mjrp8rl69ivarhsyh0ijh"; + version = "0.3.2"; + sha256 = "18yh9saqjfcn8cjprjqiybgkvxq6hc8q8b6njsh61s6ycdnh0yx8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -18307,8 +18450,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.12.1"; - sha256 = "0s1v64b0m7xv7nrjmfpamfj40vh7cl9l5z7ccilbry5y4qacpsv9"; + version = "0.12.2"; + sha256 = "07nk8xxpkdh9w19rwwc87h2vbhfam339czkvyrmx7jh2dp51pnag"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18374,6 +18517,7 @@ self: { base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; + jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -18796,8 +18940,8 @@ self: { }: mkDerivation { pname = "api-builder"; - version = "0.4.0.0"; - sha256 = "1vkk47nq0w6v4gv35s8vy7hmsj1hswxqvbrgnnyzp0y9w74h4nl5"; + version = "0.5.0.0"; + sha256 = "1lf70k7cb90jzj3nz31d17zbgsmi3fg3lwzdh9fqkjclhgk3al8y"; buildDepends = [ aeson attoparsec base bifunctors bytestring either HTTP http-conduit http-types text transformers @@ -18842,30 +18986,28 @@ self: { "apiary" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, bytestring-lexing, case-insensitive - , data-default-class, exceptions, hashable, http-date, http-types - , HUnit, mime-types, monad-control, mtl, process, QuickCheck - , stringsearch, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck, text, time - , transformers, transformers-base, unix-compat + , bytestring, bytestring-read, case-insensitive, data-default-class + , exceptions, hashable, http-date, http-types, HUnit, mime-types + , monad-control, mtl, process, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time, transformers + , transformers-base, types-compat, unix-compat , unordered-containers, vault, wai, wai-extra, web-routing }: mkDerivation { pname = "apiary"; - version = "1.3.0"; - sha256 = "1d182rqrkkp76hhq71rlh7plrcnnarhhzwm21619p7yw781dfcjy"; - editedCabalFile = "a33e324c2280f4b84405bd625f6fb6b281352bc6c4dab01275b8a62114b0da16"; + version = "1.4.2"; + sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring - bytestring-lexing case-insensitive data-default-class exceptions + bytestring-read case-insensitive data-default-class exceptions hashable http-date http-types mime-types monad-control mtl process stringsearch template-haskell text time transformers - transformers-base unix-compat unordered-containers vault wai - web-routing + transformers-base types-compat unix-compat unordered-containers + vault wai web-routing ]; testDepends = [ - base bytestring http-types HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck wai wai-extra + base bytestring http-types HUnit mtl tasty tasty-hunit + tasty-quickcheck wai wai-extra ]; jailbreak = true; homepage = "https://github.com/philopon/apiary"; @@ -18877,17 +19019,16 @@ self: { ({ mkDerivation, apiary, apiary-session, authenticate, base , blaze-builder, bytestring, cereal, data-default-class , http-client, http-client-tls, http-types, monad-control - , resourcet, text, wai, web-routing + , resourcet, text, types-compat, wai, web-routing }: mkDerivation { pname = "apiary-authenticate"; - version = "1.3.0"; - sha256 = "00ayjrkp8zdil6pc0prxv39l8rw44c225k85vnp3681qsb76am55"; - editedCabalFile = "c97a06886c850111b3fa48e7000077c71b1198b9c4458e0bca77abd69673e12f"; + version = "1.4.0"; + sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; buildDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types - monad-control resourcet text wai web-routing + monad-control resourcet text types-compat wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; @@ -18901,8 +19042,8 @@ self: { }: mkDerivation { pname = "apiary-clientsession"; - version = "1.3.0"; - sha256 = "158zhcgrxgwn8ljh93qlls71wdfbd8081214cfmxb9k41l927y55"; + version = "1.4.0"; + sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; buildDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -18914,17 +19055,17 @@ self: { "apiary-cookie" = callPackage ({ mkDerivation, apiary, base, blaze-builder, blaze-html - , bytestring, cookie, time, wai, web-routing + , bytestring, cookie, time, types-compat, wai, web-routing }: mkDerivation { pname = "apiary-cookie"; - version = "1.3.0"; - sha256 = "1y152d92ksz64iqgv2ck4s4dxlpmg72gfk9yq6f2wx0axjwm16nm"; - editedCabalFile = "cc3edd1f078c168eae05bc559a1ff96077e3d2ae158b081909ac7c9f7fe051c6"; + version = "1.4.0"; + sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; buildDepends = [ - apiary base blaze-builder blaze-html bytestring cookie time wai - web-routing + apiary base blaze-builder blaze-html bytestring cookie time + types-compat wai web-routing ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -18934,9 +19075,8 @@ self: { ({ mkDerivation, apiary, base, blaze-builder, wai-extra }: mkDerivation { pname = "apiary-eventsource"; - version = "1.3.0"; - sha256 = "192bhk54z1gw9r9gnws19z8b81i0v163vb2s09alad8c7v5d8ksp"; - editedCabalFile = "ba4f13a331bfe4d0330e022352bba6878191a90eca5407971a2de4bb6f14c6c5"; + version = "1.4.0"; + sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; buildDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -18945,15 +19085,16 @@ self: { "apiary-helics" = callPackage ({ mkDerivation, apiary, base, bytestring, data-default-class - , helics, helics-wai, monad-control, text, transformers, vault, wai + , helics, helics-wai, monad-control, text, transformers + , types-compat, vault, wai }: mkDerivation { pname = "apiary-helics"; - version = "1.3.0"; - sha256 = "04wbh5hn0ycr2mp4b3y9na61k26rd3y10724xwssfxjmk3lnh2bn"; + version = "1.4.0"; + sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a"; buildDepends = [ apiary base bytestring data-default-class helics helics-wai - monad-control text transformers vault wai + monad-control text transformers types-compat vault wai ]; homepage = "https://github.com/philopon/apiary"; description = "helics support for apiary web framework"; @@ -18964,16 +19105,18 @@ self: { "apiary-logger" = callPackage ({ mkDerivation, apiary, base, data-default-class, fast-logger , lifted-base, monad-control, monad-logger, transformers - , transformers-base + , transformers-base, types-compat }: mkDerivation { pname = "apiary-logger"; - version = "1.3.0"; - sha256 = "01kljhlkp6kdwbl4mxgvjd9h6iwrxkbgkik0wpv3rgzizacls1c3"; + version = "1.4.0"; + sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base + types-compat ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -18981,15 +19124,15 @@ self: { "apiary-memcached" = callPackage ({ mkDerivation, apiary, base, bytestring, data-default-class - , memcached-binary, monad-control, text, transformers + , memcached-binary, monad-control, text, transformers, types-compat }: mkDerivation { pname = "apiary-memcached"; - version = "1.3.0"; - sha256 = "11niagwak3qr493nq9h35px54qj5hn199ra97h99959hhh0d9gfa"; + version = "1.4.0"; + sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby"; buildDepends = [ apiary base bytestring data-default-class memcached-binary - monad-control text transformers + monad-control text transformers types-compat ]; homepage = "https://github.com/philopon/apiary"; description = "memcached client for apiary web framework"; @@ -18999,15 +19142,15 @@ self: { "apiary-mongoDB" = callPackage ({ mkDerivation, apiary, base, bson, data-default-class , lifted-base, monad-control, mongoDB, resource-pool, text, time - , transformers + , transformers, types-compat }: mkDerivation { pname = "apiary-mongoDB"; - version = "1.3.0"; - sha256 = "14k9b2cq0s3v4n4akyn4n65kcim02j5dki40zckf0754mxyh2ghi"; + version = "1.4.0"; + sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; buildDepends = [ apiary base bson data-default-class lifted-base monad-control - mongoDB resource-pool text time transformers + mongoDB resource-pool text time transformers types-compat ]; homepage = "https://github.com/philopon/apiary"; description = "mongoDB support for apiary web framework"; @@ -19017,15 +19160,16 @@ self: { "apiary-persistent" = callPackage ({ mkDerivation, apiary, apiary-logger, base, monad-control , monad-logger, persistent, resource-pool, resourcet, transformers - , transformers-base, web-routing + , transformers-base, types-compat, web-routing }: mkDerivation { pname = "apiary-persistent"; - version = "1.3.0"; - sha256 = "0mr86mx3fplcbapgasi6famz16b0svzvn92bssdisfcqvs43ki8a"; + version = "1.4.0"; + sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; buildDepends = [ apiary apiary-logger base monad-control monad-logger persistent - resource-pool resourcet transformers transformers-base web-routing + resource-pool resourcet transformers transformers-base types-compat + web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; @@ -19034,15 +19178,16 @@ self: { "apiary-purescript" = callPackage ({ mkDerivation, apiary, base, bytestring, data-default-class - , filepath, Glob, parsec, purescript, text, unordered-containers + , filepath, Glob, parsec, purescript, text, transformers + , types-compat, unordered-containers }: mkDerivation { pname = "apiary-purescript"; - version = "1.3.1"; - sha256 = "1pc8w90d3cnyrabgmn7ns1mf3pgzsvib5zq9c54926xavhb1h6nq"; + version = "1.4.0"; + sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz"; buildDepends = [ apiary base bytestring data-default-class filepath Glob parsec - purescript text unordered-containers + purescript text transformers types-compat unordered-containers ]; homepage = "https://github.com/philopon/apiary"; description = "purescript compiler for apiary web framework"; @@ -19050,12 +19195,12 @@ self: { }) {}; "apiary-session" = callPackage - ({ mkDerivation, apiary, base, wai, web-routing }: + ({ mkDerivation, apiary, base, types-compat, wai, web-routing }: mkDerivation { pname = "apiary-session"; - version = "1.3.0"; - sha256 = "0sw33mbivb5849rsl1x5fbbh17is867l0n1f0vyrxrgpbvb58zi1"; - buildDepends = [ apiary base wai web-routing ]; + version = "1.4.0"; + sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; + buildDepends = [ apiary base types-compat wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -19067,8 +19212,8 @@ self: { }: mkDerivation { pname = "apiary-websockets"; - version = "1.3.0"; - sha256 = "0kb4vjksdwr4p9qmbi7h0if4czdbp9mb2kb8xjgprdsn3wx13wzj"; + version = "1.4.0"; + sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; buildDepends = [ apiary base wai-websockets web-routing websockets ]; @@ -19189,6 +19334,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "applicative-fail" = callPackage + ({ mkDerivation, base, bifunctors }: + mkDerivation { + pname = "applicative-fail"; + version = "0.0.3"; + sha256 = "057ii1519qwjhg64vahbg2z2a4ydb2ndd1bjzz6cb1cx3n7nigr8"; + buildDepends = [ base bifunctors ]; + homepage = "https://bitbucket.org/s9gf4ult/applicative-fail"; + description = "Applicative functor which collects all your fails"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "applicative-numbers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -19577,12 +19734,11 @@ self: { pname = "arithmoi"; version = "0.4.1.1"; sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "d12980bee5be68b204594ee91c026599ec930613be6c05106ea27d93d96c0433"; + editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - jailbreak = true; homepage = "https://bitbucket.org/dafis/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; @@ -19602,12 +19758,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "array_0_5_0_0" = callPackage + "array_0_5_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.0.0"; - sha256 = "0rknkp9c6cxf63adx7xam655d509aja9wim1r37j4905ywan0y8a"; + version = "0.5.1.0"; + sha256 = "18hz1jcshdj6c10lsxq86rs6rbx77g91w4ay2s58h9j5rnkchjxq"; buildDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -19798,20 +19954,22 @@ self: { }) {}; "ascii-progress" = callPackage - ({ mkDerivation, ansi-terminal, async, base, data-default, hspec - , MissingH, time + ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit + , data-default, hspec, HTTP, http-conduit, http-types, QuickCheck + , time, transformers }: mkDerivation { pname = "ascii-progress"; - version = "0.1.0.3"; - sha256 = "1cnszfaidak1gywcivjzzraaqdbz074mc8709qnr1clpqzhkszsp"; + version = "0.2.1.1"; + sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal async base data-default MissingH time + ansi-terminal async base bytestring conduit data-default HTTP + http-conduit http-types time transformers ]; testDepends = [ - ansi-terminal async base data-default hspec MissingH time + ansi-terminal async base data-default hspec QuickCheck time ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; @@ -19865,6 +20023,7 @@ self: { base containers filepath FontyFruity JuicyPixels lens linear mtl optparse-applicative rasterific-svg svg-tree text vector ]; + jailbreak = true; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -20264,8 +20423,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.3.0.1"; - sha256 = "1j8x28d2n5ivyrxs35ka2sahnj9d94izr2sihhgppjcgsnm93c8m"; + version = "0.4.0.0"; + sha256 = "0m74k68sx2zdyn1wjc344v18cnpbkvzy9r4lvf9cm0h2vsjrlgrq"; buildDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -20791,6 +20950,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "auto" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , profunctors, random, semigroups, transformers + }: + mkDerivation { + pname = "auto"; + version = "0.2.0.4"; + sha256 = "1a2sz8snlxc7jgqs33vgczi1k4m4ssixq5xxgzclv0sz050cigh9"; + buildDepends = [ + base bytestring cereal containers deepseq profunctors random + semigroups transformers + ]; + jailbreak = true; + homepage = "https://github.com/mstksg/auto"; + description = "Denotative, locally stateful programming DSL & platform"; + license = stdenv.lib.licenses.mit; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21136,8 +21313,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.2.0.3"; - sha256 = "16djyvzdmqssfsn97sjzmnq592bzxva4jsjdmxlp6yryqr8ciji3"; + version = "0.3.0.1"; + sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21458,11 +21635,41 @@ self: { mmap mtl pipes pipes-interleave transformers vector ]; testDepends = [ base binary containers pipes QuickCheck ]; + jailbreak = true; homepage = "http://github.com/bgamari/b-tree"; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; }) {}; + "b9" = callPackage + ({ mkDerivation, aeson, async, base, bifunctors, binary, bytestring + , conduit, conduit-extra, ConfigFile, directory, filepath, hspec + , hspec-expectations, mtl, old-locale, optparse-applicative, parsec + , pretty, pretty-show, process, QuickCheck, random, semigroups, syb + , template, text, time, transformers, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "b9"; + version = "0.4.0"; + sha256 = "0cwx7irpzbl1g3wi4fcdjrkv2968517gljyvc9w8vm6f81wr2xcb"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async base bifunctors binary bytestring conduit conduit-extra + ConfigFile directory filepath mtl old-locale optparse-applicative + parsec pretty pretty-show process QuickCheck random semigroups syb + template text time transformers unordered-containers vector yaml + ]; + testDepends = [ + aeson base bytestring hspec hspec-expectations QuickCheck + semigroups text unordered-containers vector yaml + ]; + homepage = "https://github.com/sheyll/b9-vm-image-builder"; + description = "A tool and library for building virtual machine images"; + license = stdenv.lib.licenses.mit; + }) {}; + "babylon" = callPackage ({ mkDerivation, array, base, containers, random, wx, wxcore }: mkDerivation { @@ -21769,8 +21976,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text, time }: mkDerivation { pname = "barecheck"; - version = "0.2.0.6"; - sha256 = "0avz5pdnvd3kjgp9swpdfxddp60gqpamwd7j4xl8xdj3b2di5zk0"; + version = "0.2.0.8"; + sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7"; buildDepends = [ base containers QuickCheck text time ]; homepage = "http://github.com/massysett/barecheck"; description = "QuickCheck implementations for common types"; @@ -21811,6 +22018,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "barrier" = callPackage + ({ mkDerivation, base, blaze-svg, bytestring, lens-family-core + , tasty, tasty-golden, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "barrier"; + version = "0.1.0"; + sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base blaze-svg bytestring template-haskell text + unordered-containers + ]; + testDepends = [ + base bytestring lens-family-core tasty tasty-golden + ]; + homepage = "https://github.com/philopon/barrier"; + description = "Shield.io style badge generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "barrier-monad" = callPackage ({ mkDerivation, base, comonad, mtl, transformers }: mkDerivation { @@ -22021,8 +22250,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.3.11"; - sha256 = "05nbaba4ww24x326dd1x1r94yv9jl9r5hys2qg5qkyzldpzqndl6"; + version = "0.3.11.1"; + sha256 = "057sq6jm8vskw9d9maqc6a85x45lslyiw3j1q7kaczl3851zaxl3"; buildDepends = [ base bytestring containers hashable lifted-base ReadArgs safe system-filepath text transformers unordered-containers vector @@ -22036,8 +22265,8 @@ self: { ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { pname = "basic-sop"; - version = "0.1.0.3"; - sha256 = "1nigmdnfxbzfi2qyih6rz3q8xymk5rglm4772xrsphv6cszifcbd"; + version = "0.1.0.4"; + sha256 = "0gyg6801lwchksd5xvfjy45ygi7ah1z49gq7a485cjn5b7hpbxfh"; buildDepends = [ base deepseq generics-sop QuickCheck text ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -22409,8 +22638,8 @@ self: { }: mkDerivation { pname = "bet"; - version = "0.1.2.0"; - sha256 = "1jpdy8p27nfwpinlbzbfy77nyf867qcjl96dzdw9q67b76v4gxc0"; + version = "0.1.2.2"; + sha256 = "1sk8sgfcywxr54g25ah978k0d1x263mzi69zbx5wk67bs4sqvmds"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22569,8 +22798,8 @@ self: { ({ mkDerivation, base, semigroupoids, semigroups, tagged }: mkDerivation { pname = "bifunctors"; - version = "4.2"; - sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6"; + version = "4.2.1"; + sha256 = "0zy4lz08r60h8lgrf67zqqrcslrnbmdi254ydv5mw69z57nnx3ng"; buildDepends = [ base semigroupoids semigroups tagged ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; @@ -22705,23 +22934,23 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "bimap"; - version = "0.2.4"; - sha256 = "1ib54plfsxzmf9wbbdayfdsrcx4s5ffna3ca5ps928fy78wsx4fr"; + version = "0.3.0"; + sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1"; buildDepends = [ base containers ]; - homepage = "http://code.haskell.org/bimap"; + homepage = "https://github.com/joelwilliamson/bimap"; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; }) {}; - "binary_0_7_3_0" = callPackage + "binary_0_7_4_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, filepath, HUnit, QuickCheck, random, test-framework , test-framework-quickcheck2 }: mkDerivation { pname = "binary"; - version = "0.7.3.0"; - sha256 = "0pv6zd1k3axn3dd7cva6pc1jrmkszgrzwqk6ck3gcl841fj4l4xz"; + version = "0.7.4.0"; + sha256 = "0zpyg1m5ihpdlglddnprxhx3pql0h866x5mz4qzfn7ppma6ahccb"; buildDepends = [ array base bytestring containers ]; testDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -23106,23 +23335,25 @@ self: { }) { esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext - , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework - , test-framework-hunit + ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor + , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm + , mesa, test-framework, test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; - version = "3.0.3.3"; - sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4"; + version = "3.1.1.2"; + sha256 = "1r9nny6873nzk8ij53byqad0hfni8f1ysrajm430867pizvyfj50"; buildDepends = [ base bindings-DSL ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; extraLibraries = [ - libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa + libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr + libXxf86vm mesa ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXfixes; inherit (pkgs.xlibs) libXi; + }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; + inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; + inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs) mesa;}; @@ -23583,8 +23814,8 @@ self: { }: mkDerivation { pname = "bindings-nettle"; - version = "0.1.1"; - sha256 = "1cd2yya6qhcx6vxsjdrlzkrj4k5nd15bz8fnkhhl2vm6r1w9jzq4"; + version = "0.2"; + sha256 = "1pk2gwd5wbs1bhna5npwrzrvd6cxss8sbigsa8lsqsarh8mbd5sr"; buildDepends = [ base bindings-DSL ]; testDepends = [ base bytestring hspec HUnit QuickCheck quickcheck-io @@ -24502,6 +24733,7 @@ self: { version = "0.1.0.0"; sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw"; buildDepends = [ base blaze-html text ]; + jailbreak = true; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; license = stdenv.lib.licenses.mit; @@ -24519,15 +24751,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-builder_0_4_0_0" = callPackage + "blaze-builder_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , text, utf8-string }: mkDerivation { pname = "blaze-builder"; - version = "0.4.0.0"; - sha256 = "0xhxz2g7hgp892n8qcq7iw136fv2csw9aaq8123srs05z9j1lcfk"; + version = "0.4.0.1"; + sha256 = "1id3w33x9f7q5m3xpggmvzw03bkp94bpfyz81625bldqgf3yqdn1"; buildDepends = [ base bytestring deepseq text ]; testDepends = [ base bytestring HUnit QuickCheck test-framework @@ -24587,14 +24819,15 @@ self: { }: mkDerivation { pname = "blaze-html"; - version = "0.7.1.0"; - sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja"; + version = "0.8.0.0"; + sha256 = "05afa3g9fbr0hnw8x794d7s8vzr0il9lkc2w67ks7hli78wl1y5b"; buildDepends = [ base blaze-builder blaze-markup bytestring text ]; testDepends = [ base blaze-builder blaze-markup bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24654,13 +24887,14 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.6.3.0"; - sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll"; + version = "0.7.0.0"; + sha256 = "0ifjf6n7hzcc11g3lhwdmzxs2qa3va7snn5m7i948gbffpkkr3pp"; buildDepends = [ base blaze-builder bytestring text ]; testDepends = [ base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24670,8 +24904,8 @@ self: { ({ mkDerivation, base, blaze-markup, mtl }: mkDerivation { pname = "blaze-svg"; - version = "0.3.4"; - sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3"; + version = "0.3.4.1"; + sha256 = "1bfxl2jwr622kgf4gz4gqpdrvscciqpfyzy6qad8j7w633xg8vrp"; buildDepends = [ base blaze-markup mtl ]; homepage = "https://github.com/deepakjois/blaze-svg"; description = "SVG combinator library"; @@ -24757,6 +24991,7 @@ self: { base bliplib bytestring containers filepath language-python mtl old-time parseargs pretty ]; + jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Python to bytecode compiler"; license = stdenv.lib.licenses.bsd3; @@ -24902,6 +25137,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blunt" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , haskell-src-exts, http-types, transformers, wai, warp + }: + mkDerivation { + pname = "blunt"; + version = "0.0.7"; + sha256 = "01hm0349qzam2ygsdhcg55kgzh6gk22m6hrjb6lk5gqsn6xsdf4w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + array base bytestring containers haskell-src-exts http-types + transformers wai warp + ]; + description = "Point-free Haskell as a service"; + license = stdenv.lib.licenses.mit; + }) {}; + "bmp" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -25138,18 +25391,12 @@ self: { }) {}; "boundingboxes" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, random - , test-framework, test-framework-quickcheck2, test-framework-th - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "boundingboxes"; - version = "0.2.2"; - sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx"; + version = "0.2.3"; + sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; buildDepends = [ base lens ]; - testDepends = [ - base lens linear QuickCheck random test-framework - test-framework-quickcheck2 test-framework-th - ]; homepage = "https://github.com/fumieval/boundingboxes"; description = "A generic boundingbox for an arbitrary vector"; license = stdenv.lib.licenses.bsd3; @@ -25276,6 +25523,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "broccoli" = callPackage + ({ mkDerivation, base, containers, stm, time }: + mkDerivation { + pname = "broccoli"; + version = "0.4.1.0"; + sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh"; + buildDepends = [ base containers stm time ]; + description = "Small library for interactive functional programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bsd-sysctl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -25425,8 +25683,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.0.2"; - sha256 = "0dj7hy7l4prl4xq1j26rsjcj9m5xrq57c9qxw4rhpgdh910d81i5"; + version = "0.2.2.2"; + sha256 = "1mqia6rjnz5as8qv780yhxn7iyw2bxh5fx2d83x7assr6vn2489w"; buildDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -25447,8 +25705,8 @@ self: { }: mkDerivation { pname = "buffer-builder-aeson"; - version = "0.2.0.0"; - sha256 = "0g6578sw3794xgjvi22blqzwwsv18l7vq26l2q27h8xyv5knbpnm"; + version = "0.2.0.3"; + sha256 = "0i8jv5w016m8az6g809mf54wbkz1dci5w4c7w94rxl2xhsx7q98p"; buildDepends = [ aeson base buffer-builder bytestring integer-gmp scientific unordered-containers vector @@ -25488,10 +25746,9 @@ self: { ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { pname = "buildable"; - version = "0.1.0.2"; - sha256 = "1p9xi5ms7rxgzn5jxv5nv8bynyfb9ll952k0j7di5s7zbga8v1pg"; + version = "0.1.0.3"; + sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx"; buildDepends = [ base bytestring containers dlist text ]; - jailbreak = true; description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; }) {}; @@ -25777,9 +26034,9 @@ self: { }: mkDerivation { pname = "bytes"; - version = "0.14.1.3"; - sha256 = "18pbn7qz93hwkdlbdld2mh91hki1smbcz0gsn6d816gr7whf1fhx"; - editedCabalFile = "320ebe39de8e091a9a043c59a0f7b44fdaf9b7306bbc299cc9552aa2a31093be"; + version = "0.15"; + sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; + editedCabalFile = "94dc3ad697fbfd70c7cf77a2e0c9bf4307a0f396012738537b931fc3b4e58386"; buildDepends = [ base binary bytestring cereal containers mtl text time transformers transformers-compat void @@ -25829,8 +26086,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq }: mkDerivation { pname = "bytestring-builder"; - version = "0.10.4.1.1"; - sha256 = "13dajygfpqxl1w875lj9asyhbzz0psi4lk73wiwll41p8brlrjrn"; + version = "0.10.4.1.2"; + sha256 = "0gp0ymz551qhxx3n3lxjhrr1fwcyd2qpn2y690k8qi6nc09sn14y"; buildDepends = [ base bytestring deepseq ]; description = "The new bytestring builder, packaged outside of GHC"; license = stdenv.lib.licenses.bsd3; @@ -25991,6 +26248,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-read" = callPackage + ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck + , types-compat + }: + mkDerivation { + pname = "bytestring-read"; + version = "0.2.0"; + sha256 = "08622w2n7aphnv5wyisd5bz7r4nbyb1f86f4g1yia0r3x687sp5a"; + buildDepends = [ base bytestring types-compat ]; + testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; + homepage = "https://github.com/philopon/bytestring-read"; + description = "fast ByteString to number converting library"; + license = stdenv.lib.licenses.mit; + }) {}; + "bytestring-rematch" = callPackage ({ mkDerivation, base, bytestring, hspec, HUnit, rematch }: mkDerivation { @@ -26207,8 +26479,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.23.1"; - sha256 = "1vzng536z711hvv0ln40d863hwi103iywkhdsziy62nmxdq1afy5"; + version = "0.24.1"; + sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26301,6 +26573,7 @@ self: { base directory filepath Glob process tasty tasty-golden ]; buildTools = [ cabal-install ]; + jailbreak = true; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26322,6 +26595,7 @@ self: { unordered-containers ]; testDepends = [ base filepath tasty tasty-golden ]; + jailbreak = true; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26349,8 +26623,8 @@ self: { }: mkDerivation { pname = "cabal-db"; - version = "0.1.11"; - sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7"; + version = "0.1.12"; + sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26363,23 +26637,22 @@ self: { }) {}; "cabal-debian" = callPackage - ({ mkDerivation, base, Cabal, containers, data-default, data-lens - , data-lens-template, debian, deepseq, Diff, directory, filepath - , hsemail, HUnit, memoize, mtl, network-uri, parsec, pretty - , prettyclass, process, pureMD5, regex-tdfa, set-extra, syb, text - , unix, Unixutils, utf8-string + ({ mkDerivation, base, Cabal, containers, data-default, debian + , deepseq, Diff, directory, filepath, hsemail, HUnit, lens, memoize + , mtl, network-uri, parsec, pretty, prettyclass, process, pureMD5 + , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string }: mkDerivation { pname = "cabal-debian"; - version = "4.23.1"; - sha256 = "06m0lr2jxgnwidk9q8ix5bm6s1dc9kgxfb27fdvchi7ikj9gnzia"; + version = "4.24.3"; + sha256 = "0vhsdnjhrh2i78ncn7jmqszr0zha1ib1ja2xxsamgnz0zps0aiwx"; isLibrary = true; isExecutable = true; buildDepends = [ - base Cabal containers data-default data-lens data-lens-template - debian deepseq Diff directory filepath hsemail HUnit memoize mtl - network-uri parsec pretty prettyclass process pureMD5 regex-tdfa - set-extra syb text unix Unixutils utf8-string + base Cabal containers data-default debian deepseq Diff directory + filepath hsemail HUnit lens memoize mtl network-uri parsec pretty + prettyclass process pureMD5 regex-tdfa set-extra syb text unix + Unixutils utf8-string ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; @@ -26485,6 +26758,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-helper" = callPackage + ({ mkDerivation, base, bytestring, Cabal, data-default, directory + , filepath, mtl, process, template-haskell, temporary, transformers + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.2.0.0"; + sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring Cabal data-default directory filepath mtl process + template-haskell temporary transformers + ]; + description = "Simple interface to Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl @@ -26496,6 +26787,7 @@ self: { pname = "cabal-install"; version = "1.22.0.1"; sha256 = "1j0h1m963kimkk07aag57bgalscly0mhcwgzm7zzxymzsbssibw7"; + editedCabalFile = "85c5296e1b0aff3717c9ce62e98a8b9b6d5509e55f76cd80ae7179269c46592c"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26588,6 +26880,7 @@ self: { version = "0.4.4"; sha256 = "13gggbbzcq5allf2b76rgxmilrzkvvr3srshfpzh4xavdlm8wmch"; buildDepends = [ base Cabal lens unordered-containers ]; + jailbreak = true; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -27134,8 +27427,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.0.6"; - sha256 = "0wwwk43ri3dgvzwpdfj1mdls714kll81c2jad0p84q0w9mrkqdax"; + version = "0.13.1.0"; + sha256 = "0vi7glzizi2nvv0p5wsdxlpkx3f1875jpij26k2j4h0h6z53z3kb"; buildDepends = [ array base bytestring mtl text utf8-string ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ cairo ]; @@ -27272,18 +27565,15 @@ self: { }) {}; "calculator" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, parsec - , QuickCheck - }: + ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }: mkDerivation { pname = "calculator"; - version = "0.2.2.0"; - sha256 = "18v58sgbx1g5bir0vwgbhfs347p95f36jw3fqj4nfzs5na0rrrvz"; + version = "0.3.0.1"; + sha256 = "067rnx1ixdnhqan2kwscqh6325ml523km7dg2apx1ksm51hl3gvc"; isLibrary = false; isExecutable = true; - buildDepends = [ base containers haskeline mtl parsec QuickCheck ]; - testDepends = [ base containers mtl parsec QuickCheck ]; - jailbreak = true; + buildDepends = [ base containers haskeline parsec ]; + testDepends = [ base containers parsec QuickCheck ]; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl"; license = stdenv.lib.licenses.gpl2; @@ -27329,25 +27619,24 @@ self: { }) {}; "call" = callPackage - ({ mkDerivation, base, bindings-portaudio, boundingboxes - , clean-unions, colors, containers, control-bool, deepseq - , directory, distributive, filepath, free, freetype2, GLFW-b - , hashable, JuicyPixels, JuicyPixels-util, lens, linear, mtl - , objective, OpenGL, OpenGLRaw, random, template-haskell, text - , transformers, vector, WAVE + ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors + , containers, control-bool, deepseq, directory, filepath, free + , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens + , linear, mtl, objective, OpenGL, OpenGLRaw, random + , template-haskell, text, transformers, vector, WAVE }: mkDerivation { pname = "call"; - version = "0.1.4"; - sha256 = "0z249qixxh9vs3dh1z3nxr9mwvjdd3g37zrqv4r2f584vrlmn27l"; + version = "0.1.4.2"; + sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g"; isLibrary = true; isExecutable = true; buildDepends = [ - base bindings-portaudio boundingboxes clean-unions colors - containers control-bool deepseq directory distributive filepath - free freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util lens - linear mtl objective OpenGL OpenGLRaw random template-haskell text - transformers vector WAVE + base bindings-portaudio boundingboxes colors containers + control-bool deepseq directory filepath free freetype2 GLFW-b + hashable JuicyPixels JuicyPixels-util lens linear mtl objective + OpenGL OpenGLRaw random template-haskell text transformers vector + WAVE ]; jailbreak = true; homepage = "https://github.com/fumieval/call"; @@ -27571,8 +27860,8 @@ self: { }: mkDerivation { pname = "cartel"; - version = "0.14.2.0"; - sha256 = "0pxscg5rcp1b9inbwjqhspb7z18ykwgr026zaqshk3z9rkclwbx7"; + version = "0.14.2.2"; + sha256 = "0ikf0jhiaqagd4ycq9szs4vy7yq7ai31yzcj8f0a6i3j6j4cr8nx"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; @@ -27586,16 +27875,17 @@ self: { }) {}; "casadi-bindings" = callPackage - ({ mkDerivation, base, casadi, casadi-bindings-core - , casadi-bindings-internal, containers, linear, vector + ({ mkDerivation, base, binary, casadi, casadi-bindings-core + , casadi-bindings-internal, cereal, containers, linear, vector + , vector-binary-instances }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.5"; - sha256 = "0i3ly7zcy8qhgkid2zw982dmb6fh7b48q0qmc8fjj4yji6v1jka3"; + version = "2.2.0.8"; + sha256 = "131r3l1psacb3mps02mqc4vjdghn2w5jwz2j6khr7w6bk13qlpj0"; buildDepends = [ - base casadi-bindings-core casadi-bindings-internal containers - linear vector + base binary casadi-bindings-core casadi-bindings-internal cereal + containers linear vector vector-binary-instances ]; pkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; @@ -27767,16 +28057,17 @@ self: { "cassandra-cql" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, cryptohash - , Decimal, MonadCatchIO-transformers, mtl, network, stm, text, time - , uuid + , Decimal, hslogger, MonadCatchIO-transformers, mtl, network + , resource-pool, stm, text, time, uuid }: mkDerivation { pname = "cassandra-cql"; - version = "0.4.0.1"; - sha256 = "0055vvnyqa8n5fma8kk0mxbyv6xnzqvdi6lpnk888c0xh2mqqv5m"; + version = "0.5.0.1"; + sha256 = "0n1w1hriscrjky3d4qwzzm3p41yg9gvnxyq9sfm3kb7lijc4xj2d"; buildDepends = [ - base bytestring cereal containers cryptohash Decimal - MonadCatchIO-transformers mtl network stm text time uuid + base bytestring cereal containers cryptohash Decimal hslogger + MonadCatchIO-transformers mtl network resource-pool stm text time + uuid ]; description = "Haskell client for Cassandra's CQL protocol"; license = stdenv.lib.licenses.bsd3; @@ -27803,8 +28094,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.2.1"; - sha256 = "1vza24ikj3ixryh2hf2xj28m1zjclqq9lsxp57pwzjx31djkb54s"; + version = "0.4.2.2"; + sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq ghc-prim text unordered-containers vector @@ -28129,6 +28420,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ceilometer-common" = callPackage + ({ mkDerivation, base, bimap, binary, bytestring, containers + , data-ordlist, foldl, hspec, lens, lens-properties, mtl, pipes + , QuickCheck, siphash, template-haskell, text, transformers + , vaultaire-common + }: + mkDerivation { + pname = "ceilometer-common"; + version = "0.2.2"; + sha256 = "01lvjyl884i6qcfxr7xj42g5spn1fx3jgcq1g8zv0b5y9jwpj7lr"; + buildDepends = [ + base bimap binary bytestring containers foldl lens pipes siphash + template-haskell text vaultaire-common + ]; + testDepends = [ + base bimap binary bytestring containers data-ordlist foldl hspec + lens lens-properties mtl pipes QuickCheck siphash template-haskell + text transformers vaultaire-common + ]; + homepage = "https://github.com/anchor/ceilometer-common"; + description = "Common Haskell types and encoding for ceilometer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cellrenderer-cairo" = callPackage ({ mkDerivation, base, c2hs, cairo, glib, gtk, mtl }: mkDerivation { @@ -28450,6 +28765,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "chalk" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "chalk"; + version = "0.1.0.0"; + sha256 = "09apxk27s6j8ciq3d2zxhr70ihm9s79zhc2pyg1xb220h6p55swk"; + buildDepends = [ base ]; + homepage = "http://github.com/joom/chalk"; + description = "Terminal string styling"; + license = stdenv.lib.licenses.mit; + }) {}; + "chalkboard" = callPackage ({ mkDerivation, array, base, binary, bytestring, Codec-Image-DevIL , containers, data-reify, directory, GLUT, OpenGLRaw, process, time @@ -28595,22 +28922,23 @@ self: { buildDepends = [ base Chart colour data-default-class lens vector ]; + jailbreak = true; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; }) {}; "chaselev-deque" = callPackage ({ mkDerivation, abstract-deque, abstract-deque-tests, array - , atomic-primops, base, bits-atomic, containers, ghc-prim, HUnit - , test-framework, test-framework-hunit, transformers, vector + , atomic-primops, base, containers, ghc-prim, HUnit, test-framework + , test-framework-hunit, transformers, vector }: mkDerivation { pname = "chaselev-deque"; - version = "0.5.0.3"; - sha256 = "1qkrypqsbfnr6kcl6idqmq2z4nf6jmqmgzddzhh031nxd22p18y6"; + version = "0.5.0.5"; + sha256 = "1x2301faqkchkzrvbnganly341jilvg1fmx6lazgbs98cbazhn2d"; buildDepends = [ - abstract-deque array atomic-primops base bits-atomic ghc-prim - transformers vector + abstract-deque array atomic-primops base ghc-prim transformers + vector ]; testDepends = [ abstract-deque abstract-deque-tests array atomic-primops base @@ -28711,6 +29039,7 @@ self: { aeson base blaze-html bytestring containers data-default http-types mtl syb text uniplate wai wai-extra xss-sanitize ]; + jailbreak = true; homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; @@ -28817,8 +29146,8 @@ self: { ({ mkDerivation, array, attoparsec, base, bytestring, containers }: mkDerivation { pname = "chesshs"; - version = "0.2.0"; - sha256 = "1v9qhnknqn8bsxzdcwskhssmmhbrr0d1rrxqm6ssf6j2jvv3diay"; + version = "0.2.1"; + sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv"; buildDepends = [ array attoparsec base bytestring containers ]; homepage = "http://arnovanlumig.com/chesshs.html"; description = "Simple library for validating chess moves and parsing PGN files"; @@ -29230,24 +29559,44 @@ self: { "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , hexpat, hs-bibutils, HTTP, json, mtl, network, old-locale - , pandoc-types, parsec, syb, time, utf8-string + , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri + , old-locale, pandoc-types, parsec, syb, time, utf8-string }: mkDerivation { pname = "citeproc-hs"; - version = "0.3.9"; - sha256 = "0f3l33a3rcp8lm8nkbda42lijjpaqa7cxszswhjryy1inywpsssg"; + version = "0.3.10"; + sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r"; buildDepends = [ base bytestring containers directory filepath hexpat hs-bibutils - HTTP json mtl network old-locale pandoc-types parsec syb time - utf8-string + HTTP json mtl network network-uri old-locale pandoc-types parsec + syb time utf8-string ]; - homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; + homepage = "http://istitutocolli.org/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "citeproc-hs-pandoc-filter" = callPackage + ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers + , directory, filepath, mtl, pandoc, pandoc-types, parsec, tagsoup + , texmath, utf8-string, yaml + }: + mkDerivation { + pname = "citeproc-hs-pandoc-filter"; + version = "0.1"; + sha256 = "1kwsmwm0yxvqdxxr7x13hmq4nm8a9plmsfkwbvfp13bbd4mwcxnj"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base bytestring citeproc-hs containers directory filepath mtl + pandoc pandoc-types parsec tagsoup texmath utf8-string yaml + ]; + homepage = "http://istitutocolli.org/repos/citeproc-hs-pandoc-filter/"; + description = "A Pandoc filter for processing bibliographic references with citeproc-hs"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "cityhash" = callPackage ({ mkDerivation, base, bytestring, largeword, QuickCheck , test-framework, test-framework-quickcheck2 @@ -29284,17 +29633,17 @@ self: { }) {}; "clac" = callPackage - ({ mkDerivation, base, containers, optparse-applicative, plailude - , pretty-tree, safe, split + ({ mkDerivation, base, containers, dsp, optparse-applicative + , plailude, pretty-tree, safe, split }: mkDerivation { pname = "clac"; - version = "0.4.0"; - sha256 = "1p9gjdcwknls6p488bi00g1zfpbizg854c5636n0xzk8iapcap4x"; + version = "0.5.0"; + sha256 = "1ajah3ma4ms2y2kg4wkasjycsqz728n6chx1lm1r3xaiv17akya8"; isLibrary = false; isExecutable = true; buildDepends = [ - base containers optparse-applicative plailude pretty-tree safe + base containers dsp optparse-applicative plailude pretty-tree safe split ]; description = "Simple CLI RPN calculator"; @@ -29304,27 +29653,27 @@ self: { "clafer" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, executable-path, filepath - , ghc, glpk-hs, HaXml, HTTP, HUnit, json-builder, lens, MaybeT, mtl - , network, parsec, process, QuickCheck, split, string-conversions - , tasty, tasty-hunit, tasty-th, text, transformers + , ghc, HaXml, HTTP, HUnit, json-builder, lens, lens-aeson, mtl + , network, network-uri, parsec, process, QuickCheck, split + , string-conversions, tasty, tasty-hunit, tasty-th, text + , transformers }: mkDerivation { pname = "clafer"; - version = "0.3.8"; - sha256 = "1ws7mmfa3xq2vxcva55ib0d6biz9n50ri10jljv839kw8f9ilv36"; + version = "0.3.9"; + sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base bytestring cmdargs containers data-stringmap - directory executable-path filepath glpk-hs HaXml HTTP json-builder - lens MaybeT mtl network parsec process split string-conversions - text transformers + directory executable-path filepath HaXml HTTP json-builder lens + lens-aeson mtl network network-uri parsec process split + string-conversions text transformers ]; testDepends = [ - base containers directory filepath ghc HaXml HUnit lens mtl - QuickCheck tasty tasty-hunit tasty-th + base containers data-stringmap directory filepath ghc HaXml HUnit + lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; - jailbreak = true; homepage = "http://clafer.org"; description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -29339,8 +29688,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.3.8"; - sha256 = "1c6dhjg9g59gvcy1hzq3by9qbrab2x4nm06k0d4n2kss15zpn4xf"; + version = "0.3.9"; + sha256 = "1nbrdxq7ynwj6ms76ayl84bb9j9yjmy3qdfdd8w810php95jrkgx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29360,16 +29709,16 @@ self: { "claferwiki" = callPackage ({ mkDerivation, base, clafer, containers, directory, gitit - , MissingH, mtl, network, process, SHA, split, time, transformers - , utf8-string + , MissingH, mtl, network, network-uri, process, SHA, split, time + , transformers, utf8-string }: mkDerivation { pname = "claferwiki"; - version = "0.3.8"; - sha256 = "1qljiwzgq3cm6q9f35nd86am29crxvplbhd4y0zz4zfrq13yf0sd"; + version = "0.3.9"; + sha256 = "05fz0ps2k6g9298jk8y69wjhvfpcidkc3c9g083snylm2cl0dax3"; buildDepends = [ - base clafer containers directory gitit MissingH mtl network process - SHA split time transformers utf8-string + base clafer containers directory gitit MissingH mtl network + network-uri process SHA split time transformers utf8-string ]; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; @@ -29414,62 +29763,111 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, containers, directory, filepath, ghc, ghc-paths - , hashable, haskeline, lens, mtl, process, text, transformers - , unbound, unix, unordered-containers + , clash-prelude, clash-systemverilog, clash-vhdl, containers + , directory, filepath, ghc, hashable, haskeline, lens, mtl, process + , text, transformers, unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.4.1"; - sha256 = "0s6q7xld7v673r7bsr2sj64gdlfrzkf46ginqrcr2dmvbiwkkjrk"; + version = "0.5"; + sha256 = "0nkk1k96yg4lpwn7axdm8xnsc3b389839c0gxgavvqlhdz7hkkcj"; isLibrary = false; isExecutable = true; buildDepends = [ - array base bifunctors bytestring clash-lib clash-prelude containers - directory filepath ghc ghc-paths hashable haskeline lens mtl - process text transformers unbound unix unordered-containers + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-vhdl containers directory filepath ghc + hashable haskeline lens mtl process text transformers + unbound-generics unix unordered-containers ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring - , concurrent-supply, containers, contravariant, deepseq, directory - , errors, fgl, filepath, hashable, lens, ListLike, mtl, pretty - , process, template-haskell, text, time, transformers, unbound - , unordered-containers, uu-parsinglib, wl-pprint-text + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text }: mkDerivation { pname = "clash-lib"; - version = "0.4.1"; - sha256 = "001jldfwbfl3cvsqkd2q9qhpdv0najagzvzz94rx6jf4wal9dsx1"; + version = "0.5"; + sha256 = "17wpqs99w7mrwxky1jrq3gm012w4y40zb2i8d4qsk25dkhkkw1ng"; buildDepends = [ aeson attoparsec base bytestring concurrent-supply containers - contravariant deepseq directory errors fgl filepath hashable lens - ListLike mtl pretty process template-haskell text time transformers - unbound unordered-containers uu-parsinglib wl-pprint-text + deepseq directory errors fgl filepath hashable lens mtl pretty + process template-haskell text time transformers unbound-generics + unordered-containers uu-parsinglib wl-pprint-text ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude" = callPackage ({ mkDerivation, base, data-default, ghc-prim, integer-gmp - , template-haskell, th-lift + , singletons, template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.6.0.1"; - sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7"; + version = "0.7"; + sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; buildDepends = [ - base data-default ghc-prim integer-gmp template-haskell th-lift + base data-default ghc-prim integer-gmp singletons template-haskell + th-lift ]; homepage = "http://christiaanb.github.io/clash2/"; description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-prelude-quickcheck" = callPackage + ({ mkDerivation, base, clash-prelude, containers, mtl, QuickCheck + }: + mkDerivation { + pname = "clash-prelude-quickcheck"; + version = "0.1.0.0"; + sha256 = "0rn02hf5vj4yirh13y9h2jh2818lhchpabg5v6yqhngdj8rxys34"; + buildDepends = [ base clash-prelude containers mtl QuickCheck ]; + jailbreak = true; + description = "QuickCheck instances for various types in the CλaSH Prelude"; + license = "unknown"; + }) {}; + + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.5"; + sha256 = "1vmwrazyipq0ab3dvnbdzv9y7apr7fw8m4zdb4ligair8x3g2fbr"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.5"; + sha256 = "1wh2fwyaxl33a38yxqz7vd23inakmad7zxg18y56ln5fb50hz4r5"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; }) {}; "classify" = callPackage @@ -29503,20 +29901,20 @@ self: { ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl - , old-locale, primitive, QuickCheck, semigroups, stm - , system-filepath, text, time, transformers, unordered-containers - , vector, vector-instances + , mutable-containers, old-locale, primitive, QuickCheck, semigroups + , stm, system-filepath, text, time, transformers + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "classy-prelude"; - version = "0.10.4"; - sha256 = "1704y72zhpacs9hsab7kf4vhkj6bla988faz9w49v2xkw2zmdyz6"; + version = "0.10.5"; + sha256 = "1s9hydjs7x522w9hgrxjzx1d2zir80g140y4vdqd7mizv0yzisy3"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers enclosed-exceptions exceptions ghc-prim hashable lifted-base - mono-traversable mtl old-locale primitive semigroups stm - system-filepath text time transformers unordered-containers vector - vector-instances + mono-traversable mtl mutable-containers old-locale primitive + semigroups stm system-filepath text time transformers + unordered-containers vector vector-instances ]; testDepends = [ base containers hspec QuickCheck transformers unordered-containers @@ -29533,8 +29931,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.10.4"; - sha256 = "0a4ll08p7wpw2m7pxy8vnac54ihmmzrg01527zzbp0wf2csz2x79"; + version = "0.10.5"; + sha256 = "1dy9jj260hn571z1wdm0v5zpgalwgij99clmh541b41h6pjbism2"; buildDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet system-fileio transformers void @@ -29554,8 +29952,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.10.4"; - sha256 = "0dbw0wxbliixky8rxbc7641np4hda76n6q3p8yfmlw4xvx8j0nvl"; + version = "0.10.5"; + sha256 = "0phaczjsn3blca3y6cwnqwhd9wrl7im1r2kh4i6a83c9kirsa5cx"; buildDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -29848,6 +30246,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cless" = callPackage + ({ mkDerivation, base, highlighting-kate, optparse-applicative + , process, terminfo, wl-pprint-extras, wl-pprint-terminfo + }: + mkDerivation { + pname = "cless"; + version = "0.3.0.0"; + sha256 = "16v2hj2qxw7ij8aqhbx11fs4ss62d4d0jwi4mk0kc76yfdwl61hg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base highlighting-kate optparse-applicative process terminfo + wl-pprint-extras wl-pprint-terminfo + ]; + homepage = "https://github.com/tanakh/cless"; + description = "Colorized LESS"; + license = stdenv.lib.licenses.mit; + }) {}; + "clevercss" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -30190,6 +30607,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clustering" = callPackage + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, primitive, split, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "clustering"; + version = "0.1.1"; + sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + buildDepends = [ + base binary containers matrices mwc-random primitive vector + ]; + testDepends = [ + base binary hierarchical-clustering mwc-random split tasty + tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; + license = stdenv.lib.licenses.mit; + }) {}; + "clustertools" = callPackage ({ mkDerivation, base, bio, bytestring, containers, QuickCheck , regex-compat, simpleargs @@ -30241,6 +30678,18 @@ self: { license = "unknown"; }) {}; + "cmark" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "cmark"; + version = "0.3.0.1"; + sha256 = "1n73ya2r5dbsadmx9y6l931k7nhppqa69qqyv15pnm3w7823njj8"; + buildDepends = [ base mtl text ]; + homepage = "https://github.com/jgm/commonmark-hs"; + description = "Fast, accurate CommonMark (Markdown) parser and renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmath" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -30594,18 +31043,18 @@ self: { "colada" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers - , fclabels, ghc-prim, ListZipper, monad-atom, mtl, split, swift-lda - , text, vector + , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores + , split, swift-lda, text, vector }: mkDerivation { pname = "colada"; - version = "0.8.0.0"; - sha256 = "09a1izl99w532ldfma2zxhn6f1lsbisf3p0hy0dqkyyip01pcd8n"; + version = "0.8.4.0"; + sha256 = "16inmr2hp2racg85crrpwd45p1wgjhcp7w242nixc8dlwdy1lkz3"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cereal cmdargs containers fclabels ghc-prim - ListZipper monad-atom mtl split swift-lda text vector + ListZipper monad-atom mtl nlp-scores split swift-lda text vector ]; jailbreak = true; homepage = "https://bitbucket.org/gchrupala/colada"; @@ -30683,6 +31132,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "collection-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "collection-json"; + version = "0.1.0.0"; + sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; + buildDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/danchoi/collection-json.hs"; + description = "Collection+JSON hypermedia type tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "collections" = callPackage ({ mkDerivation, array, base, bytestring, containers, QuickCheck }: mkDerivation { @@ -30753,8 +31214,8 @@ self: { ({ mkDerivation, base, lens, linear, profunctors }: mkDerivation { pname = "colors"; - version = "0.3.0.1"; - sha256 = "0fnqcgix6d9y3yvkzakkw3xkqxbpqg1kffalxsr8g144qzvfbzax"; + version = "0.3.0.2"; + sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; buildDepends = [ base lens linear profunctors ]; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; @@ -30988,8 +31449,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.2"; - sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8"; + version = "4.2.5"; + sha256 = "07ilryqgvnkr4vmifg0dncgzmx87i2fbfbgrgc3jn1yz808s7wqf"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -31776,8 +32237,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.0"; - sha256 = "1q4iq9wmiazv743gdypqc9797z1c0gdk1lzyzvlk4811ka263508"; + version = "1.1.7.1"; + sha256 = "1qpqjcqy44l92s21aivd2gvb7zz574102mld19a44w0n3yxvljx3"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -31871,6 +32332,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "configifier" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, containers, hspec, hspec-discover, mtl + , pretty-show, QuickCheck, regex-easy, safe, scientific + , string-conversions, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "configifier"; + version = "0.0.2"; + sha256 = "0k7gbkj9cz4rgicnllfh99i3d53qqwddysns0q3xwvvgv50ps8h3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring case-insensitive containers mtl pretty-show + regex-easy safe string-conversions text unordered-containers vector + yaml + ]; + testDepends = [ + aeson aeson-pretty base case-insensitive hspec hspec-discover + pretty-show QuickCheck scientific string-conversions + unordered-containers vector + ]; + jailbreak = true; + description = "parser for config files, shell variables, command line args"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "configuration" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -32105,8 +32593,8 @@ self: { ({ mkDerivation, base, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.1.0.0"; - sha256 = "02vsadayxch5dl77jl4dpk36zj4wpkgrpwlad3swk8dyfqyf4jfk"; + version = "0.2.0.0"; + sha256 = "1mh61gfydh068qws3r52rbnw30ihi9k88wklx8p18j43c7jngamx"; buildDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -32245,6 +32733,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "context-free-grammar" = callPackage + ({ mkDerivation, array, base, containers, control-monad-omega + , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "context-free-grammar"; + version = "0.0.1"; + sha256 = "11xns7rfxb9s9adzkd2v1s46s8lay6yd32r83p63k96z570ccpj2"; + buildDepends = [ + array base containers control-monad-omega dlist mtl pretty + template-haskell + ]; + testDepends = [ + base containers HUnit pretty QuickCheck quickcheck-properties + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "http://github.com/nedervold/context-free-grammar"; + description = "Basic algorithms on context-free grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "context-stack" = callPackage ({ mkDerivation, base, classy-prelude, mtl, unordered-containers }: mkDerivation { @@ -32327,16 +32840,15 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, semigroups, transformers + ({ mkDerivation, base, semigroups, StateVar, transformers , transformers-compat, void }: mkDerivation { pname = "contravariant"; - version = "1.2.0.1"; - sha256 = "06jyaxwv9dgpbrifdig9g6bgf6rmmjwhzhfb61rzkhmvm4dkm346"; - editedCabalFile = "dd01fca687e4bd5a1c6d4408f70f7863228155a7d7db2cdd0c20fec264d638a0"; + version = "1.3"; + sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; buildDepends = [ - base semigroups transformers transformers-compat void + base semigroups StateVar transformers transformers-compat void ]; homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; @@ -32387,15 +32899,15 @@ self: { }: mkDerivation { pname = "control-monad-exception"; - version = "0.11.1"; - sha256 = "1lzv5xggc7nyw62jq9plc3lzg06yx3sbd9jzji0pc6xcbqn2m4qn"; + version = "0.11.2"; + sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p"; buildDepends = [ base failure lifted-base monad-control monadloc transformers transformers-base ]; homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -33273,8 +33785,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "0.13.0"; - sha256 = "0194xdpv3q8gyczanhi4p819ms79n1x69n5q481ilw90i9hdh8kd"; + version = "0.13.1"; + sha256 = "18vnwncpf18076bjqajrh6n0pkr9bmpcspf7v0s31df1lm6kxhcf"; buildDepends = [ async auto-update base bytestring containers cql data-default-class exceptions hashable iproute lens monad-control mtl mwc-random @@ -33571,8 +34083,8 @@ self: { }: mkDerivation { pname = "crf-chain1-constrained"; - version = "0.3.1"; - sha256 = "02ms8wjppyd23wzmyf8fcygy7gn13r431bz968nyrv8cdj2qiv3h"; + version = "0.3.2"; + sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja"; buildDepends = [ array base binary containers data-lens logfloat monad-codec parallel random sgd vector vector-binary vector-th-unbox @@ -33609,13 +34121,12 @@ self: { }: mkDerivation { pname = "crf-chain2-tiers"; - version = "0.2.3"; - sha256 = "0dbg82ydsj7gl5bbfzldmkbv8q89ycsijpdrw7r9xrpac6b1428n"; + version = "0.2.4"; + sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1"; buildDepends = [ array base binary comonad containers data-lens logfloat monad-codec parallel sgd vector vector-binary vector-th-unbox ]; - jailbreak = true; homepage = "https://github.com/kawu/crf-chain2-tiers"; description = "Second-order, tiered, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -33997,8 +34508,8 @@ self: { ({ mkDerivation, base, bytestring, securemem, unix, vector }: mkDerivation { pname = "crypto-random"; - version = "0.0.8"; - sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv"; + version = "0.0.9"; + sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp"; buildDepends = [ base bytestring securemem unix vector ]; homepage = "http://github.com/vincenthz/hs-crypto-random"; description = "Simple cryptographic random related types"; @@ -34532,9 +35043,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, pretty }: mkDerivation { pname = "cuda"; - version = "0.6.5.1"; - sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; - editedCabalFile = "4a72db38c131b220e445e389755d48338769d9a08e826244dcfb7b1182c21c00"; + version = "0.6.6.0"; + sha256 = "0xa8wfqrgc0br7cr3g5j0i30kna07bci7vx05iw46fv445rhjv5y"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring pretty ]; @@ -34571,7 +35081,6 @@ self: { sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg"; buildDepends = [ base cuda ]; buildTools = [ c2hs ]; - jailbreak = true; homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; @@ -34631,12 +35140,12 @@ self: { }) {}; "current-locale" = callPackage - ({ mkDerivation, base, old-locale, process }: + ({ mkDerivation, base, old-locale, process, split }: mkDerivation { pname = "current-locale"; - version = "0.1.0.1"; - sha256 = "185fgzh8nvf2gl5hzg3xmab4xlp2wm2nw485g5nikzx99y3zr1b6"; - buildDepends = [ base old-locale process ]; + version = "0.2.0.1"; + sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5"; + buildDepends = [ base old-locale process split ]; homepage = "https://github.com/koterpillar/current-locale"; description = "Get the current system locale in System.Locale format"; license = stdenv.lib.licenses.mit; @@ -35610,9 +36119,9 @@ self: { }: mkDerivation { pname = "data-easy"; - version = "0.4"; - sha256 = "07cpsix22gvx23si1s4xsx4359qj5sp3gfw6a8075zzs8f10ci0y"; - buildDepends = [ base containers either safe ]; + version = "0.5"; + sha256 = "1rrq20v1nzkmak1m7x3gpcn262h26y4mcx058g8dp413gvdniypq"; + buildDepends = [ base containers safe ]; testDepends = [ base containers directory either errors haskell-src-exts hlint hspec HUnit QuickCheck safe text transformers unix @@ -36484,8 +36993,8 @@ self: { }: mkDerivation { pname = "dbmigrations"; - version = "0.8.1"; - sha256 = "1fbj0w5ybq3b3v0961389xzd4iyljfn9123djgl43xibk6xa9jk8"; + version = "0.8.2"; + sha256 = "031ibk22iyqzbkc6cy5ab5kmbhk68k5217szpw50vdp646rya21w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -36938,17 +37447,20 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.85.2"; - sha256 = "0fri7225aaj8pn2p0mn12rqaq540r9f8jnb3lak8zddvnj51kxaf"; + version = "3.87.1"; + sha256 = "1g8l293gk06qjyfng70nzwzir7w27fajbkc1ck6b9w96rpcr3ipf"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-wl-pprint base bytestring bzlib containers directory either - exceptions filepath HaXml HUnit ListLike mtl network network-uri - old-locale parsec pretty prettyclass process process-extras pureMD5 + base bytestring bzlib containers directory either exceptions + filepath HaXml HUnit ListLike mtl network network-uri old-locale + parsec pretty prettyclass process process-extras pureMD5 regex-compat regex-tdfa template-haskell text time unix Unixutils utf8-string zlib ]; + testDepends = [ + ansi-wl-pprint base HUnit parsec pretty prettyclass regex-tdfa text + ]; homepage = "https://github.com/ddssff/debian-haskell"; description = "Modules for working with the Debian package system"; license = stdenv.lib.licenses.bsd3; @@ -36973,8 +37485,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.7.0.0"; - sha256 = "19w6gylbhhg3cv424l3migdj23y7rhl9h9z2kbsv98pd43wn9128"; + version = "0.7.1.0"; + sha256 = "0hzvv6aazpf7r75yygcqy1ldz3j9shs6spv71nzn040rny67cdll"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37080,14 +37592,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deepseq_1_4_0_0" = callPackage + "deepseq_1_4_1_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.0.0"; - sha256 = "0ns8njkigxa05z2mif9dz2r41j8c717q7f7lswvbp4wwfhr7vdk9"; + version = "1.4.1.0"; + sha256 = "1azyq3vralgqi3sl61xhx0r7q7bwjfjhgk8jrjmziq55ymfkssna"; buildDepends = [ array base ghc-prim ]; testDepends = [ array base HUnit test-framework test-framework-hunit @@ -37577,8 +38089,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.5.21"; - sha256 = "0msmcrhax7lgwkny6gml04d3ki0j8fbgq5isrbdps4737l62csfm"; + version = "2.5.22"; + sha256 = "0g2grz9y23n8g4wwjinx5cc70aawswl84i3njgj6l1fl29fk1yf2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37624,6 +38136,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-topdown" = callPackage + ({ mkDerivation, base, derive, mtl, template-haskell + , template-haskell-util + }: + mkDerivation { + pname = "derive-topdown"; + version = "0.0.0.2"; + sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p"; + buildDepends = [ + base derive mtl template-haskell template-haskell-util + ]; + jailbreak = true; + homepage = "https://github.com/HaskellZhangSong/derive-topdown"; + description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "derive-trie" = callPackage ({ mkDerivation, array, base, containers, template-haskell }: mkDerivation { @@ -37694,8 +38223,8 @@ self: { }: mkDerivation { pname = "descriptive"; - version = "0.9.2"; - sha256 = "1dkq3ab8ggbaz8ahk7iik1bhwnhzffmpr0dp0n2gvrm7lnas2s77"; + version = "0.9.3"; + sha256 = "1kb6fca7fsg82ij6zlc85p9mfaxr3l5z45sjjcx6zvli1lknmqz0"; buildDepends = [ aeson base bifunctors containers mtl scientific text transformers vector @@ -37914,6 +38443,7 @@ self: { lens mtl old-time optparse-applicative pango process split statestack time transformers unix vector ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -37934,6 +38464,7 @@ self: { diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text vector-space ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -37961,6 +38492,7 @@ self: { base containers diagrams-lib HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -37979,6 +38511,7 @@ self: { base containers dual-tree lens MemoTrie monoid-extras newtype semigroups vector-space vector-space-points ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38019,12 +38552,31 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-hsqml" = callPackage + ({ mkDerivation, base, colour, containers, diagrams-core + , diagrams-lib, hsqml, lens, text, transformers + }: + mkDerivation { + pname = "diagrams-hsqml"; + version = "0.0.0.2"; + sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng"; + editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490"; + buildDepends = [ + base colour containers diagrams-core diagrams-lib hsqml lens text + transformers + ]; + homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; + description = "HsQML (Qt5) backend for Diagrams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "diagrams-lib" = callPackage ({ mkDerivation, active, array, base, colour, containers , data-default-class, diagrams-core, dual-tree, filepath @@ -38042,6 +38594,7 @@ self: { JuicyPixels lens MemoTrie monoid-extras optparse-applicative semigroups tagged vector-space vector-space-points ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; @@ -38081,6 +38634,7 @@ self: { filepath hashable lens monoid-extras mtl semigroups split vector-space ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38115,11 +38669,24 @@ self: { old-time optparse-applicative process Rasterific split statestack time unix ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rubiks-cube" = callPackage + ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: + mkDerivation { + pname = "diagrams-rubiks-cube"; + version = "0.1.0.0"; + sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv"; + buildDepends = [ base data-default-class diagrams-lib lens ]; + homepage = "https://github.com/timjb/rubiks-cube"; + description = "Library for drawing the Rubik's Cube"; + license = stdenv.lib.licenses.mit; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg , bytestring, colour, containers, diagrams-core, diagrams-lib @@ -38136,6 +38703,7 @@ self: { JuicyPixels lens monoid-extras mtl old-time process split time unix vector-space ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38345,6 +38913,7 @@ self: { base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text ]; + jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; }) {}; @@ -38404,6 +38973,7 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; + jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; @@ -38415,12 +38985,11 @@ self: { }: mkDerivation { pname = "digestive-functors-blaze"; - version = "0.6.0.4"; - sha256 = "04ldrbwla8gcsan8hahjgf4mzm6wz7kxhwrikqgnyv0dm45ias7c"; + version = "0.6.0.5"; + sha256 = "1mskyz5iab8jy7b2k3nn7c3z7bvwv4cqhviw4qr5xpzqk59ls7kr"; buildDepends = [ base blaze-html blaze-markup digestive-functors text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -38511,13 +39080,12 @@ self: { }: mkDerivation { pname = "digestive-functors-snap"; - version = "0.6.1.0"; - sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr"; + version = "0.6.1.1"; + sha256 = "1y9i1hiawzhdglg1jrnxd36h534i1hxg0r8dnibafwk34v1j2n24"; buildDepends = [ base bytestring containers digestive-functors directory filepath mtl snap-core text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -38717,8 +39285,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "direct-murmur-hash"; - version = "1.0"; - sha256 = "1br1xi3pcv52pn3a51nnaxn1kvg5fg0z1ys11gamzkjjk60qxnmk"; + version = "1.0.1"; + sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q"; buildDepends = [ base bytestring ]; homepage = "http://ireneknapp.com/software/"; description = "An implementation of the MurmurHash3 algorithm"; @@ -38772,15 +39340,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "directory_1_2_1_0" = callPackage + "directory_1_2_2_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.1.0"; - sha256 = "110ch0nd2hh5fsq3whrvj85s0h27ch1q6xg7z9s6mqbd6k6p9yzs"; - editedCabalFile = "05fdf6015e1368e0da696dcd55b7283336d95257075a32c4a2768dd0dd27742f"; + version = "1.2.2.0"; + sha256 = "1dbn6d48gdqh0n2rkh02asxv94ikd8849659ndc7p3h93kgj1dy4"; buildDepends = [ base filepath time unix ]; - description = "library for directory handling"; + testDepends = [ base ]; + description = "Platform-agnostic library for filesystem operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -39352,6 +39920,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-zookeeper" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , distributed-process, distributed-process-monad-control + , enclosed-exceptions, hspec, hzk, lifted-base, monad-control, mtl + , network, network-transport, network-transport-tcp, transformers + }: + mkDerivation { + pname = "distributed-process-zookeeper"; + version = "0.2.0.0"; + sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring containers deepseq distributed-process hzk + mtl network network-transport network-transport-tcp transformers + ]; + testDepends = [ + base bytestring deepseq distributed-process + distributed-process-monad-control enclosed-exceptions hspec hzk + lifted-base monad-control network network-transport + network-transport-tcp transformers + ]; + jailbreak = true; + homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; + description = "A Zookeeper back-end for Cloud Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-static" = callPackage ({ mkDerivation, base, binary, bytestring, containers, rank1dynamic }: @@ -39420,8 +40016,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.3.5.0"; - sha256 = "1pi6vj6cxsp3kb9sd1qhvx9s09sa3vh7rm3czfssynnw9zanp99r"; + version = "0.4.0.1"; + sha256 = "15baqhwzhdsbn2iz2r7vkf66nbv0p4ni1qkpnpwblwbcnvfk2lzq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -39491,8 +40087,8 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.7.1"; - sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr"; + version = "0.7.1.1"; + sha256 = "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08"; buildDepends = [ base deepseq ]; testDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/spl/dlist"; @@ -39697,13 +40293,13 @@ self: { "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , parsec, split + , parsec, split, template-haskell, th-lift }: mkDerivation { pname = "docopt"; - version = "0.6.0.2"; - sha256 = "1i57n3la71ny9nww5hrm5lvwidqk20rh3xfxf37m77zm0sjwsyk2"; - buildDepends = [ base containers parsec ]; + version = "0.7.0.1"; + sha256 = "1i8san365h3g1jhkwh4dyphczdfyd1558744hj4sv5q9lnq86l4q"; + buildDepends = [ base containers parsec template-haskell th-lift ]; testDepends = [ aeson ansi-terminal base bytestring containers parsec split ]; @@ -39719,8 +40315,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.9.12"; - sha256 = "0svm55qb8p6cb7359cpnfyg6i6smw5ajr6yyswl22mqqgxyydq53"; + version = "0.9.13"; + sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40509,8 +41105,8 @@ self: { }: mkDerivation { pname = "duplo"; - version = "1.8.0"; - sha256 = "0qza26n5zlzpif2fmwxajlfhk4kfqy5ad656xcw1i1926x5ncf1b"; + version = "1.8.1"; + sha256 = "1k63904aly7qwx96vqys0yx4amys8y5dl9xb9hp4x7ymw0b6h43i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40743,8 +41339,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "dynamic-mvector"; - version = "0.1.0.1"; - sha256 = "0yqw4ay18c3wmaw1ayqbxb0q2frnidb95nc41qpq6cj7m4pg5him"; + version = "0.1.0.2"; + sha256 = "0pxl30zimy5733qn53xi30cfgksslc1wz6vqcfm8kg43919kdagn"; buildDepends = [ base primitive vector ]; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; @@ -40779,8 +41375,9 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.1.0.0"; - sha256 = "0v1q8f72hxpq8z7135p7714lljl2v7y7x1rwllyy2iwfikbiphwj"; + version = "0.1.0.1"; + sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31"; + editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5"; buildDepends = [ async base colour constrained-categories containers deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk @@ -40810,31 +41407,33 @@ self: { }) {}; "dynobud" = callPackage - ({ mkDerivation, base, bytestring, cairo, casadi-bindings - , casadi-bindings-core, cereal, Chart, Chart-cairo, Chart-gtk - , cmdargs, colour, containers, data-default, data-default-class - , distributive, glib, gtk, hmatrix, HUnit, jacobi-roots, lens - , linear, mtl, not-gloss, process, QuickCheck, reflection + ({ mkDerivation, base, binary, bytestring, casadi-bindings + , casadi-bindings-core, Chart, Chart-gtk, cmdargs, colour + , containers, data-default-class, distributive, generic-accessors + , hmatrix, hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl + , not-gloss, Plot-ho-matic, process, QuickCheck, reflection , semigroups, spatial-math, stm, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , unordered-containers, vector, zeromq4-haskell + , test-framework-hunit, test-framework-quickcheck2 + , unordered-containers, vector, vector-binary-instances + , zeromq4-haskell }: mkDerivation { pname = "dynobud"; - version = "1.1.0.0"; - sha256 = "1bgzas5ywvvym0xgi1bajkx2z65wpzrc6p2r77dk0wlmdrpgb1rf"; + version = "1.3.0.0"; + sha256 = "1zxwx777n08flmwcd7c9w8rkkcpvkzagwhy0axaxl9n0anyf8q1i"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring cairo casadi-bindings casadi-bindings-core cereal - Chart Chart-cairo Chart-gtk cmdargs colour containers data-default - data-default-class distributive glib gtk hmatrix jacobi-roots lens - linear mtl not-gloss process reflection semigroups spatial-math stm - text time unordered-containers vector zeromq4-haskell + base binary bytestring casadi-bindings casadi-bindings-core Chart + Chart-gtk cmdargs colour containers data-default-class distributive + generic-accessors hmatrix jacobi-roots lens linear mtl not-gloss + Plot-ho-matic process reflection semigroups spatial-math stm + unordered-containers vector vector-binary-instances zeromq4-haskell ]; testDepends = [ - base casadi-bindings hmatrix HUnit linear QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector + base binary casadi-bindings hmatrix hmatrix-gsl HUnit linear + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector ]; jailbreak = true; description = "your dynamic optimization buddy"; @@ -41060,12 +41659,12 @@ self: { ({ mkDerivation, base, cmdargs, hint }: mkDerivation { pname = "eddie"; - version = "0.5"; - sha256 = "013fcf13pb771hkcfn0l1h57qczyn24s6d7hjszwgf9fazx713vd"; + version = "0.5.1"; + sha256 = "1kqrxv195r1dhrnizaml9v20jpwgxq66xdr7jfmri4ai0pvjpzmk"; isLibrary = false; isExecutable = true; buildDepends = [ base cmdargs hint ]; - homepage = "http://eddie.googlecode.com/"; + homepage = "http://chiselapp.com/user/mwm/repository/eddie/"; description = "Command line file filtering with haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41235,8 +41834,8 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.1"; - sha256 = "0ln2b4v9nb5hmivh389jaa3yp0mwc4pm2xizbc3alvjhxy2a83wx"; + version = "0.1.0.4"; + sha256 = "1qsr8xsv3hhk3m97zlzmpspjx9b4aghg0axyriwfy5mkbl3kqy93"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; homepage = "https://github.com/edofic/effect-handlers"; @@ -41415,18 +42014,23 @@ self: { }) {}; "ehs" = callPackage - ({ mkDerivation, base, dlist, haskell-src-meta, parsec - , template-haskell + ({ mkDerivation, base, bytestring, haskell-src-meta, parsec + , template-haskell, text, time, transformers }: mkDerivation { pname = "ehs"; - version = "0.1.0.1"; - sha256 = "1g1mq956jd9fnh17zzgpyfc4b8pc10iqfgmm691hskx6wf6lc641"; + version = "0.7.0"; + sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; + editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base dlist haskell-src-meta parsec template-haskell + base bytestring haskell-src-meta parsec template-haskell text time + transformers ]; + jailbreak = true; homepage = "http://github.com/minpou/ehs/"; - description = "embedded Haskell by using quasiquotes"; + description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; }) {}; @@ -41448,14 +42052,15 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.0.0"; - sha256 = "1957jq0fv3migj9807ifa0iws8x8ysxz0a6mhrvblvz0dl175vr6"; - buildDepends = [ base vector ]; + version = "2.0.1"; + sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; + buildDepends = [ base primitive vector ]; + testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; - description = "Haskel binding for Eigen library"; + description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42155,8 +42760,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.3"; - sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc"; + version = "1.2.4"; + sha256 = "08445vp6ma2jids99b21grw8pds086yvbcbh6iyr8x3z74020y1m"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -42217,8 +42822,8 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "entropy"; - version = "0.3.5"; - sha256 = "0myv4r5cwmw4l990r1vmqp4sbgriaizai11477x27pw9ajy93fd2"; + version = "0.3.6"; + sha256 = "1sfv930hvdmf018ngdl15jac2bgj75941w0ndlh78n1jgmf04jhn"; buildDepends = [ base bytestring unix ]; homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; @@ -42391,11 +42996,11 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.1.0"; - sha256 = "1rlqb5wcqws0rz66cd704swmcx93617ai25hsx4ah45r18qs3qsh"; + version = "0.2.0"; + sha256 = "069blfr1kwcd938x2yarbkvbi9nal1fi4qpmyccrb4vx2llqrxkb"; buildDepends = [ base containers ]; testDepends = [ base containers hspec ]; - homepage = "http://example.com/"; + homepage = "https://supki.github.io/envparse"; description = "Parse environment variables"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -42801,29 +43406,21 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, base, blaze-builder, blaze-textual - , bytestring, containers, data-default, data-reify, directory - , doctest, filepath, HUnit, lens, mtl, parsec, process, QuickCheck - , temporary, test-framework, test-framework-hunit - , test-framework-quickcheck, transformers, unordered-containers + ({ mkDerivation, array, base, bytestring, containers, data-default + , directory, doctest, filepath, lens, mtl, parsec, process + , temporary, transformers, unordered-containers }: mkDerivation { pname = "ersatz"; - version = "0.2.6.1"; - sha256 = "1hbn49ycc47f5zjf5zdgls23a8da389ma19g43bc379l8hm2xrjj"; + version = "0.3"; + sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr"; isLibrary = true; isExecutable = true; buildDepends = [ - array base blaze-builder blaze-textual bytestring containers - data-default lens mtl parsec process temporary transformers - unordered-containers - ]; - testDepends = [ - array base containers data-reify directory doctest filepath HUnit - mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck transformers + array base bytestring containers data-default lens mtl parsec + process temporary transformers unordered-containers ]; - jailbreak = true; + testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; @@ -42921,6 +43518,7 @@ self: { version = "1.1.0.0"; sha256 = "1qwbjy71zshlg8vp0qm5wya8ikgac9jpc5xr0x31i85p3yv5xl1p"; buildDepends = [ ad base distributive lens linear reflection ]; + jailbreak = true; homepage = "https://github.com/GaloisInc/estimator"; description = "State-space estimation algorithms such as Kalman Filters"; license = stdenv.lib.licenses.bsd3; @@ -42975,18 +43573,15 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, filepath, http-conduit, http-types, network, process - , regex-compat, transformers, utf8-string + ({ mkDerivation, base, base-unicode-symbols, transformers + , utf8-string }: mkDerivation { pname = "eternal"; - version = "0.0.9"; - sha256 = "0kp25p26fsyqn4877wqjhbwfy7m0fnh7lfw0p5njmlx6kqbwi79n"; + version = "0.1.1"; + sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9"; buildDepends = [ - base bytestring conduit conduit-extra directory filepath - http-conduit http-types network process regex-compat transformers - utf8-string + base base-unicode-symbols transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; @@ -43084,12 +43679,17 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, directory, happy, hlint, hspec, process + , regex-posix, xml + }: mkDerivation { pname = "euler"; - version = "0.1.0"; - sha256 = "1ds0spm4b6pai47cylmynl8j9qlkysajnfgqfx6d2m3qv1m7w9a4"; + version = "0.8.0"; + sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; buildDepends = [ base ]; + testDepends = [ + base directory happy hlint hspec process regex-posix xml + ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -43331,18 +43931,37 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.8"; - sha256 = "010sqlqcwlqrd9kg1lvvpvbdgagwvdh8li082zh44r26blsamd74"; + version = "0.8.0.2"; + sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7"; buildDepends = [ base mtl stm transformers transformers-compat ]; testDepends = [ base mtl QuickCheck stm test-framework test-framework-quickcheck2 - transformers + transformers transformers-compat ]; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; }) {}; + "executable-hash" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, directory + , executable-path, file-embed + }: + mkDerivation { + pname = "executable-hash"; + version = "0.1.1.1"; + sha256 = "1k01qsd2cfrhmxxs8l84g6xc0wcr2hb4s50k3yiin6r8wzli915r"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring cryptohash directory executable-path file-embed + ]; + testDepends = [ base ]; + homepage = "http://github.com/fpco/executable-hash"; + description = "Provides the SHA1 hash of the program executable"; + license = stdenv.lib.licenses.mit; + }) {}; + "executable-path" = callPackage ({ mkDerivation, base, directory, filepath, unix }: mkDerivation { @@ -43683,12 +44302,12 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, binary, deepseq, template-haskell }: + ({ mkDerivation, base, binary, constraints, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.3"; - sha256 = "0a55ngp62z6a8awrps921zz6s2n27x4hpgsr80xphjgrfmrb9z9k"; - buildDepends = [ base binary deepseq template-haskell ]; + version = "0.3.1"; + sha256 = "09vz1z2v2jgn0lrnb8pkgr3r5xbcqmpww671q75nyi74f308zn2n"; + buildDepends = [ base binary constraints template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; license = stdenv.lib.licenses.bsd3; @@ -43981,17 +44600,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "farmhash" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck }: + mkDerivation { + pname = "farmhash"; + version = "0.1.0.2"; + sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq"; + buildDepends = [ base bytestring ]; + testDepends = [ base bytestring hspec QuickCheck ]; + homepage = "https://github.com/abhinav/haskell-farmhash"; + description = "Fast hash functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-logger" = callPackage - ({ mkDerivation, array, auto-update, base, blaze-builder - , bytestring, directory, filepath, hspec, text + ({ mkDerivation, array, auto-update, base, bytestring + , bytestring-builder, directory, filepath, hspec, text }: mkDerivation { pname = "fast-logger"; - version = "2.2.3"; - sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3"; + version = "2.3.0"; + sha256 = "1ii4wkpsi5w2230bzhnzcpgckd5gkawckws2vyggw78b91dw9dc5"; buildDepends = [ - array auto-update base blaze-builder bytestring directory filepath - text + array auto-update base bytestring bytestring-builder directory + filepath text ]; testDepends = [ base bytestring directory hspec ]; description = "A fast logging system"; @@ -44146,8 +44778,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.0.1"; - sha256 = "13n7ywx2vwrn37cwrwdn94cghr18lfn67hxk08cmip6pxy5r9kf4"; + version = "0.23.1.1"; + sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44503,6 +45135,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed-crawl" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection + , http-conduit, http-types, hxt, network-uri, text, transformers + }: + mkDerivation { + pname = "feed-crawl"; + version = "0.1.1.0"; + sha256 = "0137b0bi24cdmwbvpz9cr3iavcyz95xvq48ydqdilazr6gl81m13"; + buildDepends = [ + base bytestring conduit connection http-conduit http-types hxt + network-uri text transformers + ]; + homepage = "https://github.com/danchoi/feed-crawl"; + description = "Utility for fetching feeds with redirect info and HTML link detection"; + license = stdenv.lib.licenses.mit; + }) {}; + "feed2lj" = callPackage ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string @@ -44591,6 +45240,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "feldspar-signal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "feldspar-signal"; + version = "0.0.0.1"; + sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx"; + buildDepends = [ base ]; + homepage = "https://github.com/markus-git/feldspar-signal"; + description = "Signal Processing extension for Feldspar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fences" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44738,11 +45399,9 @@ self: { ({ mkDerivation, array, base, containers, mtl }: mkDerivation { pname = "fgl"; - version = "5.5.0.1"; - sha256 = "0qw70f5hfrxmrx49wx8vk2f5cam7jbpb20mp4i0ybcwdld5ncqda"; - editedCabalFile = "3f816c9f86c3320b9a1b93c2830edfc88ca7a27e58b3b7092a2292cf1fd78f65"; + version = "5.5.1.0"; + sha256 = "0rcmz0xlyr1wj490ffja29z1jgl51gz19ka609da6bx39bwx7nga"; buildDepends = [ array base containers mtl ]; - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44886,8 +45545,8 @@ self: { }: mkDerivation { pname = "file-embed"; - version = "0.0.8"; - sha256 = "0ghhmfwin339fg0b2zx08xq5pj7hzpy9gmbdlyql04p0n21vr360"; + version = "0.0.8.2"; + sha256 = "1gdxz9244wjhfigpsyaan81gyx6vanb8574xxi7944sj9pcgi74y"; buildDepends = [ base bytestring directory filepath template-haskell ]; @@ -44961,17 +45620,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_3_0_2" = callPackage - ({ mkDerivation, base, QuickCheck, random }: + "filepath_1_4_0_0" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.3.0.2"; - sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2"; - editedCabalFile = "42c2b0c550f4c73d044f186a58e34285632705b6936dc24fb6012eb10bf70cc7"; + version = "1.4.0.0"; + sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4"; buildDepends = [ base ]; - testDepends = [ base QuickCheck random ]; - jailbreak = true; - homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; + testDepends = [ base QuickCheck ]; + homepage = "https://github.com/haskell/filepath#readme"; description = "Library for manipulating FilePaths in a cross platform way"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45310,9 +45967,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fixed"; - version = "0.2.1"; - sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0"; - editedCabalFile = "ebdccc1365c476d64ebe64237dc19d65d2ad11e03c265a88367bdf185f4c6980"; + version = "0.2.1.1"; + sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94"; buildDepends = [ base ]; homepage = "http://github.com/ekmett/fixed"; description = "Signed 15.16 precision fixed point arithmetic"; @@ -45447,8 +46103,8 @@ self: { }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.3.0.0"; - sha256 = "1zmxwmksfzbl656c9iyz1nig19hnkfvv874a2gm5mc28yr6zwvqg"; + version = "0.3.1.0"; + sha256 = "0x5fjggm0licrdd442pr1968zlzfb0ah4ib8s9yxcb2p6vc39lzv"; buildDepends = [ base deepseq fixed-vector ghc-prim primitive transformers ]; @@ -45601,6 +46257,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "flexible-time" = callPackage + ({ mkDerivation, base, bytestring, unix-time }: + mkDerivation { + pname = "flexible-time"; + version = "0.1.0.3"; + sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l"; + buildDepends = [ base bytestring unix-time ]; + homepage = "https://github.com/tattsun/flexible-time"; + description = "simple extension of Data.UnixTime."; + license = stdenv.lib.licenses.mit; + }) {}; + "flexible-unlit" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -45869,14 +46537,14 @@ self: { }) {}; "fltkhs" = callPackage - ({ mkDerivation, base, bytestring, c2hs, process }: + ({ mkDerivation, base, bytestring, c2hs, directory, process }: mkDerivation { pname = "fltkhs"; - version = "0.1.0.0"; - sha256 = "1c8wdxxrx8y0911m3aa3b9svk7d3iqdsc2q0zrs67f0jv4wmd0dx"; + version = "0.1.0.1"; + sha256 = "026cx8l24qjf91d8ikqyz7bj92apm3qzq0ml6rvybj44mrpd1c34"; isLibrary = true; isExecutable = true; - buildDepends = [ base bytestring process ]; + buildDepends = [ base bytestring directory process ]; buildTools = [ c2hs ]; homepage = "http://github.com/deech/fltkhs"; description = "FLTK bindings"; @@ -45891,8 +46559,8 @@ self: { }: mkDerivation { pname = "fluent-logger"; - version = "0.2.0.0"; - sha256 = "02sh7q9l874rbjdwj66grz0y0cbnd2wc5413x4mrvg095i8g9zww"; + version = "0.2.2.0"; + sha256 = "0gg9nhfmhi7qz79i4jbqixyw032sk394gmcjcb3hna09jqas71ab"; buildDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -45983,8 +46651,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.7"; - sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9"; + version = "1.0.8"; + sha256 = "1v8g1n17lwjwr2d1r3zam44qlm3jrr5j30d4cs4n4gf5pgxlrzvp"; buildDepends = [ base bytestring containers primitive text transformers vector ]; @@ -45993,17 +46661,20 @@ self: { }) {}; "foldl-incremental" = callPackage - ({ mkDerivation, base, bytestring, foldl, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, containers, deepseq, foldl + , histogram-fill, mwc-random, pipes, QuickCheck, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "foldl-incremental"; - version = "0.1.1.0"; - sha256 = "1wqvd48ivs4nn0kw9g9r0p0029kigl8bbc3554m1g033l2b8k2pk"; - buildDepends = [ base foldl ]; + version = "0.2.0.0"; + sha256 = "09xf9cba3j49z4bwfmad6q9gdnp3f1zn817q4px7hky2gln3bhzk"; + buildDepends = [ + base containers deepseq foldl histogram-fill vector + ]; testDepends = [ - base bytestring foldl tasty tasty-golden tasty-hunit - tasty-quickcheck + base bytestring containers foldl histogram-fill mwc-random pipes + QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector ]; homepage = "https://github.com/tonyday567/foldl-incremental"; description = "incremental folds"; @@ -46117,18 +46788,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forbidden-fruit" = callPackage + ({ mkDerivation, base, control-monad-loop, hashable, hashtables + , hspec, primitive, transformers, transformers-base, vector + }: + mkDerivation { + pname = "forbidden-fruit"; + version = "0.1.0"; + sha256 = "0sxaa2lpz6j0ljz8kjxifvp4lk5x12w0ka9wjws4w7r8q9bld8dd"; + buildDepends = [ + base control-monad-loop hashable hashtables primitive transformers + transformers-base vector + ]; + testDepends = [ + base control-monad-loop hashable hashtables hspec primitive + transformers vector + ]; + homepage = "http://github.com/minpou/forbidden-fruit"; + description = "A library accelerates imperative style programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "force-layout" = callPackage ({ mkDerivation, base, containers, data-default-class, lens , vector-space, vector-space-points }: mkDerivation { pname = "force-layout"; - version = "0.3.0.9"; - sha256 = "109n0rlwpbrpsa0j4vcab61zmc1j01ln141v19zjv4dm5al14bd5"; + version = "0.3.0.10"; + sha256 = "0s3q1az0fvx1kn79nsz3d7d4gampcz4yyp9nmqj9baip1lws6k36"; buildDepends = [ base containers data-default-class lens vector-space vector-space-points ]; + jailbreak = true; description = "Simple force-directed layout"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -46170,6 +46863,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foreign-var" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "foreign-var"; + version = "0.1"; + sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd"; + buildDepends = [ base stm transformers ]; + homepage = "http://github.com/ekmett/foreign-var/"; + description = "Encapsulating mutatable state in external libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "forkable-monad" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -46560,8 +47265,8 @@ self: { }: mkDerivation { pname = "free"; - version = "4.10.0.1"; - sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq"; + version = "4.11"; + sha256 = "0k645n6ywy1as2lmw4gv2bmmr9y67pcnar0jhhf9kpaqvl5s2h5y"; buildDepends = [ base bifunctors comonad distributive mtl prelude-extras profunctors semigroupoids semigroups template-haskell transformers @@ -46840,8 +47545,8 @@ self: { }: mkDerivation { pname = "friday"; - version = "0.2.0.2"; - sha256 = "1warjzy5ciabyd3wkfaxz82y893vri3zbn8i8xhf7018fcgkna0b"; + version = "0.2.1.0"; + sha256 = "02n0cdmd4fc3vi2i73s7q4pynnn29dpa1rh94z6j5lb5arcz9i8p"; buildDepends = [ base bytestring convertible deepseq primitive ratio-int transformers vector @@ -46861,8 +47566,8 @@ self: { }: mkDerivation { pname = "friday-devil"; - version = "0.1.0.1"; - sha256 = "0431jzykspz6kqkxldnjz2v6r6kw5f7k361ic6mk9xij15300lp0"; + version = "0.1.1.1"; + sha256 = "19g1h7palsaycv81fks9zbq979jdn7fqapxd6igxhkgzw73n69aj"; buildDepends = [ base bytestring convertible deepseq friday transformers vector ]; @@ -47462,8 +48167,8 @@ self: { }: mkDerivation { pname = "fwgl"; - version = "0.1.0.3"; - sha256 = "1gc92r1612zsngw3hwikphav5281hqc4akn9i3zna16lz2jikqg0"; + version = "0.1.1.0"; + sha256 = "07ml9f8x4rw7wg6wib63nayh8mpszrkx0zal9zz0cpjh2f85n10a"; buildDepends = [ base hashable transformers unordered-containers vector Yampa ]; @@ -47480,11 +48185,11 @@ self: { pname = "fwgl-glfw"; version = "0.1.0.3"; sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0"; + editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8"; buildDepends = [ base fwgl gl GLFW-b hashable JuicyPixels transformers unordered-containers vector Yampa ]; - jailbreak = true; homepage = "https://github.com/ZioCrocifisso/FWGL"; description = "FWGL GLFW backend"; license = stdenv.lib.licenses.bsd3; @@ -47751,12 +48456,13 @@ self: { ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { pname = "gearbox"; - version = "1.0.0.2"; - sha256 = "15ip1vb1b82ympfylm1m1hxw2nkcmhnqhj2bl4v8mw61zcvznky7"; + version = "1.0.0.3"; + sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT OpenGLRaw Vec ]; jailbreak = true; + homepage = "http://code.mathr.co.uk/gearbox"; description = "zooming rotating fractal gears graphics demo"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -47891,6 +48597,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-accessors" = callPackage + ({ mkDerivation, base, HUnit, linear, QuickCheck, spatial-math + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "generic-accessors"; + version = "0.1.0.1"; + sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95"; + buildDepends = [ base linear spatial-math ]; + testDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + ]; + description = "stringly-named getters for generic data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl , tagged, text, unordered-containers, vector @@ -48049,12 +48771,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-xmlpickler" = callPackage + ({ mkDerivation, base, generic-deriving, hxt, text }: + mkDerivation { + pname = "generic-xmlpickler"; + version = "0.1.0.0"; + sha256 = "0ybh3laciskf7yyhb8li4l8w758avgywfl7gy0df16im3x0cx0jy"; + buildDepends = [ base generic-deriving hxt text ]; + homepage = "http://github.com/silkapp/generic-xmlpickler"; + description = "Generic generation of HXT XmlPickler instances using GHC Generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.1.1"; - sha256 = "1c87mhfpfx3mrd347g2hp9c1aivsky11jdj7ac1y66kar5s396yw"; + version = "0.1.1.1"; + sha256 = "1g532p1k8df7vfwfh4zwj4s020k4c9ncvc68xy0hniijy61ncc5n"; buildDepends = [ base ghc-prim template-haskell ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -48115,8 +48849,8 @@ self: { }: mkDerivation { pname = "geni-util"; - version = "0.24.1"; - sha256 = "0djfckf2k7wvnzsl7yy6f33csa82c7ps1mah6bdnw31bqijxiyjd"; + version = "0.24.1.1"; + sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -48181,8 +48915,8 @@ self: { }: mkDerivation { pname = "geniserver"; - version = "0.24.1"; - sha256 = "0r12iz8zy3vbcjphprzydvf6rw94qdk2mcl4am9agmyw2g5gqcfd"; + version = "0.24.1.1"; + sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -48408,8 +49142,8 @@ self: { }: mkDerivation { pname = "ghc-core-html"; - version = "0.1.1"; - sha256 = "0l0474kpzvzzwkbz9mcjl4fnasznb1crynjcsk3hmnjq8syhmm97"; + version = "0.1.2"; + sha256 = "1yhyi99cbnfk2a65j9v6hinp0rpmc341z55dvqvli1wx5c9i7gf6"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -48505,16 +49239,19 @@ self: { "ghc-exactprint" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, ghc-syb-utils, HUnit, mtl, random, syb + , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.0.1"; - sha256 = "0z6ff4pf3dnz8slg7sfmq86ygzxqn87idv5d63h4qyg8pwvv6zvx"; - buildDepends = [ base containers ghc ghc-paths syb ]; + version = "0.1.1.0"; + sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + buildDepends = [ + base containers directory filepath ghc ghc-paths ghc-syb-utils mtl + syb + ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils - HUnit mtl random syb + HUnit mtl random stm syb ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; @@ -48937,21 +49674,21 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, base, cmdargs, containers, directory, extra + ({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra , filepath, process, tasty, tasty-hunit, terminal-size, time }: mkDerivation { pname = "ghcid"; - version = "0.3.4"; - sha256 = "1xapx3rlx9fsvs5idqyarassqbg8ifsar923pi9vsn29ipjp2kjq"; + version = "0.3.6"; + sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8"; isLibrary = true; isExecutable = true; buildDepends = [ - base cmdargs containers directory extra filepath process + ansi-terminal base cmdargs directory extra filepath process terminal-size time ]; testDepends = [ - base cmdargs containers directory extra filepath process tasty + ansi-terminal base cmdargs directory extra filepath process tasty tasty-hunit terminal-size time ]; homepage = "https://github.com/ndmitchell/ghcid#readme"; @@ -49174,12 +49911,13 @@ self: { , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, conduit, conduit-extra, containers, crypto-api , cryptohash, curl, data-default, dataenc, DAV, dbus, directory - , dlist, dns, edit-distance, exceptions, fdo-notify, feed, filepath - , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client - , http-conduit, http-types, IfElse, json, lsof, MissingH - , monad-control, mtl, network, network-info, network-multicast - , network-protocol-xmpp, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, process, QuickCheck + , dlist, dns, edit-distance, esqueleto, exceptions, fdo-notify + , feed, filepath, git, gnupg1, gnutls, hamlet, hinotify, hslogger + , http-client, http-conduit, http-types, IfElse, json, lsof + , MissingH, monad-control, monad-logger, mtl, network, network-info + , network-multicast, network-protocol-xmpp, network-uri, old-locale + , openssh, optparse-applicative, path-pieces, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck , random, regex-tdfa, resourcet, rsync, SafeSemaphore, securemem , SHA, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, text, time, torrent, transformers @@ -49189,24 +49927,25 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150219"; - sha256 = "0psx113vjb1wicaywknhn13x0la5hrggwf8b0rs4gxd472ix5ha6"; + version = "5.20150317"; + sha256 = "1n57h97z6jw1pqxmkgfy7s24f88ypskgvsw3gcfyah9inkx1rhr5"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession conduit conduit-extra containers crypto-api cryptohash data-default dataenc DAV dbus directory dlist - dns edit-distance exceptions fdo-notify feed filepath gnutls hamlet - hinotify hslogger http-client http-conduit http-types IfElse json - MissingH monad-control mtl network network-info network-multicast - network-protocol-xmpp network-uri old-locale optparse-applicative - path-pieces process QuickCheck random regex-tdfa resourcet - SafeSemaphore securemem SHA shakespeare stm tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat utf8-string uuid wai wai-extra warp - warp-tls xml-types yesod yesod-core yesod-default yesod-form - yesod-static + dns edit-distance esqueleto exceptions fdo-notify feed filepath + gnutls hamlet hinotify hslogger http-client http-conduit http-types + IfElse json MissingH monad-control monad-logger mtl network + network-info network-multicast network-protocol-xmpp network-uri + old-locale optparse-applicative path-pieces persistent + persistent-sqlite persistent-template process QuickCheck random + regex-tdfa resourcet SafeSemaphore securemem SHA shakespeare stm + tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell + text time torrent transformers unix unix-compat utf8-string uuid + wai wai-extra warp warp-tls xml-types yesod yesod-core + yesod-default yesod-form yesod-static ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync wget which @@ -49252,8 +49991,8 @@ self: { }: mkDerivation { pname = "git-date"; - version = "0.2.1"; - sha256 = "17xiim439igg1gfcfwpzxjkgpmfqqh9v79jm4bg0f9h5dijij79l"; + version = "0.2.2"; + sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl"; buildDepends = [ base bytestring time utf8-string ]; testDepends = [ base bytestring old-locale QuickCheck test-framework @@ -49769,27 +50508,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gitrev" = callPackage + ({ mkDerivation, base, directory, filepath, process + , template-haskell + }: + mkDerivation { + pname = "gitrev"; + version = "1.0.0"; + sha256 = "05jxzhpjzd9n5sdaa8d9y2zczs2v5w4n9718wl411ghvx54jhnfd"; + buildDepends = [ + base directory filepath process template-haskell + ]; + homepage = "https://github.com/acfoltzer/gitrev"; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , doctest, errors, filepath, flock, Glob, hspec, HUnit - , monad-control, process, QuickCheck, transformers + , doctest, errors, filepath, flock, Glob, hspec, monad-control + , process, transformers }: mkDerivation { pname = "gitson"; - version = "0.5.0"; - sha256 = "0dx2wnyg331wzgv2wjp1h75xy0gc0zvfgzh8rakzg845srim1b8a"; + version = "0.5.1"; + sha256 = "175j2pkc3cb37h3vilb99i782as9yg68nacs2ysnp1m7hrxvvyjy"; buildDepends = [ aeson aeson-pretty base bytestring directory errors filepath flock monad-control process transformers ]; testDepends = [ - aeson base directory doctest Glob hspec HUnit process QuickCheck - transformers + aeson base directory doctest Glob hspec process transformers ]; - jailbreak = true; homepage = "https://github.com/myfreeweb/gitson"; description = "A document store library for Git + JSON"; - license = stdenv.lib.licenses.asl20; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -49799,8 +50552,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2.3"; - sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b"; + version = "0.7.3"; + sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -49869,8 +50622,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.0.7"; - sha256 = "16x6vqajixd6iws9ydn5a77phkckilxyvg48lcawk53nk8rvapzy"; + version = "0.13.1.0"; + sha256 = "11scv2imljnr6ng7692jdagr7fc924hgfwfbnw4a5sra3w7ja7fz"; buildDepends = [ base bytestring containers text utf8-string ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ glib ]; @@ -50340,8 +51093,8 @@ self: { }: mkDerivation { pname = "goatee"; - version = "0.2.0"; - sha256 = "0lqvdxv500q19xfpp4vcvz0y3s9s2q1iz1n2c01k9kbph4hjd198"; + version = "0.3.0"; + sha256 = "1py0cnmvqnjdf6bwwn8p6c78p9qnmk82932j7j6y2q91yhna6b2d"; buildDepends = [ base containers mtl parsec template-haskell ]; testDepends = [ base containers HUnit mtl parsec ]; homepage = "http://khumba.net/projects/goatee"; @@ -50355,8 +51108,8 @@ self: { }: mkDerivation { pname = "goatee-gtk"; - version = "0.2.0"; - sha256 = "03klvlxzmm50n8b1bslqjqvrpisiv7rmhjzhssiyakg1qzjpnjzf"; + version = "0.3.0"; + sha256 = "0wdspqs5pfa4axys87c8bci2s3y475fddjrdwh1kvc9vdsanb7xv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -50632,13 +51385,12 @@ self: { }: mkDerivation { pname = "graceful"; - version = "0.1.1.4"; - sha256 = "1dj23pkvh013428247s6n6vsbv3klfa5gj9wrjs1qmaz1gkc216a"; + version = "0.1.1.5"; + sha256 = "1kl4y01ny5w1y77r2jf830d7vd99by7frk106m2wc9nbl066mbhr"; buildDepends = [ base directory network stm unix ]; testDepends = [ base directory filepath hspec network process stm unix ]; - jailbreak = true; description = "Library to write graceful shutdown / upgrade service"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -51191,17 +51943,17 @@ self: { }) {}; "gravatar" = callPackage - ({ mkDerivation, base, bytestring, data-default, HTTP, pureMD5 - , text + ({ mkDerivation, base, bytestring, data-default, hspec, HTTP + , pureMD5, text }: mkDerivation { pname = "gravatar"; - version = "0.6"; - sha256 = "035qhrk0s4bpv9xvji4j7w2r98gppn2armz4wjdjy8f50anjpfw3"; + version = "0.8.0"; + sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g"; buildDepends = [ base bytestring data-default HTTP pureMD5 text ]; - homepage = "http://github.com/pbrisbin/gravatar"; - description = "Look up gravatar image urls by email address"; - license = stdenv.lib.licenses.bsd3; + testDepends = [ base hspec text ]; + description = "Generate Gravatar image URLs"; + license = stdenv.lib.licenses.mit; }) {}; "gray-code" = callPackage @@ -51326,18 +52078,19 @@ self: { }) {}; "groundhog" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, containers, monad-control, monad-logger, mtl - , scientific, text, time, transformers, transformers-base + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, containers, monad-control + , monad-logger, mtl, scientific, text, time, transformers + , transformers-base }: mkDerivation { pname = "groundhog"; - version = "0.7.0.2"; - sha256 = "09wyhqpwmdmw13nbxrrdkc4jsl46pwnq0yhcjzdn9g3s5049s0by"; + version = "0.7.0.3"; + sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r"; buildDepends = [ - aeson base base64-bytestring blaze-builder bytestring containers - monad-control monad-logger mtl scientific text time transformers - transformers-base + aeson attoparsec base base64-bytestring blaze-builder bytestring + containers monad-control monad-logger mtl scientific text time + transformers transformers-base ]; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; @@ -52101,13 +52854,12 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.1"; - sha256 = "0r368b4gw32yxi7xx85ljaw72plbw1i659kwjqiigmd2s54ids5h"; + version = "0.2.0.3"; + sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; isLibrary = false; isExecutable = true; buildDepends = [ base cairo containers filepath gtk ]; - jailbreak = true; - homepage = "http://gitorious.org/maximus/gulcii"; + homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -52301,36 +53053,40 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base - , base64-bytestring, bytestring, bzlib, cereal, cereal-conduit + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types , crypto-pubkey, crypto-random, cryptocipher, cryptohash - , data-default, errors, hashable, incremental-parser, ixset, lens - , monad-loops, mtl, nettle, openpgp-asciiarmor, QuickCheck - , quickcheck-instances, resourcet, securemem, semigroups, split - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , unordered-containers, zlib + , data-default-class, errors, hashable, incremental-parser, ixset + , lens, monad-loops, nettle, network, network-uri, newtype + , old-locale, openpgp-asciiarmor, QuickCheck, quickcheck-instances + , resourcet, securemem, semigroups, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , wl-pprint-extras, zlib }: mkDerivation { pname = "hOpenPGP"; - version = "1.11"; - sha256 = "1alcaqx2i4a4cbmh0brb9axfsm4nb8fs4mqglh609iy3bdl791b7"; + version = "2.0"; + sha256 = "1krk1019d0ix4ix0qh55l4pzgbggl151vqgd0jbhdcbkmvhfi4xv"; buildDepends = [ - ansi-wl-pprint attoparsec base base64-bytestring bytestring bzlib - cereal cereal-conduit conduit conduit-extra containers - crypto-cipher-types crypto-pubkey crypto-random cryptocipher - cryptohash data-default errors hashable incremental-parser ixset - lens monad-loops mtl nettle openpgp-asciiarmor resourcet securemem - semigroups split text time transformers unordered-containers zlib + aeson attoparsec base base64-bytestring bifunctors binary + binary-conduit byteable bytestring bzlib conduit conduit-extra + containers crypto-cipher-types crypto-pubkey crypto-random + cryptocipher cryptohash data-default-class errors hashable + incremental-parser ixset lens monad-loops nettle network + network-uri newtype old-locale openpgp-asciiarmor resourcet + securemem semigroups split text time transformers + unordered-containers wl-pprint-extras zlib ]; testDepends = [ - ansi-wl-pprint attoparsec base bytestring bzlib cereal - cereal-conduit conduit conduit-extra containers crypto-cipher-types - crypto-pubkey crypto-random cryptocipher cryptohash data-default - errors hashable incremental-parser ixset lens monad-loops mtl - nettle QuickCheck quickcheck-instances resourcet securemem + aeson attoparsec base bifunctors binary binary-conduit byteable + bytestring bzlib conduit conduit-extra containers + crypto-cipher-types crypto-pubkey crypto-random cryptocipher + cryptohash data-default-class errors hashable incremental-parser + ixset lens monad-loops nettle network network-uri newtype + old-locale QuickCheck quickcheck-instances resourcet securemem semigroups split tasty tasty-hunit tasty-quickcheck text time - transformers unordered-containers zlib + transformers unordered-containers wl-pprint-extras zlib ]; homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; @@ -52894,8 +53650,8 @@ self: { }: mkDerivation { pname = "hack2-handler-snap-server"; - version = "2014.11.17"; - sha256 = "0cfc2d6px0n33a3wl7s7k0l7nq9rfi1lxchlwjjb6wyp4f6mg4bb"; + version = "2015.3.9"; + sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7"; buildDepends = [ air base blaze-builder bytestring case-insensitive containers data-default directory enumerator hack2 mtl network snap-core @@ -53139,8 +53895,8 @@ self: { }: mkDerivation { pname = "hackernews"; - version = "0.3.1.0"; - sha256 = "1j081s9gpgwggaljf7xpgskdm4qzcqzd9p2yd76kg9ih4hhfvmw9"; + version = "0.3.1.2"; + sha256 = "0y7548x98zgmaqzgzaxrjs1zckkhzx4w7440ml3zfh2rv65frkkj"; buildDepends = [ aeson attoparsec base bytestring either HsOpenSSL http-streams io-streams text time transformers @@ -53650,8 +54406,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.6.0"; - sha256 = "1bjrj6q215c3abwnf7y39731n598jqi4hr3pajkl0qm2n1rfkyxb"; + version = "4.6.7.0"; + sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54029,17 +54785,17 @@ self: { }) {}; "handsy" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, free - , process, process-extras, retry, shell-escape, split, tasty - , tasty-hunit, tasty-th, transformers + ({ mkDerivation, base, bytestring, data-default-class, operational + , process-extras, retry, shell-escape, split, tasty, tasty-hunit + , tasty-th, transformers }: mkDerivation { pname = "handsy"; - version = "0.0.11"; - sha256 = "1zvz7zwj3ribz4b78082kwmlgp5aqcw6v1lw5klfx95rs009xw5w"; + version = "0.0.13"; + sha256 = "0v79p5gcz9b0s2x910ddhcpxxagiyx59zajxndikp9a0nxx8x0l5"; buildDepends = [ - base bytestring data-default-class free process process-extras - retry shell-escape split transformers + base bytestring data-default-class operational process-extras retry + shell-escape split transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-th ]; homepage = "https://github.com/utdemir/handsy"; @@ -54126,18 +54882,24 @@ self: { }) { pfq = null;}; "hapistrano" = callPackage - ({ mkDerivation, base, either, filepath, lens, old-locale, process - , time, transformers + ({ mkDerivation, base, base-compat, directory, either, filepath + , hspec, mtl, old-locale, process, temporary, time, transformers }: mkDerivation { pname = "hapistrano"; - version = "0.1.0.2"; - sha256 = "172hdvs8rnxwv3dy56024f4yc9f9hbs03wz3hfpdcqfj0a9lix65"; + version = "0.2.0.1"; + sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6"; isLibrary = true; isExecutable = true; buildDepends = [ - base either filepath lens old-locale process time transformers + base base-compat either filepath mtl old-locale process time + transformers + ]; + testDepends = [ + base base-compat directory either filepath hspec mtl old-locale + process temporary time transformers ]; + homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; }) {}; @@ -54298,6 +55060,7 @@ self: { safecopy text time unordered-containers web-routes web-routes-happstack ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -54665,24 +55428,27 @@ self: { "happstack-server" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, extensible-exceptions, filepath, hslogger - , html, HUnit, monad-control, mtl, network, network-uri, old-locale - , parsec, process, sendfile, syb, system-filepath, template-haskell - , text, threads, time, time-compat, transformers, transformers-base + , containers, directory, exceptions, extensible-exceptions + , filepath, hslogger, html, HUnit, monad-control, mtl, network + , network-uri, old-locale, parsec, process, sendfile, syb + , system-filepath, template-haskell, text, threads, time + , time-compat, transformers, transformers-base, transformers-compat , unix, utf8-string, xhtml, zlib }: mkDerivation { pname = "happstack-server"; - version = "7.4.0"; - sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk"; + version = "7.4.1"; + sha256 = "0y3y4im18vihh4phhb6mx194gdz02z46mxrfgvf8kmg3db5bmqlk"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory - extensible-exceptions filepath hslogger html monad-control mtl - network network-uri old-locale parsec process sendfile syb - system-filepath template-haskell text threads time time-compat - transformers transformers-base unix utf8-string xhtml zlib + exceptions extensible-exceptions filepath hslogger html + monad-control mtl network network-uri old-locale parsec process + sendfile syb system-filepath template-haskell text threads time + time-compat transformers transformers-base transformers-compat unix + utf8-string xhtml zlib ]; testDepends = [ base bytestring containers HUnit parsec zlib ]; + jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -54937,6 +55703,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { groonga = null;}; + "haroonga-httpd" = callPackage + ({ mkDerivation, base, directory, haroonga, http-types, old-locale + , optparse-applicative, scotty, text, time, transformers, wai-extra + }: + mkDerivation { + pname = "haroonga-httpd"; + version = "0.1.0.0"; + sha256 = "15236s7289mckymapnvs6fx31lp6j68d8c38882qh6wwk9z71d5j"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base directory haroonga http-types old-locale optparse-applicative + scotty text time transformers wai-extra + ]; + description = "Yet another Groonga http server"; + license = stdenv.lib.licenses.lgpl21; + }) {}; + "harp" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -55114,8 +55898,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.2.3.1"; - sha256 = "1ybsdzm5lzx8zwf9dcw1f6sf29xk4j9whcs578d6fmif2ggm7gym"; + version = "1.2.3.2"; + sha256 = "0h9295pv2sgbaqlwpwbx2bap6nngm0jcdhkqham1wpjwyxqgqrlc"; buildDepends = [ base bytestring ghc-prim integer-gmp text ]; testDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -55460,14 +56244,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_1_3" = callPackage + "haskeline_0_7_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , terminfo, transformers, unix, utf8-string }: mkDerivation { pname = "haskeline"; - version = "0.7.1.3"; - sha256 = "1bwyfn7y9mi18g7zxz8wxjkld51azlfbxypxbiqdinpm2fdl63mi"; + version = "0.7.2.0"; + sha256 = "1pzvps7r53zwjcw1klc025ll786qzlp6y6k4w37ycz2g44fmd2f2"; buildDepends = [ base bytestring containers directory filepath terminfo transformers unix utf8-string @@ -55645,8 +56429,8 @@ self: { }: mkDerivation { pname = "haskell-docs"; - version = "4.2.3"; - sha256 = "0y42zwlmb75qdmixrwm63m27csiky92s4l54j7jjj2rmj51fz1af"; + version = "4.2.5"; + sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -55814,29 +56598,28 @@ self: { "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit - , lifted-base, monad-control, mtl, QuickCheck, resourcet - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-base, unordered-containers, vector + , lifted-base, mtl, QuickCheck, resourcet, scientific + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, transformers, transformers-base + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.9"; - sha256 = "1qi7azm0j4r310dhyh2xhchw78brkagkig1wdjz9l8wazw0niqzn"; + version = "0.3.0.13"; + sha256 = "1j2ka83s4fa8aqqnhvp83zqlp019ayznlkhd7pb6pqkd19npr78a"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP - http-conduit http-types lifted-base monad-control mtl resourcet - scientific text transformers transformers-base unordered-containers - vector + http-conduit http-types lifted-base mtl resourcet scientific text + transformers transformers-base transformers-compat + unordered-containers vector ]; testDepends = [ aeson base bytestring Cabal data-default hashable HTTP http-conduit - http-types HUnit lifted-base monad-control mtl QuickCheck resourcet - scientific test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - transformers-base unordered-containers vector + http-types HUnit lifted-base mtl QuickCheck resourcet scientific + test-framework test-framework-hunit test-framework-quickcheck2 + test-framework-th text transformers transformers-base + transformers-compat unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; @@ -57303,8 +58086,8 @@ self: { }: mkDerivation { pname = "haste-compiler"; - version = "0.4.4.1"; - sha256 = "1h98zwyf0ycdrzxwak40accr6xyi38s6ckkyl4mqfvbm3hz2vfq8"; + version = "0.4.4.4"; + sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -57339,8 +58122,8 @@ self: { ({ mkDerivation, base, haste-compiler, transformers }: mkDerivation { pname = "haste-perch"; - version = "0.1.0.7"; - sha256 = "0qikaiqk408x90p1wqz0p7jc2ri4raqnl4d50x3g5abqj2y1h93n"; + version = "0.1.0.8"; + sha256 = "0p15wzl7rina4pnldhkm188addqlgmc9k4cryv7v2dr9i0wv5y8f"; buildDepends = [ base haste-compiler transformers ]; homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; @@ -57381,6 +58164,7 @@ self: { base blaze-html directory filepath HaTeX parsec text time transformers ]; + jailbreak = true; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57522,18 +58306,17 @@ self: { "haxr" = callPackage ({ mkDerivation, array, base, base64-bytestring, blaze-builder - , bytestring, HaXml, HTTP, mtl, network, network-uri, old-locale - , old-time, template-haskell, time, utf8-string + , bytestring, HaXml, HTTP, mtl, mtl-compat, network, network-uri + , old-locale, old-time, template-haskell, time, utf8-string }: mkDerivation { pname = "haxr"; - version = "3000.10.3.1"; - sha256 = "0alvrsk85f1l79hfa9shagjckp4sx835l9734ab2izfv50mxx7gm"; - editedCabalFile = "911a81d122ae60328ff513ed2de6e055c051b03a5f88280f602da23e36111918"; + version = "3000.10.4.2"; + sha256 = "1v9sx73lwnamynsjf51pjr84v6qli9jcql5kf8d7af27bm54j0ry"; buildDepends = [ array base base64-bytestring blaze-builder bytestring HaXml HTTP - mtl network network-uri old-locale old-time template-haskell time - utf8-string + mtl mtl-compat network network-uri old-locale old-time + template-haskell time utf8-string ]; homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; @@ -57561,7 +58344,7 @@ self: { pname = "haxy"; version = "1.0"; sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs"; - editedCabalFile = "1e9eca705e28eed32d3fc2948dd5ca5402aec5bf13d256a6024939835e943585"; + editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940"; buildDepends = [ base bytestring data-default-class hostname HTTP http-server mtl url @@ -57743,13 +58526,12 @@ self: { }: mkDerivation { pname = "hblock"; - version = "0.1.0.1"; - sha256 = "1ng906bsx1nrn583h768pgghg6sysx560dxrpxbxc7xv7f6g8b1s"; + version = "0.1.0.2"; + sha256 = "0g8hj42ir3jcpmwf3pin2k4zdcf5p1f1sx1f8rj380qbyxgdrw3v"; buildDepends = [ aeson base blaze-markup bytestring cereal containers deepseq hashable path-pieces safecopy text unordered-containers uuid vector ]; - jailbreak = true; description = "A mutable vector that provides indexation on the datatype fields it stores"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57996,6 +58778,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hdbc-aeson" = callPackage + ({ mkDerivation, aeson, base, convertible, HDBC, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hdbc-aeson"; + version = "0.1.3.0"; + sha256 = "1mqcpzp9fw604nab0zs9r8515072pwbkfr4vvdpjhbdny5022naw"; + buildDepends = [ + aeson base convertible HDBC scientific text unordered-containers + vector + ]; + homepage = "https://github.com/danchoi/hdbc-aeson"; + description = "Deserialize from HDBC rows to FromJSON instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "hdbc-postgresql-hstore" = callPackage ({ mkDerivation, attoparsec, base, containers, HDBC, text }: mkDerivation { @@ -58325,9 +59124,8 @@ self: { ({ mkDerivation, base, directory, doctest, filepath }: mkDerivation { pname = "heaps"; - version = "0.3.1"; - sha256 = "1h0p097zc1wjinhdhy4ssav7jpicc85074d926nmnhdgz9vaajwj"; - editedCabalFile = "8e3b4bef28315c04ce0b34d8f8b4f38527765569d19c4a1802fe77186b26b55c"; + version = "0.3.2"; + sha256 = "1xkb2lk97ymgjxk89159h226qs89z5wank4jx35awwzv4f67ay46"; buildDepends = [ base ]; testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/heaps/"; @@ -58488,6 +59286,7 @@ self: { pname = "heist"; version = "0.14.1"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; + editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist errors filepath hashable @@ -58877,8 +59676,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.6"; - sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; + version = "1.2.7"; + sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6"; buildDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -58901,20 +59700,20 @@ self: { "hermit" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, containers - , data-default, directory, ghc, happy, haskeline, kure + , data-default-class, directory, ghc, happy, haskeline, kure , marked-pretty, mtl, operational, process, stm, temporary - , terminfo, transformers + , terminfo, transformers, transformers-compat }: mkDerivation { pname = "hermit"; - version = "0.6.0.0"; - sha256 = "19ry542k5ffr2vb075ylx2l35bn5sdclvz1byhj5bfdvz4rji09l"; + version = "0.7.1.0"; + sha256 = "0ckjh7ql2s6l09lbgdn9plfpvmdcx6b3yh9lbdih9l4lcf1k8f56"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal array base containers data-default directory ghc - haskeline kure marked-pretty mtl operational process stm temporary - terminfo transformers + ansi-terminal array base containers data-default-class directory + ghc haskeline kure marked-pretty mtl operational process stm + temporary terminfo transformers transformers-compat ]; buildTools = [ alex happy ]; description = "Haskell Equational Reasoning Model-to-Implementation Tunnel"; @@ -59151,8 +59950,8 @@ self: { }: mkDerivation { pname = "hexpat"; - version = "0.20.8"; - sha256 = "0nz44cxigg91hix8h35bx0dk2l9pmn6jj1p5mvdh0cl7gvv6yf5s"; + version = "0.20.9"; + sha256 = "17cx8iafb07f2c8wmfmrfgpz9cjilciba6001klf42z039ghf72x"; buildDepends = [ base bytestring containers deepseq List text transformers utf8-string @@ -59339,19 +60138,19 @@ self: { }) {}; "hfoil" = callPackage - ({ mkDerivation, base, directory, gloss, haskeline, hmatrix, HTTP - , MissingH, transformers + ({ mkDerivation, base, directory, haskeline, hmatrix, HTTP, linear + , not-gloss, parsec, transformers }: mkDerivation { pname = "hfoil"; - version = "0.1.2"; - sha256 = "0q52xj7bajs8kn66cg7vfgbxp66nwnfl832csrz3bygi9vhv8kxw"; + version = "0.2.0.1"; + sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4"; isLibrary = true; isExecutable = true; buildDepends = [ - base directory gloss haskeline hmatrix HTTP MissingH transformers + base directory haskeline hmatrix HTTP linear not-gloss parsec + transformers ]; - jailbreak = true; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59817,8 +60616,8 @@ self: { }: mkDerivation { pname = "highlight-versions"; - version = "0.1.3.4"; - sha256 = "0gizqvn9a36hsvxvq9b76hbwpl3x0fgwba2l105d5ypzig9wss99"; + version = "0.1.3.5"; + sha256 = "0nk7kdzzlyq2ml30mj661616h23zar3kqq8xd36lqs1ssr7nqnj7"; isLibrary = false; isExecutable = true; buildDepends = [ ansi-terminal base Cabal containers hackage-db ]; @@ -59849,8 +60648,8 @@ self: { }: mkDerivation { pname = "highlighter2"; - version = "0.2.3"; - sha256 = "13d395aik3pps676hzmkg8djkfav6babmcc3dyj2j055pnigdfx7"; + version = "0.2.5"; + sha256 = "1gndzxi2i9hybqj6v14wflw8335v09q832knbx61hq9wcgq1hxwi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59864,22 +60663,22 @@ self: { "highlighting-kate" = callPackage ({ mkDerivation, base, blaze-html, containers, Diff, directory - , filepath, mtl, parsec, process, regex-pcre, utf8-string + , filepath, mtl, parsec, pcre-light, process, utf8-string }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.11.1"; - sha256 = "1z62wp1a1qlw1l3bkxwq7pd3mi64jl688ib23263bc46zc8z0nkv"; + version = "0.5.12"; + sha256 = "0igcph3icmskf2g861fmxwgjdgrm52r5zazviiv82wck8nvmkh0i"; isLibrary = true; isExecutable = true; buildDepends = [ - base blaze-html containers filepath mtl parsec regex-pcre + base blaze-html containers filepath mtl parsec pcre-light utf8-string ]; testDepends = [ base blaze-html containers Diff directory filepath process ]; - prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal"; + configureFlags = [ "-fpcre-light" ]; homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; license = "GPL"; @@ -59971,24 +60770,25 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, data-default, descriptive, directory - , haskell-src-exts, hspec, monad-loops, mtl, text, transformers + ({ mkDerivation, applicative-quoters, base, data-default + , descriptive, directory, ghc-prim, haskell-src-exts, hspec + , monad-loops, mtl, text, transformers }: mkDerivation { pname = "hindent"; - version = "4.3.11"; - sha256 = "038x8gqa484n03q9x9n3xxl56cls31yff8546xr9vgyqmibiqxrg"; + version = "4.4.1"; + sha256 = "1hc71zzc8apl619449g9sp50wc6qprzd91c69rr3zf1pi77208qg"; isLibrary = true; isExecutable = true; buildDepends = [ - base data-default descriptive directory haskell-src-exts - monad-loops mtl text transformers + applicative-quoters base data-default descriptive directory + ghc-prim haskell-src-exts monad-loops mtl text transformers ]; testDepends = [ base data-default directory haskell-src-exts hspec monad-loops mtl text ]; - jailbreak = true; + homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60462,6 +61262,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hjcase" = callPackage + ({ mkDerivation, aeson, base, bytestring, HUnit, test-framework + , test-framework-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "hjcase"; + version = "0.1.0.0"; + sha256 = "0n2wy39i3v2asifk3n9mlz1dwgyv9fr2mkqp9dbdbawnk2g96y4l"; + buildDepends = [ + aeson base bytestring HUnit test-framework test-framework-hunit + text unordered-containers vector + ]; + homepage = "https://github.com/seagreen/hjcase"; + description = "Jcase library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "hjpath" = callPackage ({ mkDerivation, base, containers, hjson, parsec }: mkDerivation { @@ -60540,25 +61357,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hjsonpointer" = callPackage + ({ mkDerivation, aeson, base, http-types, HUnit, test-framework + , test-framework-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "hjsonpointer"; + version = "0.1.0.1"; + sha256 = "03c0hl4hzgihkqla7kqkjk5s1k68pnblqpisjrzf4bzjl8z1z6hw"; + buildDepends = [ aeson base text unordered-containers vector ]; + testDepends = [ + aeson base http-types HUnit test-framework test-framework-hunit + text unordered-containers vector + ]; + homepage = "https://github.com/seagreen/hjsonpointer"; + description = "JSON Pointer library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "hjsonschema" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hashable, HUnit, lens, regexpr, scientific, test-framework - , test-framework-hunit, text, unordered-containers, vector, wreq + ({ mkDerivation, aeson, base, bytestring, directory, file-embed + , filepath, hashable, hjsonpointer, http-types, HUnit, lens + , regexpr, scientific, test-framework, test-framework-hunit, text + , unordered-containers, vector, wreq }: mkDerivation { pname = "hjsonschema"; - version = "0.3.0.0"; - sha256 = "1p229bbfpbs1d4hirk12hlyj4ghyw1w3k1p4aydvrqz6sp19nkk4"; + version = "0.4.0.0"; + sha256 = "0jak4ffjhbpwcmbx5jp6pbba52xr9zyhjjwn9y5gdqjny2scnb67"; buildDepends = [ - aeson base bytestring hashable lens regexpr scientific text - unordered-containers vector wreq + aeson base bytestring file-embed hashable hjsonpointer http-types + lens regexpr scientific text unordered-containers vector wreq ]; testDepends = [ aeson base bytestring directory filepath HUnit test-framework test-framework-hunit text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/seagreen/hjsonschema"; - description = "Haskell implementation of JSON Schema v4"; + description = "Haskell implementation of JSON Schema Draft 4"; license = stdenv.lib.licenses.mit; }) {}; @@ -60632,8 +61469,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "0.24"; - sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc"; + version = "0.24.1"; + sha256 = "0k09bdr3y975581mpqpmg4jynghl8v4j2386nzqprh0k6a602nv8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60704,15 +61541,16 @@ self: { }) {}; "hledger-irr" = callPackage - ({ mkDerivation, base, Cabal, hledger-lib, statistics, time }: + ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics + , time + }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.4"; - sha256 = "0nqd8br86d71dpwq7p8956q74pgqdimid42xikp9zvf632x2s8ax"; + version = "0.1.1.5"; + sha256 = "0xv8rmxf1534g6mbxlhmrx71w0amdrhhj1dwyw5dv91i743br5mp"; isLibrary = false; isExecutable = true; - buildDepends = [ base Cabal hledger-lib statistics time ]; - jailbreak = true; + buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -60727,8 +61565,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "0.24"; - sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns"; + version = "0.24.1"; + sha256 = "1clzy72f34b497hsjkfjpgkhmn0dl19an9j4r11mn2q8z06106nc"; buildDepends = [ array base blaze-markup bytestring cmdargs containers csv Decimal directory filepath HUnit mtl old-locale old-time parsec pretty-show @@ -60794,6 +61632,21 @@ self: { license = "GPL"; }) {}; + "hlibBladeRF" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, hlint, libbladeRF + }: + mkDerivation { + pname = "hlibBladeRF"; + version = "0.1.0.6"; + sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw"; + buildDepends = [ base bindings-DSL bytestring ]; + testDepends = [ base hlint ]; + pkgconfigDepends = [ libbladeRF ]; + homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; + description = "Haskell binding to libBladeRF SDR library"; + license = stdenv.lib.licenses.lgpl21; + }) { inherit (pkgs) libbladeRF;}; + "hlibev" = callPackage ({ mkDerivation, base, ev, network }: mkDerivation { @@ -60842,8 +61695,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.16"; - sha256 = "11ykjslyr8sgpa1jpnv3vdzz0nxyrxw3mzcsdbidgzw7aphpzcb3"; + version = "1.9.18"; + sha256 = "03wdfl0jmb5szcv61dd8cm0xh5z6qhpy0d5xf6wh3lybma9pjmsb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60959,8 +61812,8 @@ self: { }: mkDerivation { pname = "hmatrix"; - version = "0.16.1.4"; - sha256 = "1bxhps1imw3iik0wvwa4x95kqa1qsm5jqwz16nalaclg2cynaaws"; + version = "0.16.1.5"; + sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq"; buildDepends = [ array base binary bytestring deepseq random split storable-complex vector @@ -60999,12 +61852,12 @@ self: { }) {}; "hmatrix-glpk" = callPackage - ({ mkDerivation, base, glpk, hmatrix }: + ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.4.0.2"; - sha256 = "0ixsybmhm3fiwb3kgxm0bgnbbxkgv0k42k8phd7k78mhhsd5jmng"; - buildDepends = [ base hmatrix ]; + version = "0.4.1.0"; + sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi"; + buildDepends = [ base containers hmatrix ]; extraLibraries = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; @@ -61370,8 +62223,8 @@ self: { }: mkDerivation { pname = "hnetcdf"; - version = "0.2.2.0"; - sha256 = "1v1z6xvzmnhsvmxvncrf6bb2bf2map0kqwjn1myqm3pf1zpiqrxj"; + version = "0.3.0.0"; + sha256 = "1309kzb5jrc9yy18bir3dy3r5xhmfnbd180ky9x4l3i1m4q5r31s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61520,17 +62373,20 @@ self: { }) {}; "hoe" = callPackage - ({ mkDerivation, base, cmdargs, hint, mtl }: + ({ mkDerivation, base, cmdargs, exceptions, hint, mtl, regex-posix + , split, time + }: mkDerivation { pname = "hoe"; - version = "0.2"; - sha256 = "089iwvgz50mhdch1anag66g0wqya0sm5jhp2h32dfsi0hlrp34f7"; + version = "1.0.1"; + sha256 = "06z44i4lmd44l9fjdd49lf0j4a8gmh5njiwlr77ycsyxf9mcwaa1"; isLibrary = false; isExecutable = true; - buildDepends = [ base cmdargs hint mtl ]; - jailbreak = true; + buildDepends = [ + base cmdargs exceptions hint mtl regex-posix split time + ]; homepage = "http://github.com/tanakh/hoe"; - description = "Haskell One-liner Evaluator"; + description = "hoe: Haskell One-liner Evaluator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61837,22 +62693,21 @@ self: { "hoodle" = callPackage ({ mkDerivation, base, cmdargs, configurator, containers, directory - , dyre, filepath, hoodle-core, mtl + , filepath, hoodle-core, mtl }: mkDerivation { pname = "hoodle"; - version = "0.3"; - sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5"; + version = "0.4.0"; + sha256 = "0ygmizbhag16ifdyp8gcvs0m9vinvirn8v7jfbi2m457bllmbsmq"; isLibrary = true; isExecutable = true; buildDepends = [ - base cmdargs configurator containers directory dyre filepath - hoodle-core mtl + base cmdargs configurator containers directory filepath hoodle-core + mtl ]; homepage = "http://ianwookim.org/hoodle"; description = "Executable for hoodle"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoodle-builder" = callPackage @@ -61861,8 +62716,8 @@ self: { }: mkDerivation { pname = "hoodle-builder"; - version = "0.3"; - sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9"; + version = "0.3.0"; + sha256 = "0g4a3gf1mgf5gyniif0i2b89dz416h28171mwx7k7ivjw23gjvm7"; buildDepends = [ base blaze-builder bytestring double-conversion hoodle-types lens strict text @@ -61873,35 +62728,35 @@ self: { "hoodle-core" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64-bytestring, binary, bytestring, cairo, cereal - , configurator, containers, coroutine-object, dbus, Diff, directory - , dyre, either, errors, filepath, fsnotify, gd, gtk, hoodle-builder - , hoodle-parser, hoodle-render, hoodle-types, lens, libX11, libXi - , monad-loops, mtl, network, network-info, network-simple - , old-locale, pango, poppler, process, pureMD5, stm, strict - , svgcairo, system-filepath, template-haskell, text, time - , transformers, transformers-free, unordered-containers, uuid - , vector, xournal-parser + , base64-bytestring, binary, bytestring, cairo, case-insensitive + , cereal, configurator, containers, coroutine-object, Diff + , directory, either, errors, filepath, fsnotify, gd, gtk + , handa-gdata, hoodle-builder, hoodle-parser, hoodle-publish + , hoodle-render, hoodle-types, http-types, lens, libX11, libXi + , monad-loops, mtl, network-uri, old-locale, pango, poppler + , process, pureMD5, stm, strict, svgcairo, system-filepath + , template-haskell, text, time, transformers, transformers-free + , unordered-containers, uuid, vector, websockets, xournal-parser }: mkDerivation { pname = "hoodle-core"; - version = "0.14"; - sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8"; + version = "0.15.0"; + sha256 = "04007hbnv4n3dl2yngfjzl6vrqd40yk5h9lq0ws2z33k4xa3a3rk"; buildDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary - bytestring cairo cereal configurator containers coroutine-object - dbus Diff directory dyre either errors filepath fsnotify gd gtk - hoodle-builder hoodle-parser hoodle-render hoodle-types lens - monad-loops mtl network network-info network-simple old-locale - pango poppler process pureMD5 stm strict svgcairo system-filepath - template-haskell text time transformers transformers-free - unordered-containers uuid vector xournal-parser + bytestring cairo case-insensitive cereal configurator containers + coroutine-object Diff directory either errors filepath fsnotify gd + gtk handa-gdata hoodle-builder hoodle-parser hoodle-publish + hoodle-render hoodle-types http-types lens monad-loops mtl + network-uri old-locale pango poppler process pureMD5 stm strict + svgcairo system-filepath template-haskell text time transformers + transformers-free unordered-containers uuid vector websockets + xournal-parser ]; extraLibraries = [ libX11 libXi ]; homepage = "http://ianwookim.org/hoodle"; description = "Core library for hoodle"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; "hoodle-extra" = callPackage @@ -61938,8 +62793,8 @@ self: { }: mkDerivation { pname = "hoodle-parser"; - version = "0.3"; - sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i"; + version = "0.3.0"; + sha256 = "0qp7x6csacf4w9crvmyrs7qsm9caici95qiwm11zyzyz2k9nm52g"; buildDepends = [ attoparsec base bytestring containers either hoodle-types lens mtl strict text transformers xournal-types @@ -61951,48 +62806,46 @@ self: { "hoodle-publish" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cairo, cmdargs - , containers, coroutine-object, directory, directory-tree, filepath - , gtk, hoodle-parser, hoodle-render, hoodle-types, HTTP, io-streams - , lens, mtl, network, pdf-toolbox-core, pdf-toolbox-document - , poppler, process, transformers, uuid + , containers, directory, directory-tree, filepath, gtk + , hoodle-parser, hoodle-render, hoodle-types, HTTP, io-streams + , lens, mtl, network-uri, pdf-toolbox-core, pdf-toolbox-document + , process, transformers, unordered-containers, uuid }: mkDerivation { pname = "hoodle-publish"; - version = "0.1"; - sha256 = "13753yhv9vlpbjjigciqingjxwm4vhv8lmam8qyqykrmd33ygj31"; - isLibrary = false; + version = "0.2.0"; + sha256 = "1nx2y4f000gid9mps0xxx4l6h0nh120568h9cl45gsp6qlw3sa5m"; + isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec base bytestring cairo cmdargs containers - coroutine-object directory directory-tree filepath gtk - hoodle-parser hoodle-render hoodle-types HTTP io-streams lens mtl - network pdf-toolbox-core pdf-toolbox-document poppler process - transformers uuid + attoparsec base bytestring cairo cmdargs containers directory + directory-tree filepath gtk hoodle-parser hoodle-render + hoodle-types HTTP io-streams lens mtl network-uri pdf-toolbox-core + pdf-toolbox-document process transformers unordered-containers uuid ]; homepage = "http://ianwookim.org/hoodle"; description = "publish hoodle files as a static web site"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd3; }) {}; "hoodle-render" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cairo - , containers, directory, filepath, gd, gtk, hoodle-types, lens - , monad-loops, mtl, poppler, stm, strict, svgcairo, transformers - , unix, unordered-containers, uuid + , containers, directory, filepath, gd, gtk, hashable, hoodle-types + , lens, monad-loops, mtl, poppler, stm, strict, svgcairo, time + , transformers, unix, unordered-containers, uuid }: mkDerivation { pname = "hoodle-render"; - version = "0.4"; - sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d"; + version = "0.5.0"; + sha256 = "0460j9flj5cnvgv6cnchc6am0r5sw81lp67qf45rgcyjpz9q424i"; buildDepends = [ base base64-bytestring bytestring cairo containers directory - filepath gd gtk hoodle-types lens monad-loops mtl poppler stm - strict svgcairo transformers unix unordered-containers uuid + filepath gd gtk hashable hoodle-types lens monad-loops mtl poppler + stm strict svgcairo time transformers unix unordered-containers + uuid ]; description = "Hoodle file renderer"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd3; }) {}; "hoodle-types" = callPackage @@ -62001,8 +62854,8 @@ self: { }: mkDerivation { pname = "hoodle-types"; - version = "0.3"; - sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm"; + version = "0.3.0"; + sha256 = "0mkx3n1sni43665dk5ify890wdfxamxvkx1h61kzsk3c3bazngr5"; buildDepends = [ base bytestring cereal containers lens mtl strict text uuid ]; @@ -62151,25 +63004,26 @@ self: { "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec - , base, base16-bytestring, bytestring, cereal, cereal-conduit + , base, base16-bytestring, binary, binary-conduit, bytestring , conduit, conduit-extra, containers, crypto-pubkey, cryptohash , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset, lens , monad-loops, old-locale, openpgp-asciiarmor, optparse-applicative - , resourcet, text, time, transformers, unordered-containers, yaml + , resourcet, text, time, transformers, unordered-containers + , wl-pprint-extras, yaml }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.13"; - sha256 = "07w46jcdx573p4jii6xvgz1y8xm4iab89jg8jh0645pja5zv8nsz"; + version = "0.14"; + sha256 = "16syq600zgq5b60ghvxnnaskn984bqv60024bvpgzydv41l61lcd"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson ansi-wl-pprint array attoparsec base base16-bytestring - bytestring cereal cereal-conduit conduit conduit-extra containers + aeson ansi-wl-pprint array attoparsec base base16-bytestring binary + binary-conduit bytestring conduit conduit-extra containers crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP ixset lens monad-loops old-locale openpgp-asciiarmor optparse-applicative resourcet text time transformers - unordered-containers yaml + unordered-containers wl-pprint-extras yaml ]; buildTools = [ alex happy ]; homepage = "http://floss.scru.org/hopenpgp-tools"; @@ -62277,8 +63131,8 @@ self: { ({ mkDerivation, AC-Angle, base, time }: mkDerivation { pname = "horizon"; - version = "0.1.0"; - sha256 = "0yzchd0kfszwf0dwr8vbg7zbr6an5zk0hw658mj82d89jmzldwjv"; + version = "0.1.1"; + sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4"; buildDepends = [ AC-Angle base time ]; homepage = "https://github.com/intractable/horizon"; description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates"; @@ -62653,31 +63507,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpc_0_6_0_1" = callPackage - ({ mkDerivation, base, containers, directory, time }: + "hpc_0_6_0_2" = callPackage + ({ mkDerivation, base, containers, directory, filepath, time }: mkDerivation { pname = "hpc"; - version = "0.6.0.1"; - sha256 = "00fn4kyghf6nqnn24nrjagkgjmwnq40s94jf47v9fbhllvqbq952"; - buildDepends = [ base containers directory time ]; + version = "0.6.0.2"; + sha256 = "1bqa9jmnjqk4jbvx2y90rz717hf2rhzbpmy9xqan97pyrkjz3rlm"; + buildDepends = [ base containers directory filepath time ]; description = "Code Coverage Library for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cmdargs - , containers, curl, hpc, HUnit, process, regex-posix, retry, safe - , split + , containers, curl, directory, directory-tree, hpc, HUnit, process + , pureMD5, regex-posix, retry, safe, split }: mkDerivation { pname = "hpc-coveralls"; - version = "0.8.3"; - sha256 = "02nqp267dcqrl81p7pn0bwpi44lakwl6pi47n9i1cnr7abcadglb"; + version = "0.9.0"; + sha256 = "0ika073kkm8kivd0m2dhb7ysk5h7q9vsj02xf4azh3c4xpvw4086"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async base bytestring cmdargs containers curl hpc process - regex-posix retry safe split + aeson async base bytestring cmdargs containers curl directory + directory-tree hpc process pureMD5 regex-posix retry safe split ]; testDepends = [ base HUnit ]; homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; @@ -62722,8 +63576,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.3"; - sha256 = "11khylc73hsg8p64jz5ykdnpix7f5qv3zk2kf0n42yync290jc9w"; + version = "0.1.2.8"; + sha256 = "1jz82d9z27zci1dl0d33xc1q96dip3b86f8i2dhxyahpi9p7khjm"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -62771,25 +63625,25 @@ self: { }) {}; "hpqtypes" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, test-framework, test-framework-hunit, text, time - , transformers, transformers-base, vector + ({ mkDerivation, base, bytestring, containers, data-default-class + , exceptions, HUnit, lifted-base, monad-control, mtl, postgresql + , QuickCheck, random, resource-pool, test-framework + , test-framework-hunit, text, time, transformers, transformers-base + , vector }: mkDerivation { pname = "hpqtypes"; - version = "1.3.2"; - sha256 = "10axgrdhfas2rgy56yzcdwr0bbi6kijkbn3b8cpi7jkxs7pnqp6x"; + version = "1.4.0"; + sha256 = "0sq4abqqqq71yw2rgpx5xmm7h8fhcj654vbkhb4wlgi1g5kj9kh1"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring containers exceptions HUnit lifted-base - monad-control mtl QuickCheck random resource-pool test-framework - test-framework-hunit text time transformers transformers-base - vector + base bytestring containers data-default-class exceptions HUnit + lifted-base monad-control mtl QuickCheck random resource-pool + test-framework test-framework-hunit text time transformers + transformers-base vector ]; extraLibraries = [ postgresql ]; - jailbreak = true; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) postgresql;}; @@ -63396,6 +64250,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-re" = callPackage + ({ mkDerivation, array, base, regex-base, regex-posix }: + mkDerivation { + pname = "hs-re"; + version = "0.1.0"; + sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb"; + buildDepends = [ array base regex-base regex-posix ]; + description = "Easy to use Regex"; + license = stdenv.lib.licenses.mit; + }) {}; + "hs-scrape" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , exceptions, hspec, html-conduit, lens, retry, safe, tasty @@ -64101,8 +64966,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.20.3"; - sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; + version = "1.22"; + sha256 = "1iqmxvpvj3icg7mhx4450p2wqjsfx1xh3lwgrrmxvm339hksx3rw"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -64498,6 +65363,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsilop" = callPackage + ({ mkDerivation, base, haskeline }: + mkDerivation { + pname = "hsilop"; + version = "0.1.0.0"; + sha256 = "1yaghdyw94ynq5wg6qk5yswrwwf4vx6j7kpl43alym8dh754npw5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base haskeline ]; + homepage = "https://github.com/Rnhmjoj/hsilop"; + description = "RPN calculator"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsimport" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre , filepath, haskell-src-exts, lens, mtl, split, tasty, tasty-golden @@ -65207,8 +66086,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.2"; - sha256 = "0w2zvzpa5294y8hbjjnpd9kyq42i8l5ca6dpf2zl8mwnmfqzc733"; + version = "0.3.2.3"; + sha256 = "187j2fhiwv3v2rlh1h9jdxpywdms9n37yp3597dmsbq2kggzsigh"; buildDepends = [ base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers @@ -65315,8 +66194,8 @@ self: { }: mkDerivation { pname = "hspec-webdriver"; - version = "1.0.1"; - sha256 = "14fdmlvdpkq2f05kjdwiz48m4mrlzgq3dr7k19ljpv2rvcjv6lr9"; + version = "1.0.2"; + sha256 = "1wkdv129arxbfby1214a93sfqbi1kvkgvqpp4z6qzh45q74hhd9c"; buildDepends = [ base data-default hashable hspec hspec-core HUnit lifted-base stm text transformers unordered-containers webdriver @@ -65468,9 +66347,8 @@ self: { }) { inherit (pkgs) sqlite;}; "hsqml" = callPackage - ({ mkDerivation, base, c2hs, containers, directory, filepath - , Qt5Core, Qt5Gui, Qt5Qml, Qt5Quick, Qt5Widgets, QuickCheck, tagged - , text, transformers + ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5 + , QuickCheck, tagged, text, transformers }: mkDerivation { pname = "hsqml"; @@ -65481,13 +66359,11 @@ self: { ]; testDepends = [ base containers directory QuickCheck tagged text ]; buildTools = [ c2hs ]; - pkgconfigDepends = [ Qt5Core Qt5Gui Qt5Qml Qt5Quick Qt5Widgets ]; + pkgconfigDepends = [ qt5 ]; homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) { Qt5Core = null; Qt5Gui = null; Qt5Qml = null; - Qt5Quick = null; Qt5Widgets = null;}; + }) { inherit (pkgs) qt5;}; "hsqml-demo-morris" = callPackage ({ mkDerivation, base, containers, deepseq, directory, hsqml @@ -65874,21 +66750,20 @@ self: { }) {}; "hsx2hs" = callPackage - ({ mkDerivation, base, haskell-src-exts, haskell-src-meta, mtl - , template-haskell, utf8-string + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string }: mkDerivation { pname = "hsx2hs"; - version = "0.13.2"; - sha256 = "1xszshj94vwh9mxm1h4pvj7x0jivid065f1gqf1l4crd4d4488mc"; + version = "0.13.3.1"; + sha256 = "12hj4vqkz097kjf2gk40jj9r61sydfmlhm6b5r0z1q96ys9m82k9"; isLibrary = true; isExecutable = true; buildDepends = [ - base haskell-src-exts haskell-src-meta mtl template-haskell - utf8-string + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string ]; - jailbreak = true; - homepage = "http://hub.darcs.net/nibro/hsx2hs"; + homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -66229,8 +67104,8 @@ self: { }: mkDerivation { pname = "htsn-import"; - version = "0.2.1"; - sha256 = "1gwijlkrdb3p79za7h2m3ilcwnrxmffqn3xvmd3sfszvrj2wws6n"; + version = "0.2.4"; + sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -66276,27 +67151,27 @@ self: { "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, exceptions, filepath, ghc-prim - , hspec, http-types, mime-types, monad-control, network - , network-uri, publicsuffixlist, random, streaming-commons, text - , time, transformers, zlib + , blaze-builder, bytestring, case-insensitive, clock, containers + , cookie, data-default-class, deepseq, directory, exceptions + , filepath, ghc-prim, hspec, http-types, mime-types, monad-control + , network, network-uri, publicsuffixlist, random, streaming-commons + , text, time, transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.4.7.1"; - sha256 = "1vkz0a8rzdgx1lnxcic62hbp8v3y0dvqr1dv6h7lq0d6rbv24hk3"; + version = "0.4.9"; + sha256 = "1dr8xd1y615hrc9557804zc9k1zi39rfb0hrmpr8ay28f71mb4an"; buildDepends = [ array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq + case-insensitive clock containers cookie data-default-class deepseq exceptions filepath ghc-prim http-types mime-types network network-uri publicsuffixlist random streaming-commons text time transformers ]; testDepends = [ async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq hspec http-types monad-control - network streaming-commons text time transformers zlib + case-insensitive containers deepseq directory hspec http-types + monad-control network streaming-commons text time transformers zlib ]; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; @@ -66531,8 +67406,8 @@ self: { }: mkDerivation { pname = "http-date"; - version = "0.0.5"; - sha256 = "12vvv5vjwbmgsmrmkxs72z4qvkbb7gns749j7dmnf39sy7c5s93g"; + version = "0.0.6"; + sha256 = "0f1s4bfazckl016pi2nzrmmiv0f6pnr9mgvsdj33ysvknp0md3c9"; buildDepends = [ array attoparsec base bytestring ]; testDepends = [ base bytestring doctest hspec old-locale time ]; description = "HTTP Date parser/formatter"; @@ -66621,8 +67496,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.5.1"; - sha256 = "0jfnbmdpagpw882a9gnf8pp9b63pm6w20xb2w6yv6h4ljvl6f07c"; + version = "0.6.0"; + sha256 = "05vjlfa4z5g84y2vq9c4dhasjl8w55n0si0iy3fkl980jkx59771"; buildDepends = [ base bytestring case-insensitive containers ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck case-insensitive @@ -66726,8 +67601,8 @@ self: { }: mkDerivation { pname = "http-server"; - version = "1.0.5"; - sha256 = "1mbdla50sxdi7fs1l2wrk42nyrb4s9ls86x695jch4zwg06q0gx3"; + version = "1.0.6"; + sha256 = "1da385swv7x92d8cpdz28bdp38a8h058svbbpnkqpvrs0m0lgm2w"; buildDepends = [ base HTTP mime network network-uri text unix url utf8-string ]; @@ -66967,8 +67842,8 @@ self: { }: mkDerivation { pname = "hub"; - version = "1.4.0"; - sha256 = "1720gcn6d3j0i2j317savgd57n81330pjdsnlymsdg12704xs59i"; + version = "1.9.0.1"; + sha256 = "10hcaddk1mqzyl1fmzsvzqq141lg9a43295158ckmkbnx8i1rxv1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -67151,6 +68026,88 @@ self: { license = "GPL"; }) {}; + "hunt-searchengine" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring + , containers, data-default, data-r-tree, data-stringmap, deepseq + , directory, dlist, filepath, hslogger, HUnit, hxt-regex-xmlschema + , monad-parallel, mtl, murmur-hash, old-locale, parsec, QuickCheck + , random, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "hunt-searchengine"; + version = "0.3.0.1"; + sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6"; + buildDepends = [ + aeson aeson-pretty base binary bytestring containers data-default + data-r-tree data-stringmap deepseq dlist filepath hslogger + hxt-regex-xmlschema monad-parallel mtl murmur-hash parsec text time + transformers unordered-containers vector + ]; + testDepends = [ + aeson base binary containers data-default data-r-tree directory + HUnit monad-parallel mtl old-locale QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 text + time + ]; + jailbreak = true; + homepage = "http://github.com/hunt-framework/"; + description = "A search and indexing engine"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hunt-server" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, blaze-html + , blaze-markup, bytestring, cmdargs, containers, data-default + , deepseq, ekg-core, hamlet, hslogger, http-types + , hunt-searchengine, mtl, scotty, shakespeare-js, text, wai + , wai-extra, wai-middleware-static, warp + }: + mkDerivation { + pname = "hunt-server"; + version = "0.3.0.2"; + sha256 = "19bbn97pj01sbqbjkgh82hiwzxfybnnm29wj4irgicab0d72jvg6"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aeson-pretty base binary blaze-html blaze-markup bytestring + cmdargs containers data-default deepseq ekg-core hamlet hslogger + http-types hunt-searchengine mtl scotty shakespeare-js text wai + wai-extra wai-middleware-static warp + ]; + jailbreak = true; + homepage = "http://github.com/hunt-framework"; + description = "A search and indexing engine server"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hunt-server-cli" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring + , conduit, conduit-extra, containers, csv-conduit, data-default + , docopt, hslogger, http-types, hunt-client, hunt-searchengine, mtl + , resourcet, string-conversions, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "hunt-server-cli"; + version = "0.2.0.0"; + sha256 = "1pmlg06jipmc99v7clz2q7x3bh4ndar55595fx729khnjrbiy9bz"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aeson-pretty base binary bytestring conduit conduit-extra + containers csv-conduit data-default docopt hslogger http-types + hunt-client hunt-searchengine mtl resourcet string-conversions text + time transformers unordered-containers + ]; + jailbreak = true; + homepage = "http://github.com/hunt-framework"; + description = "A Command line Interface for the Hunt server"; + license = stdenv.lib.licenses.mit; + broken = true; + }) { hunt-client = null;}; + "hurdle" = callPackage ({ mkDerivation, array, base, bytestring, containers, kangaroo }: mkDerivation { @@ -67298,13 +68255,14 @@ self: { }: mkDerivation { pname = "hwsl2"; - version = "0.2.0.0"; - sha256 = "0cyc4y99ird4mxpasrbk82x7xl63r7cc710qisvm8qvjlmriw87b"; + version = "0.3.0.1"; + sha256 = "1zs1wlnvh316n914mrlihrd4njbnq9n070ckq5f7hbax37v3h9p5"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck QuickCheck quickcheck-properties ]; + jailbreak = true; homepage = "https://github.com/srijs/hwsl2"; description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; @@ -67539,8 +68497,8 @@ self: { }: mkDerivation { pname = "hxt-regex-xmlschema"; - version = "9.2.0.1"; - sha256 = "1djwqmd9kd28n7w3k28ks4xwb94d1q6i4yf1kj22iwr9cyy23xc1"; + version = "9.2.0.2"; + sha256 = "1hkcd5p7rhv8z2vlcpd1gcdiyni28m8k8yd5fnxw8a9bvrnnfi27"; buildDepends = [ base bytestring hxt-charproperties parsec text ]; testDepends = [ base bytestring HUnit parsec text ]; homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; @@ -67783,6 +68741,7 @@ self: { base hydrogen-cli-args hydrogen-data hydrogen-multimap hydrogen-parsing hydrogen-prelude hydrogen-syntax ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.mit; @@ -67799,6 +68758,7 @@ self: { buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli-args/"; description = "Hydrogen Command Line Arguments Parser"; license = stdenv.lib.licenses.mit; @@ -67811,6 +68771,7 @@ self: { version = "0.14"; sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88"; buildDepends = [ base hydrogen-parsing hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-data/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.bsd3; @@ -67835,6 +68796,7 @@ self: { version = "0.14"; sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; buildDepends = [ base containers hydrogen-prelude parsec ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; description = "Hydrogen Parsing Utilities"; license = stdenv.lib.licenses.mit; @@ -67848,8 +68810,8 @@ self: { }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.14"; - sha256 = "05xpxgvpllay8rqs5hbkr5pf8i1aanr72651xkz02qp864g0i822"; + version = "0.15"; + sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; buildDepends = [ array base cereal containers directory filepath hashable hydrogen-multimap hydrogen-version network nicify process random @@ -67873,6 +68835,7 @@ self: { base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-syntax/"; description = "Hydrogen Syntax"; license = stdenv.lib.licenses.bsd3; @@ -68000,9 +68963,8 @@ self: { }: mkDerivation { pname = "hyperloglog"; - version = "0.3"; - sha256 = "1agywf7142d02m8pza84pzw908g1fjgc6799w7h93mwq63c0708m"; - editedCabalFile = "6a6ade94dda076697ee8a68b39f7197921c32794626fd56f1654e81f3b1bd6a1"; + version = "0.3.1"; + sha256 = "13pmqkqldy5n274rld9acdypp39f51qmc9v14kwpw95lkpd9bxnl"; buildDepends = [ approximate base binary bits bytes cereal cereal-vector comonad deepseq distributive generic-deriving hashable hashable-extras lens @@ -68012,7 +68974,6 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; @@ -68054,8 +69015,8 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.4.2"; - sha256 = "05nhspfsf6nzkv9jivzrf39l24mmm7sb3p8k3sabgb058k3a4h28"; + version = "0.4.2.1"; + sha256 = "069mbxdjlj36lyxr8bqkh1d05bhly64wk5lk71mz73lzcyaivcxi"; buildDepends = [ base containers unordered-containers ]; testDepends = [ base containers directory doctest filepath unordered-containers @@ -68734,6 +69695,7 @@ self: { base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat ]; + jailbreak = true; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -69103,6 +70065,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "incremental-computing" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers + , dlist, fingertree, order-maintenance, QuickCheck, transformers + }: + mkDerivation { + pname = "incremental-computing"; + version = "0.0.0.0"; + sha256 = "0zdq122m0nq18igvdxis7lqgdflf6sc94m1aqypjwfkxy4qfvvq3"; + buildDepends = [ + base containers dlist fingertree order-maintenance transformers + ]; + testDepends = [ + base Cabal cabal-test-quickcheck containers QuickCheck + ]; + homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing"; + description = "Incremental computing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "incremental-parser" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck @@ -69378,8 +70359,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.0.1"; - sha256 = "196cv6lidxmjhsj83maflsnxqivw6q60nrw5ib1ssl4iqqry4k02"; + version = "0.9.1.1"; + sha256 = "0ijc97xj1fz8ahfg0dha5mmbvd5nsb38dlvyvrwq2gpr0j79138r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69391,7 +70372,6 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; - jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -69599,8 +70579,8 @@ self: { ({ mkDerivation, base, parallel }: mkDerivation { pname = "integration"; - version = "0.2.0.1"; - sha256 = "1pwykd7jjy1d7inf747mpz2bh7ygakmlb90xi57dwm8h249knbmk"; + version = "0.2.1"; + sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; buildDepends = [ base parallel ]; homepage = "https://github.com/ekmett/integration"; description = "Fast robust numeric integration via tanh-sinh quadrature"; @@ -70376,11 +71356,10 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "ireal"; - version = "0.1"; - sha256 = "0qphr5fr118549wr09aq6yf4v7f346pdv0w8ga7a1svq3ckkyp5d"; - editedCabalFile = "af37b981aa1951e703f72692dfc337c0a0048afaf2148307d5061b035ab62ef7"; + version = "0.2.1"; + sha256 = "0i9850l0k1w7vmdx4cs35789rf6j4i1xalpyrinf8x85f6c8mfxa"; buildDepends = [ base QuickCheck ]; - description = "Real numbers and intervals with not so inefficient exact arithmetic"; + description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71134,8 +72113,8 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.2"; - sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr"; + version = "1.3"; + sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal ]; @@ -71536,30 +72515,31 @@ self: { "jose" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, byteable, bytestring, certificate, crypto-pubkey + , bifunctors, byteable, bytestring, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash , data-default-class, ghc-prim, hspec, integer-gmp, lens , network-uri, old-locale, safe, semigroups, template-haskell, text - , time, unordered-containers, vector + , time, unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.3.38.0"; - sha256 = "0iwwq1gi5pmagxyrrlmirszdq0xnxj3n34kkw517yj465vlq0csj"; + version = "0.3.41.0"; + sha256 = "035kbwskcf36phcj2s33kx4jjw6km2sw0rm8jbad82d33h67yxah"; buildDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable - bytestring certificate crypto-pubkey crypto-pubkey-types - crypto-random cryptohash data-default-class ghc-prim integer-gmp - lens network-uri safe semigroups template-haskell text time - unordered-containers vector + bytestring crypto-pubkey crypto-pubkey-types crypto-random + cryptohash data-default-class ghc-prim integer-gmp lens network-uri + safe semigroups template-haskell text time unordered-containers + vector x509 ]; testDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable - bytestring certificate crypto-pubkey crypto-pubkey-types - crypto-random cryptohash data-default-class hspec lens network-uri - old-locale safe semigroups template-haskell text time - unordered-containers vector + bytestring crypto-pubkey crypto-pubkey-types crypto-random + cryptohash data-default-class hspec lens network-uri old-locale + safe semigroups template-haskell text time unordered-containers + vector x509 ]; + jailbreak = true; homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; @@ -71576,8 +72556,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.4.1"; - sha256 = "0j4f0w2v1fwfiylvlwk9l0646wnmjcz36faw9h76j4brzsj0dc23"; + version = "0.4.1.1"; + sha256 = "0myldbliixd45h1fklzjn7r4gdw5nsl1swp3h14wdl1lck4zd7fq"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -71645,21 +72625,18 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell - , text, transformers, webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, hslogger, lens, template-haskell, text + , transformers }: mkDerivation { pname = "jsaddle"; version = "0.2.0.3"; sha256 = "0bldhn9bhhz07shcdcdc0p01ggxa8af43cf0bza9za8zywgq5i9x"; - buildDepends = [ - base lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; + buildDepends = [ base lens template-haskell text transformers ]; testDepends = [ - base glib gtk3 hslogger lens template-haskell text transformers - webkitgtk3 webkitgtk3-javascriptcore + base hslogger lens template-haskell text transformers ]; + jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -71723,8 +72700,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9"; - sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j"; + version = "0.9.1"; + sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; buildDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -71751,20 +72728,21 @@ self: { "json-autotype" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, filepath - , GenericPretty, hashable, hflags, lens, mtl, pretty, process + , GenericPretty, hashable, hflags, hint, lens, mtl, pretty, process , scientific, text, uniplate, unordered-containers, vector }: mkDerivation { pname = "json-autotype"; - version = "0.2.5.4"; - sha256 = "10054yvzc4fql2wwhwnv3pl33vjgf2k4dgg1sz26k8x59629n5f7"; + version = "0.2.5.9"; + sha256 = "0ajsxg515484bqmg94l9gmg4jpfvv6ykcbnyglkh1j86phggxrf2"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring containers filepath GenericPretty hashable - hflags lens mtl pretty process scientific text uniplate + hflags hint lens mtl pretty process scientific text uniplate unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -72153,8 +73131,8 @@ self: { }: mkDerivation { pname = "jsontsv"; - version = "0.1.4.5"; - sha256 = "07yls78gj5zfi0d1kkcsf22wcq2wip9nm6yp1r5m8li8rhzxcczi"; + version = "0.1.4.6"; + sha256 = "05rfpzs7ln87n17dbq22g990hkiqwwr656w6l2mrqfnq10qzx8xc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -72383,8 +73361,8 @@ self: { }: mkDerivation { pname = "kansas-lava-papilio"; - version = "0.1.0"; - sha256 = "0ikc6yfcv2fjx0szfmp92nrdhdfdivlc14a7w214i0q3vrncjkzm"; + version = "0.2.0"; + sha256 = "1p1mlpcm5jaxa6ja5g9vcgkf1dqnh6b2xzy45m0qas9ak47qrhrd"; buildDepends = [ ansi-terminal base bytestring data-default directory filepath kansas-lava kansas-lava-cores netlist network sized-types @@ -72514,14 +73492,13 @@ self: { }) {}; "kdt" = callPackage - ({ mkDerivation, base, deepseq, deepseq-generics, pqueue - , QuickCheck + ({ mkDerivation, base, deepseq, deepseq-generics, heap, QuickCheck }: mkDerivation { pname = "kdt"; - version = "0.2.2"; - sha256 = "1kj914xya5msw9hb2lqa36jf68pna8dfq21jbylq2m68k0ydcivi"; - buildDepends = [ base deepseq deepseq-generics pqueue ]; + version = "0.2.3"; + sha256 = "0chxxl53jnnhfs02gxr2a3kzppmsnwrrfr1fjyx71lkvigwy71yk"; + buildDepends = [ base deepseq deepseq-generics heap ]; testDepends = [ base deepseq deepseq-generics QuickCheck ]; homepage = "https://github.com/giogadi/kdt"; description = "Fast and flexible k-d trees for various types of point queries"; @@ -72564,8 +73541,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.3.8"; - sha256 = "1128ik8ad4s5nd2c4vjs7nm9db44hyd6w0z19642klyrxlhmr67w"; + version = "1.3.9.1"; + sha256 = "0b86f7j9yr4q24q88fwd2j4disns8mcwabrqgcz3hghrh6rhpgg9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -72938,8 +73915,8 @@ self: { }: mkDerivation { pname = "koofr-client"; - version = "1.0.0.1"; - sha256 = "1kbdln4jyd9k9lsa4hzx5kjvjkajrf4b11fy6vj2k928gqv2vqmj"; + version = "1.0.0.2"; + sha256 = "094rhsf910ifzazy3j937hgdkibvwjc5x69yxvglmizc3xl6qqfv"; buildDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -73017,8 +73994,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.6"; - sha256 = "14r28h3pywv87ksnw65jid90v2d3s4lzxm0m7i6wvww5080z804a"; + version = "2.16.8"; + sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -73204,6 +74181,7 @@ self: { attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -74005,21 +74983,16 @@ self: { }) {}; "language-ecmascript-analysis" = callPackage - ({ mkDerivation, base, containers, HUnit, language-ecmascript, mtl - , parsec, test-framework, test-framework-hunit, uniplate + ({ mkDerivation, base, containers, language-ecmascript, parsec + , uniplate }: mkDerivation { pname = "language-ecmascript-analysis"; - version = "0.9"; - sha256 = "073dh69mwz3x4v9xwa14pf9y04darzw1r5kfiv43646zs7axjd4p"; - editedCabalFile = "5fafd7ffe271f00fe33acdb4a18ef28a43a157836495144a0e113fd2bbf8f468"; + version = "0.9.1"; + sha256 = "04zc3iwls4hxlsa2c77an5q1h0xylndld02sn38sgykx6ibmmy9n"; buildDepends = [ base containers language-ecmascript parsec uniplate ]; - testDepends = [ - base HUnit language-ecmascript mtl test-framework - test-framework-hunit uniplate - ]; homepage = "http://github.com/jswebtools/language-ecmascript-analysis"; description = "JavaScript static analysis library"; license = stdenv.lib.licenses.bsd3; @@ -74185,18 +75158,20 @@ self: { }) {}; "language-lua" = callPackage - ({ mkDerivation, array, base, deepseq, directory, filepath, mtl - , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, alex, array, base, deepseq, directory, filepath + , mtl, parsec, QuickCheck, safe, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "language-lua"; - version = "0.6.3"; - sha256 = "0x7fafp78ipk4r2l2iagk7xgpbq5gwnqs33d4r4hk7k89jgjkv6c"; + version = "0.6.3.1"; + sha256 = "11q59pbl7bjx4x8xn07lq09a235l1sgw510s9lb89q35mm0mravi"; buildDepends = [ array base deepseq mtl parsec safe ]; testDepends = [ base deepseq directory filepath parsec QuickCheck tasty tasty-hunit tasty-quickcheck ]; + buildTools = [ alex ]; homepage = "http://github.com/osa1/language-lua"; description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -74275,14 +75250,14 @@ self: { , hslogger, hslua, hspec, http-conduit, http-types, HUnit, iconv , lens, lens-aeson, luautils, mtl, operational , optparse-applicative, parallel-io, parsec, parsers, pcre-utils - , process, regex-pcre-builtin, scientific, split, stateWriter, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml + , process, regex-pcre-builtin, scientific, split, stm + , strict-base-types, temporary, text, time, transformers-compat + , unix, unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.0.1"; - sha256 = "1bhhbr50xzb095nikfhc99sd5qmhzd81rg0z922x807r38kkdgnx"; + version = "1.1.0"; + sha256 = "1mda3ip071qx7xfhv3d4q1pdivhycsdk9fxykm7hcs9a7a4c5jls"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74291,14 +75266,13 @@ self: { Glob hashable hruby hslogger hslua hspec http-conduit http-types iconv lens lens-aeson luautils mtl operational optparse-applicative parallel-io parsec parsers pcre-utils process regex-pcre-builtin - scientific split stateWriter stm strict-base-types text time - transformers unix unordered-containers vector yaml + scientific split stm strict-base-types text time + transformers-compat unix unordered-containers vector yaml ]; testDepends = [ ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -74307,16 +75281,17 @@ self: { "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf - , pretty, transformers + , pretty, transformers, utf8-string }: mkDerivation { pname = "language-python"; - version = "0.4.1"; - sha256 = "174rj38bc3q4ak08d11r476wswfgv936m5x980kar7jj8p26q163"; + version = "0.5.0"; + sha256 = "1z0m0lbvrcjyh04zr52wi1zhmb28m4s67zlvf2wc6qh0z9y4l7wy"; buildDepends = [ - array base containers monads-tf pretty transformers + array base containers monads-tf pretty transformers utf8-string ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; @@ -74337,6 +75312,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-python-test" = callPackage + ({ mkDerivation, base, language-python }: + mkDerivation { + pname = "language-python-test"; + version = "0.5.0"; + sha256 = "0sxl2snzwi4v3fzfgdwy2fx1pih4qvh1z8s1qkkq346x76n4rgnv"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base language-python ]; + homepage = "http://github.com/bjpop/language-python-test"; + description = "testing code for the language-python library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -74686,8 +75675,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "lca"; - version = "0.2.4"; - sha256 = "0dj7qz5wnrgqipmxim8y8jwgkwn8skkqxbd2w2kiy9s380pfdbsi"; + version = "0.3"; + sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza"; buildDepends = [ base ]; testDepends = [ base doctest ]; homepage = "http://github.com/ekmett/lca/"; @@ -74856,8 +75845,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.1.0"; - sha256 = "12sfx2dmlv290ycy29nxjrxsl55q0qhyrcfn0z2nwmx0gvprpgyh"; + version = "0.3.2.0"; + sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -74954,29 +75943,29 @@ self: { ({ mkDerivation, array, base, bifunctors, bytestring, comonad , containers, contravariant, deepseq, directory, distributive , doctest, exceptions, filepath, free, generic-deriving, ghc-prim - , hashable, hlint, HUnit, mtl, nats, parallel, primitive - , profunctors, QuickCheck, reflection, semigroupoids, semigroups - , simple-reflect, split, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 + , hashable, hlint, HUnit, kan-extensions, mtl, nats, parallel + , primitive, profunctors, QuickCheck, reflection, semigroupoids + , semigroups, simple-reflect, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-th, text, transformers, transformers-compat , unordered-containers, vector, void }: mkDerivation { pname = "lens"; - version = "4.7"; - sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "a991d37b9cd348226fcdd0b99b079bede892c172b1ddf8a88142b01f80cd5775"; + version = "4.8"; + sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; + editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant - distributive exceptions filepath free ghc-prim hashable mtl - parallel primitive profunctors reflection semigroupoids semigroups - split tagged template-haskell text transformers transformers-compat - unordered-containers vector void + distributive exceptions filepath free ghc-prim hashable + kan-extensions mtl parallel primitive profunctors reflection + semigroupoids semigroups tagged template-haskell text transformers + transformers-compat unordered-containers vector void ]; testDepends = [ base bytestring containers deepseq directory doctest filepath generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect split test-framework test-framework-hunit + semigroups simple-reflect test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th text transformers unordered-containers vector ]; @@ -75068,8 +76057,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "lens-family-th"; - version = "0.4.0.0"; - sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5"; + version = "0.4.1.0"; + sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; @@ -75080,10 +76069,9 @@ self: { ({ mkDerivation, base, lens, QuickCheck, transformers }: mkDerivation { pname = "lens-properties"; - version = "4.0"; - sha256 = "07hjkcy90m1zph2bq5a7nw2f7xg0ndnkqml9zwh7vy35sb7512c6"; + version = "4.7"; + sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik"; buildDepends = [ base lens QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -75638,20 +76626,20 @@ self: { "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default, filepath, hspec, mtl, network, old-locale + , data-default-class, filepath, hspec, mtl, network, old-locale , QuickCheck, text, time, unix, utf8-string }: mkDerivation { pname = "libmpd"; - version = "0.9.0.1"; - sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd"; + version = "0.9.0.2"; + sha256 = "1q6lcp9gfzvzcsigv6958ng9c44kq68qh4amnszjjji0jq0lvdjz"; buildDepends = [ - attoparsec base bytestring containers data-default filepath mtl - network old-locale text time utf8-string + attoparsec base bytestring containers data-default-class filepath + mtl network old-locale text time utf8-string ]; testDepends = [ - attoparsec base bytestring containers data-default filepath hspec - mtl network old-locale QuickCheck text time unix utf8-string + attoparsec base bytestring containers data-default-class filepath + hspec mtl network old-locale QuickCheck text time unix utf8-string ]; homepage = "http://github.com/vimus/libmpd-haskell#readme"; description = "An MPD client library"; @@ -75846,20 +76834,20 @@ self: { }) { inherit (pkgs) systemd;}; "libtagc" = callPackage - ({ mkDerivation, base, bytestring, glib, tag_c, taglib_c }: + ({ mkDerivation, base, bytestring, glib, taglib }: mkDerivation { pname = "libtagc"; version = "0.12.0"; sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja"; buildDepends = [ base bytestring glib ]; - extraLibraries = [ tag_c ]; - pkgconfigDepends = [ taglib_c ]; + extraLibraries = [ taglib ]; + pkgconfigDepends = [ taglib ]; jailbreak = true; homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home"; description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { tag_c = null; taglib_c = null;}; + }) { inherit (pkgs) taglib;}; "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, syb, virt }: @@ -76163,21 +77151,23 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, binary, bytestring, containers - , deepseq, directory, distributive, doctest, filepath, ghc-prim - , hashable, HUnit, lens, reflection, semigroupoids, semigroups - , simple-reflect, tagged, template-haskell, test-framework - , test-framework-hunit, transformers, unordered-containers, vector + ({ mkDerivation, adjunctions, base, binary, bytes, bytestring + , cereal, containers, deepseq, directory, distributive, doctest + , filepath, ghc-prim, hashable, HUnit, lens, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector , void }: mkDerivation { pname = "linear"; - version = "1.16.2"; - sha256 = "1nd9jxg0zyjncmlxx6qf80378si5h1c4pnyy7zzwnbyqm81d9bqv"; + version = "1.18.0.1"; + sha256 = "06gbrmr7yv9s6la14g22lwqfjyfr0xrlmkrffizy4n01xknmkbig"; buildDepends = [ - adjunctions base binary containers deepseq distributive ghc-prim - hashable lens reflection semigroupoids semigroups tagged - template-haskell transformers unordered-containers vector void + adjunctions base binary bytes cereal containers deepseq + distributive ghc-prim hashable lens reflection semigroupoids + semigroups tagged template-haskell transformers transformers-compat + unordered-containers vector void ]; testDepends = [ base binary bytestring directory doctest filepath HUnit lens @@ -76241,8 +77231,8 @@ self: { }: mkDerivation { pname = "linear-opengl"; - version = "0.2.0.5"; - sha256 = "17njj6r6k31da254wa6q84x80rz9rwbdmmk9yi27d7zjmdczv94s"; + version = "0.2.0.6"; + sha256 = "1yb6c0r10d44pyahhzgyajphgyhmr9hs402633k6ynm3f1jdwyyg"; buildDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; @@ -76278,18 +77268,12 @@ self: { }) {}; "linearscan" = callPackage - ({ mkDerivation, base, containers, free, hoopl, hspec - , hspec-expectations, lens, mtl, transformers - }: + ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.3.1.0"; - sha256 = "12gg7i8shvj0qxwaazysiw5f3xmdzqyv40da3qqyknndvwcvw84i"; - buildDepends = [ base containers transformers ]; - testDepends = [ - base containers free hoopl hspec hspec-expectations lens mtl - transformers - ]; + version = "0.4.0.0"; + sha256 = "170dppl4hgfrxpqix19a7nf1dv46wc46s797h8ppa2j0xvcdf4xs"; + buildDepends = [ base containers mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; @@ -76301,8 +77285,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.1.0.0"; - sha256 = "19ahl0056szf49icv4sg0zcm2gmyy9sy8mj60d9c0iisj7qyblqj"; + version = "0.4.0.1"; + sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my"; buildDepends = [ base containers free hoopl linearscan transformers ]; @@ -76311,7 +77295,7 @@ self: { linearscan transformers ]; homepage = "http://github.com/jwiegley/linearscan-hoopl"; - description = "Make it easy to use the linearscan register allocator with Hoopl"; + description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76647,6 +77631,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lipsum-gen" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "lipsum-gen"; + version = "0.1.0.2"; + sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; + buildDepends = [ base QuickCheck ]; + description = "Generators for random sequences of English-like nonsense text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip @@ -76656,8 +77651,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.2.0"; - sha256 = "1r1i8c1hgp4d64zmm473nf4jbcyi7zrjfi6n2v19v38x8gjfg7jw"; + version = "0.2.3.1"; + sha256 = "0gjndhrd0cjwmvl2ligklvmqr64p50m42rvxb79i13jk2jb16pg5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76684,8 +77679,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.3.0.0"; - sha256 = "1dq87nd22pm5imh5x4gdwwzg3crdsbgzbfjlrxax4f0xn2b2q4b9"; + version = "0.3.1.0"; + sha256 = "0dcrgbwchssp62n8ywkdfa70dvx186338s3gyyj7rlfvxilfqc7k"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76877,6 +77872,7 @@ self: { base blaze-html blaze-markup cheapskate directory filepath highlighting-kate parsec text time unordered-containers ]; + jailbreak = true; homepage = "https://github.com/cdosborn/lit"; description = "A simple tool for literate programming"; license = "GPL"; @@ -77110,8 +78106,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.4.3"; - sha256 = "0mxi58dihbwj4534swhy5zlga5w1q2h4jrfvi33kw0pf12hvxqjv"; + version = "3.4.5.0"; + sha256 = "19rvpy7hfgkfjkijnasajrvzbw75ij7sfwg9z4w080x6w39rgppr"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -77136,8 +78132,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.4.1"; - sha256 = "147s03km3gp4v5gk5fi179qrha962w3xm7rnaxia9xzvh1161j9g"; + version = "3.4.5.0"; + sha256 = "0gb06b8bb5d7fmkjpbi3smjssjxk5xgmf3lv5axhm0rbndi6y9vc"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -77216,8 +78212,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.3.0.0"; - sha256 = "0m6sg2bng9ihak3hkbzqabdif0m8bblr8cvwgsdhq2ss059vmnws"; + version = "0.3.1.1"; + sha256 = "1qk3dlinhic9m8ahynqqi90y7ai728p10c4mkmj2w135wp8a8ran"; buildDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -77451,8 +78447,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.9.3"; - sha256 = "1l07pi7lnwyk3y747f7bgr1200p6apyfn7bch5v30kh7dy0wyi8m"; + version = "0.10.0.1"; + sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2"; buildDepends = [ base binary bytes cereal comonad deepseq distributive generic-deriving hashable hashable-extras safecopy semigroupoids @@ -77504,8 +78500,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.0.1"; - sha256 = "1v8n4x3mspsf5q0b9xf5rf8c6xwqc5qvyv1s0zjsqw823i2vkgag"; + version = "0.13.1"; + sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -77902,6 +78898,7 @@ self: { version = "0.3.1.1"; sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5"; buildDepends = [ base data-default gl linear vector ]; + jailbreak = true; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -78091,16 +79088,16 @@ self: { "lucid" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hspec, HUnit, mtl, parsec, text, transformers - , unordered-containers + , containers, hashable, hspec, HUnit, mtl, parsec, text + , transformers, unordered-containers }: mkDerivation { pname = "lucid"; - version = "2.9.1"; - sha256 = "0zb8zng5pilr8jcnn0vi0qlngv93p322xnkrypkr1sa5ywd7n9j0"; + version = "2.9.2"; + sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah"; buildDepends = [ - base blaze-builder bytestring containers mtl text transformers - unordered-containers + base blaze-builder bytestring containers hashable mtl text + transformers unordered-containers ]; testDepends = [ base bifunctors hspec HUnit mtl parsec text ]; homepage = "https://github.com/chrisdone/lucid"; @@ -78126,8 +79123,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.2"; - sha256 = "1zdndb81190xg2zwpw10pg0qpjvyp2jmvwm64s2bid3shlhibmmd"; + version = "0.4.0.4"; + sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12"; buildDepends = [ base blaze-builder lucid text transformers ]; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; @@ -78426,6 +79423,7 @@ self: { pname = "machines"; version = "0.4.1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; + editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -79180,8 +80178,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.2.0.0"; - sha256 = "1v110ji153gnr3rjlj6m3w9w30pmf6zc9z25d9l52rxggfd5pfy8"; + version = "0.2.1.0"; + sha256 = "0gmlf50hq9dh2xh74dvsyywrbrv7i31d6j7k4pgmfinn8pih03lz"; buildDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -79254,16 +80252,17 @@ self: { "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers - , MonadRandom, random, semigroups, transformers, vector - , vector-algorithms, vector-space, void + , MemoTrie, MonadRandom, random, semigroups, tagged, transformers + , vector, vector-algorithms, vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.1.0.0"; - sha256 = "1lbgkjhbfsps882vc2l97gwg92gh668kkhdwpy7rldbj7a9bdnzq"; + version = "0.1.0.2"; + sha256 = "05ysr2rmjc0rqgy409qcga8j748l0w322vxbjdw9yyhcp2kbrv14"; buildDepends = [ - base comonad constrained-categories containers MonadRandom random - semigroups transformers vector vector-algorithms vector-space void + base comonad constrained-categories containers MemoTrie MonadRandom + random semigroups tagged transformers vector vector-algorithms + vector-space void ]; description = "Working with manifolds in a direct, embedding-free way"; license = stdenv.lib.licenses.gpl3; @@ -79470,22 +80469,23 @@ self: { }) {}; "markup-preview" = callPackage - ({ mkDerivation, base, cmdargs, directory, glib, gtk, MissingH, mtl - , pandoc, temporary, text, transformers, webkit + ({ mkDerivation, base, cmdargs, directory, glib, gtk + , gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text + , transformers, webkit }: mkDerivation { pname = "markup-preview"; - version = "0.2.2.0"; - sha256 = "0b2rll29qsr3cqq4vfaqjr4b5b1a9b4rg9cxbs98sspmpxka88m2"; + version = "0.2.2.1"; + sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1"; isLibrary = false; isExecutable = true; buildDepends = [ - base cmdargs directory glib gtk MissingH mtl pandoc temporary text - transformers webkit + base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl + pandoc temporary text transformers webkit ]; jailbreak = true; description = "A simple markup document preview (markdown, textile, reStructuredText)"; - license = "unknown"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -79682,12 +80682,16 @@ self: { }) { eng = null; mat = null; mx = null;}; "matrices" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, binary, primitive, vector + , vector-binary-instances + }: mkDerivation { pname = "matrices"; - version = "0.3.0"; - sha256 = "18253z4ah4yxl8di0zsngsi1dip0yd85a62k9h5ha7i9mdq7k0hi"; - buildDepends = [ base primitive vector ]; + version = "0.3.2"; + sha256 = "09d2c6b99hiw858j9llawljb0ls2biky8ddc1cjc72605aacac73"; + buildDepends = [ + base binary primitive vector vector-binary-instances + ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79931,6 +80935,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "mdcat" = callPackage + ({ mkDerivation, ansi-terminal, base, directory, pandoc, terminfo + }: + mkDerivation { + pname = "mdcat"; + version = "0.1.0.4"; + sha256 = "0jynmcawrxwv6xfbwvz3915rsp2ssx9s8h7i3pgd5adlzqpws19l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ ansi-terminal base directory pandoc terminfo ]; + homepage = "https://github.com/dorafmon/mdcat"; + description = "Markdown viewer in your terminal"; + license = stdenv.lib.licenses.mit; + }) {}; + "mdo" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -80400,6 +81419,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mgeneric" = callPackage + ({ mkDerivation, base, containers, lens, mtl, template-haskell }: + mkDerivation { + pname = "mgeneric"; + version = "0.0.0.0"; + sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + buildDepends = [ base containers lens mtl template-haskell ]; + homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; + description = "Generics with multiple parameters"; + license = stdenv.lib.licenses.mit; + }) {}; + "mi" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, split , template-haskell @@ -80430,15 +81461,15 @@ self: { }) {}; "microformats2-types" = callPackage - ({ mkDerivation, aeson, base, data-default, either, pandoc-types + ({ mkDerivation, aeson, base, data-default-class, pandoc-types , setters, text, time }: mkDerivation { pname = "microformats2-types"; - version = "0.3.0"; - sha256 = "0wldwc9l6r2h63h22ymj62x17vcwqwswzqwcfs1nm81nrh2rj07a"; + version = "0.4.0"; + sha256 = "020193sbvg5arha9pvbc88wqrqyvshy19kz02knkh5kv0dzqngf6"; buildDepends = [ - aeson base data-default either pandoc-types setters text time + aeson base data-default-class pandoc-types setters text time ]; homepage = "https://github.com/myfreeweb/microformats2-types"; description = "Microformats 2 types (with Aeson instances)"; @@ -80497,8 +81528,8 @@ self: { }: mkDerivation { pname = "midi-util"; - version = "0.1"; - sha256 = "19b6x7n49yd6jwld65k2z5zj4mg5s0zgs3zb7y8a4fj2jp15p8kn"; + version = "0.1.1"; + sha256 = "14apfrhahm5pniwpjgk5ckgb1y6zlfxcb91xsh4qpg1axav89cr2"; buildDepends = [ base containers event-list midi non-negative ]; homepage = "http://github.com/mtolly/midi-util"; description = "Utility functions for processing MIDI files"; @@ -80632,6 +81663,7 @@ self: { random resource-pool transformers ]; testDepends = [ base bytestring hspec network QuickCheck ]; + jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80721,8 +81753,8 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.0.5"; - sha256 = "04ajhr0izfixhvz0c7m1zz3c7z2lnabyifn4flqv5d41gkkg0pr1"; + version = "0.1.0.6"; + sha256 = "090z3dp928243amnc6s8g10rk2h2bprk9y138q6wj3cpflzr72pw"; buildDepends = [ base bytestring containers text ]; homepage = "https://github.com/yesodweb/wai"; description = "Basic mime-type handling types and functions"; @@ -80776,6 +81808,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "miniforth" = callPackage + ({ mkDerivation, base, containers, lens, MonadRandom, mtl + , mtl-compat, parsec, parsec3-numbers, readline + }: + mkDerivation { + pname = "miniforth"; + version = "0.1.0.1"; + sha256 = "1f2scxg7j6zifqj6q2khxb8s49ilnk4r9qms72vysp1s5p76zk0g"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base containers lens MonadRandom mtl mtl-compat parsec + parsec3-numbers readline + ]; + jailbreak = true; + description = "Miniature FORTH-like interpreter"; + license = stdenv.lib.licenses.mit; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { @@ -81565,8 +82616,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.12"; - sha256 = "0n5y2rc7da4paszcnvi6yrzg8fmi2nzyxd62d554z7fwciv9px71"; + version = "0.3.13.1"; + sha256 = "0mwdihxly22axrjs9g741zab2yyrm6zy73di99m7lvg8jdj4m2r6"; buildDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm @@ -81739,6 +82790,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-parallel-progressbar" = callPackage + ({ mkDerivation, base, monad-parallel, monadIO + , terminal-progress-bar + }: + mkDerivation { + pname = "monad-parallel-progressbar"; + version = "0.1.0.0"; + sha256 = "0h714gijrmg5z1cjn86j0q58igcrqwbad5yazhhmnb2xzvz1r2p5"; + buildDepends = [ + base monad-parallel monadIO terminal-progress-bar + ]; + homepage = "https://github.com/mnacamura/monad-parallel-progressbar"; + description = "Parallel execution of monadic computations with a progress bar"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-param" = callPackage ({ mkDerivation, base, mtl, stm }: mkDerivation { @@ -82040,8 +83107,8 @@ self: { ({ mkDerivation, array, base, stm, transformers }: mkDerivation { pname = "monadic-arrays"; - version = "0.2.1.3"; - sha256 = "0qqf640zzv4dn0b1mpz54pdirdz3scc8z72vz884x88gzvdpr025"; + version = "0.2.1.4"; + sha256 = "1vlqh0mqfkg1f47dhl5lw49b7xawlbyjmq7xpmmf16q3idxnkahh"; buildDepends = [ array base stm transformers ]; homepage = "http://github.com/ekmett/monadic-arrays/"; description = "Boxed and unboxed arrays for monad transformers"; @@ -82295,8 +83362,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.9.0"; - sha256 = "1iw475jkm6szl82z9y7535c6ifzbg2faixryx39gv1mhg898brmm"; + version = "0.9.0.1"; + sha256 = "1wcl2cv16855kg9kn3cz3947jzcb3g2n3mqnhkp0spd42ya3jw83"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -82392,11 +83459,12 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.1.0.0"; - sha256 = "1hlbw6xnglmwvjy1zbggxbd3xylx545hp535mjrjnpzda6bydkvd"; + version = "0.1.2.0"; + sha256 = "0d94hpgkrh61cax0f4p71irgvq3psn53qiy7x9bwql8qwsdni1qg"; buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; + jailbreak = true; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -82573,22 +83641,22 @@ self: { }) { morfeusz = null;}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, happy + ({ mkDerivation, alex, array, base, binary, deepseq, happy , lens-family-core, optparse-applicative, pipes, text, transformers }: mkDerivation { pname = "morte"; - version = "1.0.1"; - sha256 = "0gn4fdvc61f59k06s7gbds351vljd3lbwvl7mka59kk39i7flfyq"; + version = "1.1.1"; + sha256 = "0daq0894kmd938k7qdbi7f1axih5gx5yrimx5pssfvhvw78bdqp4"; isLibrary = true; isExecutable = true; buildDepends = [ - array base binary containers lens-family-core optparse-applicative + array base binary deepseq lens-family-core optparse-applicative pipes text transformers ]; buildTools = [ alex happy ]; jailbreak = true; - description = "Bare-bones calculus of constructions"; + description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -82612,9 +83680,8 @@ self: { }: mkDerivation { pname = "mp"; - version = "0.1.3"; - sha256 = "0gh2xsn9nmb8r8l69xcdd0v9ldk8663676wl5dxh6300h97a0dsj"; - editedCabalFile = "155358da276e8dee3d6e543f005025de03692dc9857d74cd19291a0b98ece325"; + version = "0.2.2"; + sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -83102,8 +84169,8 @@ self: { }: mkDerivation { pname = "multiarg"; - version = "0.30.0.2"; - sha256 = "1c64w53s67m4w9m6jwal6h6529795kw2cnx99v718w2n64slp8n2"; + version = "0.30.0.4"; + sha256 = "0bnzlz5na6fbw870vmvxd4jr71fdkdkxs7dd820p772b1pzfg1g5"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; @@ -83763,6 +84830,7 @@ self: { async base contravariant managed mmorph pipes pipes-concurrency transformers ]; + jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83907,18 +84975,19 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, containers, mysql, zlib }: + ({ mkDerivation, base, bytestring, containers, mysql, openssl, zlib + }: mkDerivation { pname = "mysql"; version = "0.1.1.7"; sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; buildDepends = [ base bytestring containers ]; buildTools = [ mysql ]; - extraLibraries = [ zlib ]; + extraLibraries = [ openssl zlib ]; homepage = "https://github.com/bos/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) mysql; inherit (pkgs) zlib;}; + }) { mysql = null; inherit (pkgs) openssl; inherit (pkgs) zlib;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql @@ -84020,13 +85089,13 @@ self: { }: mkDerivation { pname = "nagios-check"; - version = "0.2.0"; - sha256 = "0phm3i0k99j26h793xcfszb7l8acf3q3my5z3msj3q5cvkxnixfd"; + version = "0.2.1"; + sha256 = "0qnzdljrdwzrsfapm2d6ykz2xzdhq5hzxy51gixsbmlvknglx5bh"; buildDepends = [ base bifunctors exceptions mtl nagios-perfdata text ]; testDepends = [ base hspec QuickCheck text ]; - homepage = "https://github.com/fractalcat/nagios-check"; + homepage = "https://github.com/fractalcat/haskell-nagios-check"; description = "Package for writing monitoring plugins"; license = stdenv.lib.licenses.mit; }) {}; @@ -84341,6 +85410,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "natural-transformation" = callPackage + ({ mkDerivation, base, containers, quickcheck-instances, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "natural-transformation"; + version = "0.1"; + sha256 = "0qs8zfd3pwjr539453w94rddssw85ky695jz8rasn85sxp2kflbc"; + buildDepends = [ base ]; + testDepends = [ + base containers quickcheck-instances tasty tasty-quickcheck + ]; + homepage = "https://github.com/ku-fpg/natural-transformation"; + description = "A natural transformation package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "naturalcomp" = callPackage ({ mkDerivation, base, text, utf8-string }: mkDerivation { @@ -84863,8 +85949,10 @@ self: { }: mkDerivation { pname = "netwire-input-glfw"; - version = "0.0.2"; - sha256 = "17rm2z931bvylcw3p9x2dkppyrqi6qgfyb03cdwr5iyasq5cjjvx"; + version = "0.0.3"; + sha256 = "04flihwgs4wibhppyjw7x23s2629rbywafbv9dmdcda6bv6d8qm3"; + isLibrary = true; + isExecutable = true; buildDepends = [ base containers GLFW-b mtl netwire-input stm ]; homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; @@ -84909,6 +85997,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-anonymous-i2p" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, exceptions, hspec + , hspec-attoparsec, hspec-expectations, mtl, network + , network-attoparsec, network-simple, text, transformers, uuid + }: + mkDerivation { + pname = "network-anonymous-i2p"; + version = "0.9.2"; + sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + buildDepends = [ + attoparsec base bytestring exceptions mtl network + network-attoparsec network-simple text transformers uuid + ]; + testDepends = [ + attoparsec base bytestring exceptions hspec hspec-attoparsec + hspec-expectations mtl network network-simple transformers uuid + ]; + homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; + description = "Haskell API for I2P anonymous networking"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-api-support" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, http-client, http-client-tls, http-types, text @@ -84934,8 +86044,8 @@ self: { }: mkDerivation { pname = "network-attoparsec"; - version = "0.11.2"; - sha256 = "15ibasfam8c3gsq8szj6qpwf1gvcgdh3jq0a669dqh0mddx2a97v"; + version = "0.12.2"; + sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p"; buildDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -84969,6 +86079,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-builder" = callPackage + ({ mkDerivation, aeson, base, bytestring, cabal-test-bin, hspec + , hspec-server, optparse-applicative, process, shelly, text, yaml + }: + mkDerivation { + pname = "network-builder"; + version = "0.1.0"; + sha256 = "0faa3clz80158m9cy4mblnszla6k9hbf8bdwp5cam05dwmvsdcyw"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring optparse-applicative shelly text yaml + ]; + testDepends = [ base cabal-test-bin hspec hspec-server process ]; + description = "Linux NetworkNameSpace Builder"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -85015,8 +86143,8 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.0.2"; - sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax"; + version = "1.1.1"; + sha256 = "0wq074k6nwn3h1ww1an7n6i9zx6ii9hsm9vw6x51w22mp787dj1p"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes data-default monad-control network streaming-commons system-fileio @@ -85341,10 +86469,9 @@ self: { }: mkDerivation { pname = "network-simple"; - version = "0.4.0.3"; - sha256 = "0nbs79v07x18y324drngr1zrcgjla2y9qjxkd64qwbldw48s1i85"; + version = "0.4.0.4"; + sha256 = "0qa3ax29ci7m01af0d2rvnx9m24q1d9zw727bzhc88k2g6k2xzah"; buildDepends = [ base bytestring exceptions network transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/network-simple"; description = "Simple network sockets usage patterns"; license = stdenv.lib.licenses.bsd3; @@ -85849,8 +86976,8 @@ self: { ({ mkDerivation, base, containers, strict }: mkDerivation { pname = "nlp-scores"; - version = "0.6.2"; - sha256 = "0zknj60jh2pg5lih1hbmhbig7mhqz22pybxr6hvm562j17jysg4k"; + version = "0.7.0"; + sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m"; buildDepends = [ base containers strict ]; homepage = "https://bitbucket.org/gchrupala/lingo"; description = "Scoring functions commonly used for evaluation in NLP and IR"; @@ -86071,15 +87198,18 @@ self: { }) {}; "not-gloss" = callPackage - ({ mkDerivation, base, GLUT, OpenGLRaw, spatial-math, time }: + ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT + , OpenGLRaw, spatial-math, time + }: mkDerivation { pname = "not-gloss"; - version = "0.7.0.0"; - sha256 = "0mc0sddkcqbhvawq1zfvypa8n7fhvg8z385w7m9f4awyyaza6jd0"; - buildDepends = [ base GLUT OpenGLRaw spatial-math time ]; + version = "0.7.2.1"; + sha256 = "0jkdfkkacb4qsf9f229z79ihrzm9xsgc7pnw96ainmnhjgvfmihj"; + buildDepends = [ + base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time + ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -86232,13 +87362,14 @@ self: { }) {}; "nsis" = callPackage - ({ mkDerivation, base, process, transformers, uniplate }: + ({ mkDerivation, base, directory, process, transformers, uniplate + }: mkDerivation { pname = "nsis"; - version = "0.2.4"; - sha256 = "17jl5s48msa6c5rb9lvlcsjmv6kzml3yrfmz7h1ipxsdl0yf7nd3"; + version = "0.2.5"; + sha256 = "1lbd1yx2yr96mv58jk3d9qpxpvc9nqkgvi62z4jahwv6wz5wap61"; buildDepends = [ base transformers uniplate ]; - testDepends = [ base process transformers uniplate ]; + testDepends = [ base directory process transformers uniplate ]; homepage = "https://github.com/ndmitchell/nsis#readme"; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; @@ -86624,16 +87755,17 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, free, hashable - , profunctors, transformers, unordered-containers, void, witherable + ({ mkDerivation, base, containers, either, exceptions, free + , hashable, monad-stm, profunctors, stm, transformers + , unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1"; - sha256 = "1gpz3cpdhnbjfzyqix8bwzfba9lbsa6y0qjbzzrlahmw8i373c6f"; + version = "1.0.2"; + sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; buildDepends = [ - base containers either free hashable profunctors transformers - unordered-containers void witherable + base containers either exceptions free hashable monad-stm + profunctors stm transformers unordered-containers void witherable ]; homepage = "https://github.com/fumieval/objective"; description = "Extensible objects"; @@ -86660,6 +87792,7 @@ self: { testDepends = [ base base-compat dotenv hspec hspec-expectations text transformers ]; + jailbreak = true; homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; @@ -86924,8 +88057,8 @@ self: { }: mkDerivation { pname = "on-demand-ssh-tunnel"; - version = "0.1.0.5"; - sha256 = "0gsfdsss7yddb90rx0ml6lpcd5q0qvk78m42iz1ikqgy5g9hgv1x"; + version = "0.1.0.6"; + sha256 = "0pmkaw3w69nf928z263my7q0l2zi2v4yx5w49warbgv66h00wgkz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -86940,8 +88073,8 @@ self: { ({ mkDerivation, base, contravariant, ghc-prim, transformers }: mkDerivation { pname = "one-liner"; - version = "0.5"; - sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91"; + version = "0.5.1"; + sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0"; buildDepends = [ base contravariant ghc-prim transformers ]; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; @@ -87018,6 +88151,7 @@ self: { pname = "opaleye"; version = "0.3.1"; sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; + editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; buildDepends = [ attoparsec base case-insensitive contravariant old-locale postgresql-simple pretty product-profunctors profunctors semigroups @@ -87323,8 +88457,8 @@ self: { }: mkDerivation { pname = "openssl-streams"; - version = "1.2.0.0"; - sha256 = "01hdrsdrp2x7i5zydn2b0blzir7vqvn63n9sf9pwcgnkk6s5j1wc"; + version = "1.2.1.0"; + sha256 = "1jqrc9wxvw196vgcbhpazi9vldqs31jb6jxc529iy9k7vh4mk5m9"; buildDepends = [ base bytestring HsOpenSSL io-streams network ]; testDepends = [ base bytestring HsOpenSSL HUnit io-streams network test-framework @@ -87687,6 +88821,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "order-maintenance" = callPackage + ({ mkDerivation, base, containers, transformers }: + mkDerivation { + pname = "order-maintenance"; + version = "0.0.0.0"; + sha256 = "1d416a277fcchcgyn4n5m7kpn0aky8gsi8fkk0gh3a4lcap18h2d"; + buildDepends = [ base containers transformers ]; + homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance"; + description = "Algorithms for the order maintenance problem with a safe interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "order-statistics" = callPackage ({ mkDerivation, base, containers, math-functions, statistics , vector, vector-space @@ -87788,6 +88934,7 @@ self: { base bifunctors containers lens mtl pretty template-haskell ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; @@ -87899,6 +89046,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pack" = callPackage + ({ mkDerivation, array, base, bytestring, lens, transformers + , vector + }: + mkDerivation { + pname = "pack"; + version = "0.4.0"; + sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9"; + buildDepends = [ array base bytestring lens transformers vector ]; + homepage = "https://github.com/capsjac/pack"; + description = "Bidirectional fast ByteString packer/unpacker"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "package-o-tron" = callPackage ({ mkDerivation, base, Cabal, filemanip, filepath, groom, packdeps , process @@ -88055,6 +89216,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pagarme" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, lens, text + , wreq + }: + mkDerivation { + pname = "pagarme"; + version = "0.1.0.0"; + sha256 = "1zkh8cx4bdgsyra7x9kzzdcckg65y1hacwq90w36gdl6i4hs7nj0"; + isLibrary = true; + isExecutable = true; + buildDepends = [ aeson base bytestring containers lens text wreq ]; + homepage = "https://github.com/diogob/pagarme_haskell"; + description = "Pagarme API wrapper"; + license = stdenv.lib.licenses.mit; + }) {}; + "pagerduty" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions @@ -88175,6 +89352,7 @@ self: { test-framework-quickcheck2 text zip-archive ]; configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ]; + jailbreak = true; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -88213,6 +89391,7 @@ self: { version = "0.3.1"; sha256 = "1h943cyj6ph5w32rmkzlvszjbb7s65is1h9ifws4m7nj9mbn13lf"; buildDepends = [ base containers lens pandoc-types ]; + jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -88224,14 +89403,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.1"; - sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq"; + version = "1.12.4.2"; + sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -89244,8 +90423,8 @@ self: { ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.0.1"; - sha256 = "00w6r2zpw5h2db7h8k3y6l1kryi8jvn1rf5wamx0a634ga606czc"; + version = "0.1.1.0"; + sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -89329,8 +90508,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.0.3.1"; - sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz"; + version = "0.0.3.2"; + sha256 = "09nscaska3jpc0kkz4fgiyini8g6pk9b5p6kw5yp5nx984f8579a"; buildDepends = [ attoparsec base base16-bytestring bytestring containers io-streams pdf-toolbox-core text @@ -89346,8 +90525,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.0.3.0"; - sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6"; + version = "0.0.3.2"; + sha256 = "0wz9khfymnsyjrcvj2dgav1a1sjira481gx9ks7sz23h5pj69bds"; buildDepends = [ attoparsec base bytestring containers errors io-streams scientific transformers zlib-bindings @@ -89358,17 +90537,18 @@ self: { }) {}; "pdf-toolbox-document" = callPackage - ({ mkDerivation, base, bytestring, cipher-rc4, containers - , cryptohash, io-streams, pdf-toolbox-content, pdf-toolbox-core - , text, transformers + ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 + , containers, crypto-api, cryptohash, io-streams + , pdf-toolbox-content, pdf-toolbox-core, text, transformers }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.0.4.0"; - sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa"; + version = "0.0.5.0"; + sha256 = "0ilgbwmv2qvzbji79ybam5f2aghlqhq1jgchq39xxwrs2i40vrxz"; buildDepends = [ - base bytestring cipher-rc4 containers cryptohash io-streams - pdf-toolbox-content pdf-toolbox-core text transformers + base bytestring cipher-aes cipher-rc4 containers crypto-api + cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text + transformers ]; homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; @@ -89382,8 +90562,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-viewer"; - version = "0.0.3.0"; - sha256 = "173hc11aiy6zzsz624samxif953nl5gyjlxk8zy0c7a0yaxha1pp"; + version = "0.0.3.2"; + sha256 = "14245lv0jfmvmsldrhnp9n0fk7x2wjzsamwqjphbcxw70h9hw9s8"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -89419,8 +90599,8 @@ self: { }: mkDerivation { pname = "pdfinfo"; - version = "1.5.1"; - sha256 = "1xhznh9pqx4yvzfnypjkmgrsv5z1949vnrix101y6iy0y1zk4r5x"; + version = "1.5.2"; + sha256 = "1s2hhmcqsg57fppqjvrkp77bms1npblysjvfl37fgn0jafn0mhjq"; buildDepends = [ base mtl old-locale process-extras text time ]; homepage = "https://github.com/chrisdone/pdfinfo"; description = "Wrapper around the pdfinfo command"; @@ -89780,8 +90960,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.1.4"; - sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2"; + version = "2.1.2"; + sha256 = "17p81s1w7wqs2hm5zcwncvidd808gm4zlha7mqv9wwpf6ql1b359"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -89961,6 +91141,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-ratelimit" = callPackage + ({ mkDerivation, base, time, yesod }: + mkDerivation { + pname = "persistent-ratelimit"; + version = "0.1.0.0"; + sha256 = "00kvmqisi6y8r8vpfa61kzxr0iyy6varj8920kjwsd2jk2i7q8wl"; + buildDepends = [ base time yesod ]; + homepage = "https://github.com/jprider63/persistent-ratelimit"; + description = "A library for rate limiting activities with a persistent backend"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-redis" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, hedis , monad-control, mtl, path-pieces, persistent, persistent-template @@ -90111,6 +91303,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persona-idp" = callPackage + ({ mkDerivation, aeson, asn1-types, base, blaze-markup, bytestring + , crypto-random, directory, filepath, hamlet, http-types, jose + , lens, optparse-applicative, pem, persona, scotty, shakespeare + , text, time, transformers, unix, wai, x509 + }: + mkDerivation { + pname = "persona-idp"; + version = "0.1.0.2"; + sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson asn1-types base blaze-markup bytestring crypto-random + directory filepath hamlet http-types jose lens optparse-applicative + pem persona scotty shakespeare text time transformers unix wai x509 + ]; + homepage = "https://github.com/frasertweedale/hs-persona-idp"; + description = "Persona (BrowserID) Identity Provider"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "pesca" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -90192,17 +91406,19 @@ self: { }) {}; "pgdl" = callPackage - ({ mkDerivation, base, bytestring, Cabal, configurator, directory - , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui + ({ mkDerivation, array, base, bytestring, Cabal, configurator + , directory, filepath, HTTP, network-uri, process, tagsoup, text + , vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "7.5"; - sha256 = "00v80ppb3fl89jd8kdzs3phskbm3d2c27f8hxckdfrrq05wa56b3"; + version = "7.77"; + sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; + editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal configurator directory filepath HTTP + array base bytestring Cabal configurator directory filepath HTTP network-uri process tagsoup text vty vty-ui ]; description = "pgdownloader"; @@ -90466,20 +91682,22 @@ self: { "picoparsec" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , monoid-subclasses, QuickCheck, quickcheck-instances, scientific - , tasty, tasty-quickcheck, text + , monoid-subclasses, QuickCheck, quickcheck-instances + , quickcheck-unicode, scientific, tasty, tasty-quickcheck, text + , vector }: mkDerivation { pname = "picoparsec"; - version = "0.1"; - sha256 = "024j1iivy5vhpygn3bz48lrn06p84ncmax3p1g76xnszffklk6fh"; + version = "0.1.1"; + sha256 = "1b2dxms5bdiz2cci488cnar65jwv6mknhnm3qcff49ax4y9w8gi2"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text ]; testDepends = [ - base bytestring monoid-subclasses QuickCheck quickcheck-instances - tasty tasty-quickcheck text + array base bytestring deepseq monoid-subclasses QuickCheck + quickcheck-instances quickcheck-unicode scientific tasty + tasty-quickcheck text vector ]; homepage = "https://bitbucket.org/blamario/picoparsec"; description = "Fast combinator parsing for bytestrings and text"; @@ -90527,6 +91745,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pinboard" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , HsOpenSSL, http-streams, http-types, io-streams, mtl, network + , old-locale, random, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "pinboard"; + version = "0.2"; + sha256 = "0bvgijrgpv0yc8hkzj9mbm94z6v5s9w8ghjjm9ynh0qrpyf1dlli"; + buildDepends = [ + aeson base bytestring containers either HsOpenSSL http-streams + http-types io-streams mtl network old-locale random text time + transformers unordered-containers + ]; + homepage = "https://github.com/jonschoning/pinboard"; + description = "Access to the Pinboard API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework , test-framework-quickcheck2, transformers @@ -90940,10 +92178,9 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.2.1"; - sha256 = "0f1k2dbkm9my8kljzy72v0ag9bjkkm63lxi148nrpr9xv5f12kcj"; + version = "2.2.2"; + sha256 = "1sp0fw5w4kcf5llxx2qqzx8n5ps8qw1jx5asqg7al89mqr38am05"; buildDepends = [ base containers exceptions pipes transformers ]; - jailbreak = true; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91148,8 +92385,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time, unix }: mkDerivation { pname = "plailude"; - version = "0.5.1"; - sha256 = "0c9q2pb7v1qv9v7xl8vcj3jncqsphz13accppxd7k6chmirrdnkh"; + version = "0.6.0"; + sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; buildDepends = [ base bytestring mtl time unix ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; @@ -91206,12 +92443,12 @@ self: { }) {}; "plist" = callPackage - ({ mkDerivation, base, dataenc, hxt }: + ({ mkDerivation, base, base64-bytestring, bytestring, hxt }: mkDerivation { pname = "plist"; - version = "0.0.5"; - sha256 = "1c77p62sgc8zs9856h1glsfi384fjnxd9rblw2xhbszr9j6h6rxh"; - buildDepends = [ base dataenc hxt ]; + version = "0.0.6"; + sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb"; + buildDepends = [ base base64-bytestring bytestring hxt ]; description = "Generate and parse Mac OS X property list format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91265,6 +92502,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-gtk-ui" = callPackage + ({ mkDerivation, base, cairo, colour, fixed-vector, gtk, hmatrix + , plot, text, vector + }: + mkDerivation { + pname = "plot-gtk-ui"; + version = "0.0.3.0"; + sha256 = "12slwfhhrzjyscxbs5f8nqayqcbk1lh7b4cla419lbwixhbs3zbg"; + buildDepends = [ + base cairo colour fixed-vector gtk hmatrix plot text vector + ]; + homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; + description = "A quick way to use Mathematica like Manipulation abilities"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "plot-gtk3" = callPackage ({ mkDerivation, base, glib, gtk3, hmatrix, mtl, plot, process }: mkDerivation { @@ -91430,6 +92683,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pocket-dns" = callPackage + ({ mkDerivation, aeson, base, bytestring, cabal-test-bin + , data-default, dns, hspec, hspec-contrib, hspec-server + , hspec-test-sandbox, http-conduit, iproute, monad-control, network + , optparse-applicative, persistent, persistent-sqlite + , persistent-template, persistent-zookeeper, shakespeare, shelly + , test-sandbox, text, transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "pocket-dns"; + version = "0.1.1"; + sha256 = "1736gj66ljgarmdxwzc9m5aa9inkmgzfmn9sjcqlcs0kpp5faqsh"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring data-default dns http-conduit iproute + monad-control network optparse-applicative persistent + persistent-sqlite persistent-template persistent-zookeeper shelly + text transformers unordered-containers yaml + ]; + testDepends = [ + base cabal-test-bin hspec hspec-contrib hspec-server + hspec-test-sandbox shakespeare test-sandbox text transformers + ]; + description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class , kan-extensions, semigroupoids, semigroups, stm, tagged @@ -91564,6 +92845,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) { inherit (pkgs) poker-eval;}; + "pokitdok" = callPackage + ({ mkDerivation, aeson, base, base64-string, bytestring + , case-insensitive, directory, hex, HTTP, http-client, http-conduit + , http-types, strict, text, time + }: + mkDerivation { + pname = "pokitdok"; + version = "4.1.0.1"; + sha256 = "0cnrda2ahsam07pcn079wvq18hxjpyxik6qnqi5bzrdps9dwgl80"; + buildDepends = [ + aeson base base64-string bytestring case-insensitive directory hex + HTTP http-client http-conduit http-types strict text time + ]; + jailbreak = true; + homepage = "https://platform.pokitdok.com"; + description = "PokitDok Platform API Client for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "polar" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -91904,7 +93204,7 @@ self: { "poppler" = callPackage ({ mkDerivation, array, base, bytestring, cairo, containers - , gdk_pixbuf, glib, gtk, gtk2hs-buildtools, mtl, pango, popplerGlib + , gdk_pixbuf, glib, gtk, gtk2hs-buildtools, mtl, pango, poppler }: mkDerivation { pname = "poppler"; @@ -91914,13 +93214,12 @@ self: { array base bytestring cairo containers glib gtk mtl ]; buildTools = [ gtk2hs-buildtools ]; - pkgconfigDepends = [ gdk_pixbuf pango popplerGlib ]; + pkgconfigDepends = [ gdk_pixbuf pango poppler ]; homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; - popplerGlib = null;}; + inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -92186,6 +93485,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-config" = callPackage + ({ mkDerivation, aeson, base, bytestring, monad-control, mtl + , postgresql-simple, resource-pool, time + }: + mkDerivation { + pname = "postgresql-config"; + version = "0.0.1"; + sha256 = "1hp6ki078d4hvb910403ppvcb8q6ji79z3ccv6alkpnd494wd4wr"; + buildDepends = [ + aeson base bytestring monad-control mtl postgresql-simple + resource-pool time + ]; + homepage = "https://bitbucket.org/s9gf4ult/postgresql-config"; + description = "Types for easy adding postgresql configuration to your program"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-copy-escape" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -92231,6 +93547,35 @@ self: { license = "GPL"; }) {}; + "postgresql-query" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , containers, either, exceptions, file-embed, haskell-src-meta + , monad-control, monad-logger, mtl, postgresql-simple, QuickCheck + , quickcheck-assertions, quickcheck-instances, resource-pool + , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, time, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "postgresql-query"; + version = "1.0.1"; + sha256 = "0p11a6rzcpwnq55s9hslfqbi70g39gf1qbz6805a232y9wwkf8rn"; + buildDepends = [ + aeson attoparsec base blaze-builder bytestring containers either + exceptions file-embed haskell-src-meta monad-control monad-logger + mtl postgresql-simple resource-pool semigroups template-haskell + text time transformers transformers-base transformers-compat + ]; + testDepends = [ + attoparsec base QuickCheck quickcheck-assertions + quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th + text + ]; + homepage = "https://bitbucket.org/s9gf4ult/postgresql-query"; + description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , blaze-builder, blaze-textual, bytestring, case-insensitive @@ -92240,8 +93585,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.4.9.0"; - sha256 = "0mb3ymw57w7zk2fz8g8m0fz1nhx52c21lxwk3nnkp9qqk26jslws"; + version = "0.4.10.0"; + sha256 = "0ar8rjd3fsk56ykf7ys3f14ld3771dknhvkfk08fq7054rilrir0"; buildDepends = [ aeson attoparsec base blaze-builder blaze-textual bytestring case-insensitive containers hashable postgresql-libpq scientific @@ -92341,8 +93686,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.2.6.0"; - sha256 = "0aqf4d8a90zxxbnyx8f2ijnkv598akmzy4gp1lishzgrvfhdrywi"; + version = "0.2.7.0"; + sha256 = "1mr7wka4kxxmpnhw9p49a4vh68iavrh74shc712z17gmr9yahvcx"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -92564,8 +93909,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.30.0.0"; - sha256 = "0srmjh4hzsg341bjgixz4kvhlc15bbzyx2spcd8hi25m0l0ji0m9"; + version = "0.32.0.0"; + sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -92723,6 +94068,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preprocess-haskell" = callPackage + ({ mkDerivation, base, base-unicode-symbols, basic-prelude + , bytestring, Cabal, containers, cpphs, deepseq, directory + , file-embed, foldl, haskell-src-exts, here, system-filepath + , temporary, text, turtle, unix + }: + mkDerivation { + pname = "preprocess-haskell"; + version = "0.0.1.1"; + sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r"; + buildDepends = [ + base base-unicode-symbols basic-prelude bytestring Cabal containers + cpphs deepseq directory file-embed foldl haskell-src-exts here + system-filepath temporary text turtle unix + ]; + description = "Preprocess Haskell Repositories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "preprocessor-tools" = callPackage ({ mkDerivation, base, mtl, parsec, syb }: mkDerivation { @@ -92788,13 +94152,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_2_1" = callPackage + "pretty_1_1_3_2" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.2.1"; - sha256 = "128bgw9qgm256f28ffb49dvqs9js01m9q6mj6dhg4nlcbpz5fhav"; - editedCabalFile = "ebd25419c2eacdf4212ba30592975908255c84b928a228fe5b045bc4f32c102a"; + version = "1.1.3.2"; + sha256 = "0k61v71c40dy4whvy1q1n3hs0xnhscg4svp0prcihn7s57j2spvi"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -92853,8 +94216,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.6.8"; - sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs"; + version = "1.6.8.2"; + sha256 = "1s95nzjkmqb747s50i68c9s8p91cxgydzqkd2l5yjzdaygrvrhqv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -92863,7 +94226,7 @@ self: { buildTools = [ happy ]; homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "pretty-sop" = callPackage @@ -93124,13 +94487,14 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "process_1_2_2_0" = callPackage + "process_1_2_3_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.2.2.0"; - sha256 = "0rxxcimwhsgcphy0brq6gxcrm8spgpqha8fhppj956kp401hx3s8"; + version = "1.2.3.0"; + sha256 = "1ib01nkh513v5ab7wa255jqpsnqjsjdmh8d9dz8inqw3f4ah97k1"; buildDepends = [ base deepseq directory filepath unix ]; + testDepends = [ base ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93161,8 +94525,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.1"; - sha256 = "1lwjm402q92ibd66xiz5zwwqd8nkyvlhnrw60ja3zngq8z8dsk7g"; + version = "0.3.3.2"; + sha256 = "0kv4fpg5qndqf97c1znhibhzqd5z6mdk38ma72yk3ixkp45rvarh"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -93296,6 +94660,7 @@ self: { multiset QuickCheck quickcheck-instances template-haskell text transformers ]; + jailbreak = true; description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93380,7 +94745,7 @@ self: { pname = "product-profunctors"; version = "0.6"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "49b845d840379a6920f4dde4d88ce96a4b7b98760410db0874ed9a322b113d32"; + editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -93459,9 +94824,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "4.3.2"; - sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v"; - editedCabalFile = "be979686814ec350c42af61b496af101aee25e5be211d22caccf59ef93e6581b"; + version = "4.4.1"; + sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -93670,8 +95034,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.1.0"; - sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4"; + version = "2.2.1"; + sha256 = "0dc1km96k58m98ww7z2n8d167ihr5b7vws4y2va4nl30ghpfga56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -93930,8 +95294,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.0.0"; - sha256 = "1b4kmb57k21wk5740jwahkc3xx2nldmjp7lc37ws24zyang84m4c"; + version = "0.2.0.1"; + sha256 = "1c1m5dzglpn3la61gxd6cz1b9fdmn9fkc9y5xnl4wf12fwpsg8bf"; buildDepends = [ base deepseq ghc-prim hashable ]; testDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -94335,19 +95699,19 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, base, containers, directory, file-embed, filepath - , haskeline, mtl, nodejs, optparse-applicative, parsec + ({ mkDerivation, base, boxes, containers, directory, file-embed + , filepath, haskeline, mtl, nodejs, optparse-applicative, parsec , pattern-arrows, process, time, transformers, unordered-containers , utf8-string }: mkDerivation { pname = "purescript"; - version = "0.6.8"; - sha256 = "02bcy8qfcsaxz0ygcajskj9dmpyl291vgvjp0jlrjsfcv8ym4izl"; + version = "0.6.9.3"; + sha256 = "1hdxj1qxxvkjacm8msfn1xjbgwhmg0kx5ha1fxv11nks0m0h4wcr"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers directory file-embed filepath haskeline mtl + base boxes containers directory file-embed filepath haskeline mtl optparse-applicative parsec pattern-arrows process time transformers unordered-containers utf8-string ]; @@ -95078,8 +96442,8 @@ self: { }: mkDerivation { pname = "quickpull"; - version = "0.4.0.0"; - sha256 = "0qfzl7v7724fwfsxd5iwj3xbfz3isl8hphv6fd5a0c5zw01r54zn"; + version = "0.4.2.2"; + sha256 = "0vy5s3qa67kwj68rxqc0zhqizqpvqa1x0bg3dakq5pimrqhmb7d4"; isLibrary = true; isExecutable = true; buildDepends = [ barecheck base directory filepath QuickCheck ]; @@ -95215,8 +96579,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.3"; - sha256 = "01bmh77cjcz7phl4fzn97hzjnjx3wicr12m7nrdyflw2zckxycwl"; + version = "0.4.2"; + sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s"; buildDepends = [ base containers parsec ]; testDepends = [ base Cabal containers hspec parsec QuickCheck ]; jailbreak = true; @@ -95699,15 +97063,15 @@ self: { }) {}; "rasterific-svg" = callPackage - ({ mkDerivation, attoparsec, base, binary, blaze-html, bytestring - , containers, directory, filepath, FontyFruity, JuicyPixels, lens - , linear, mtl, optparse-applicative, Rasterific, scientific - , svg-tree, text, transformers, vector + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, FontyFruity, JuicyPixels, lens, linear, mtl + , optparse-applicative, Rasterific, scientific, svg-tree, text + , transformers, vector }: mkDerivation { pname = "rasterific-svg"; - version = "0.1.0.2"; - sha256 = "1jn6cj7baph2jvihr9aqrxcqwbn1vaa125n2d39s8ib6yar5x3sq"; + version = "0.1.0.3"; + sha256 = "1qzvqbkgj97wdiknlas57z2lfi311v0b5w68z6ni2il8hnnjrj64"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95715,10 +97079,6 @@ self: { JuicyPixels lens linear mtl optparse-applicative Rasterific scientific svg-tree text transformers vector ]; - testDepends = [ - attoparsec base binary blaze-html bytestring directory filepath - FontyFruity JuicyPixels linear Rasterific svg-tree text - ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -96209,6 +97569,7 @@ self: { version = "1.0.1.0"; sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8"; buildDepends = [ base readline StateVar ]; + jailbreak = true; description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -96284,10 +97645,8 @@ self: { }: mkDerivation { pname = "record"; - version = "0.2.1"; - sha256 = "12swkcpzcif5bzfp961fx75a7bi0x79z6f16qh7im41amy2zpg19"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "11ddiz2i4rx0rydcm82j8gwf9zr26if78ij539hfdyi2zbvyri85"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; @@ -96408,24 +97767,23 @@ self: { "redis-io" = callPackage ({ mkDerivation, async, attoparsec, auto-update, base, bytestring - , bytestring-conversion, containers, exceptions, mtl, network - , operational, redis-resp, resource-pool, tasty, tasty-hunit, time - , tinylog, transformers + , bytestring-conversion, containers, exceptions, monad-control, mtl + , network, operational, redis-resp, resource-pool, tasty + , tasty-hunit, time, tinylog, transformers, transformers-base }: mkDerivation { pname = "redis-io"; - version = "0.3.1"; - sha256 = "13ggija8f8mxdcslm94731cb2bq9jzjr979xybzy4c8csla49yhx"; + version = "0.4.1"; + sha256 = "0xd0dwkh8l7m75fp7sla8wf07hlgjlgqkpsj9cnwfg4g1gyx2yy2"; buildDepends = [ - attoparsec auto-update base bytestring containers exceptions mtl - network operational redis-resp resource-pool time tinylog - transformers + attoparsec auto-update base bytestring containers exceptions + monad-control mtl network operational redis-resp resource-pool time + tinylog transformers transformers-base ]; testDepends = [ async base bytestring bytestring-conversion containers redis-resp tasty tasty-hunit tinylog transformers ]; - jailbreak = true; homepage = "https://github.com/twittner/redis-io/"; description = "Yet another redis client"; license = "unknown"; @@ -96636,8 +97994,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; - version = "1.5.1.1"; - sha256 = "0756jd8idkjfdpw3n9kwi57c2gqcv3g2ydzbpd8mzzhgglsn2zsv"; + version = "1.5.1.2"; + sha256 = "09fs42gmhdgfag7k4gm19l63sz5b1sxw6s3hgszpcnnsbv1g9ad4"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -96671,6 +98029,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex" = callPackage + ({ mkDerivation, base, containers, dependent-map, dependent-sum + , lens, mtl, primitive, semigroups, template-haskell, these + }: + mkDerivation { + pname = "reflex"; + version = "0.0.1"; + sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + buildDepends = [ + base containers dependent-map dependent-sum lens mtl primitive + semigroups template-haskell these + ]; + jailbreak = true; + description = "Higher-order Functional Reactive Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reform" = callPackage ({ mkDerivation, base, containers, mtl, text }: mkDerivation { @@ -96690,6 +98065,7 @@ self: { version = "0.2.3"; sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5"; buildDepends = [ base blaze-html blaze-markup reform text ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using blaze-html with Reform"; license = stdenv.lib.licenses.bsd3; @@ -96702,6 +98078,7 @@ self: { version = "0.0.4"; sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg"; buildDepends = [ base blaze-markup reform shakespeare text ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using Hamlet with Reform"; license = stdenv.lib.licenses.bsd3; @@ -97474,8 +98851,8 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.0.1"; - sha256 = "15fgh42j2fhgqxr2z6ayg7kwrdmsmakl5v1dkxyrp7k3iah3ak5d"; + version = "0.1.0.2"; + sha256 = "1267bv92z2k8s2cmn8sgw0i0vs3y2m8jyvnv969v15lrpsid1vvw"; buildDepends = [ base bytestring containers persistable-record relational-query template-haskell time @@ -97658,6 +99035,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) llvm;}; + "repa-array" = callPackage + ({ mkDerivation, base, bytestring, double-conversion, mtl + , primitive, repa-eval, repa-stream, text, vector + }: + mkDerivation { + pname = "repa-array"; + version = "4.0.0.2"; + sha256 = "0169fqf07yqpx93n8qlq3yfnqv9rhc19r1a6rcvbrva7h8kh04nb"; + buildDepends = [ + base bytestring double-conversion mtl primitive repa-eval + repa-stream text vector + ]; + jailbreak = true; + homepage = "http://repa.ouroborus.net"; + description = "Bulk array representations and operators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-bytestring" = callPackage ({ mkDerivation, base, repa }: mkDerivation { @@ -97685,6 +99080,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) libdevil;}; + "repa-eval" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "repa-eval"; + version = "4.0.0.1"; + sha256 = "0vng0y835gma937q1996qghfzx06wabxf7ln8ckrwy5djzza8h9y"; + buildDepends = [ base ghc-prim ]; + homepage = "http://repa.ouroborus.net"; + description = "Low-level parallel operators on bulk random-accessble arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-examples" = callPackage ({ mkDerivation, base, llvm, QuickCheck, random, repa , repa-algorithms, repa-io, template-haskell, vector @@ -97721,6 +99128,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-flow" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , primitive, repa-array, repa-eval, repa-stream, text, vector + }: + mkDerivation { + pname = "repa-flow"; + version = "4.0.0.2"; + sha256 = "1kznd1dl4rxwbc0k9asrwqm4pygq97x95g3zmy9v6lhbm6p1kpsd"; + buildDepends = [ + base bytestring containers directory filepath primitive repa-array + repa-eval repa-stream text vector + ]; + homepage = "http://repa.ouroborus.net"; + description = "Data-parallel data flows"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-io" = callPackage ({ mkDerivation, base, binary, bmp, bytestring, old-time, repa , vector @@ -97784,6 +99208,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "repa-stream" = callPackage + ({ mkDerivation, base, mtl, primitive, vector }: + mkDerivation { + pname = "repa-stream"; + version = "4.0.0.1"; + sha256 = "0vvkgazq30skj9yr763vc5vs3zacjssvyqci721n99j7h8my7r9x"; + buildDepends = [ base mtl primitive vector ]; + jailbreak = true; + homepage = "http://repa.ouroborus.net"; + description = "Stream functions not present in the vector library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-v4l2" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, deepseq, gloss , mtl, repa, transformers, v4l2, vector @@ -98157,44 +99594,49 @@ self: { "rest-client" = callPackage ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive - , data-default, exception-transformers, http-conduit, http-types - , hxt, hxt-pickle-utils, monad-control, mtl, primitive, resourcet - , rest-types, tostring, transformers-base, uri-encode, utf8-string + , data-default, exceptions, http-conduit, http-types, hxt + , hxt-pickle-utils, monad-control, mtl, primitive, resourcet + , rest-types, tostring, transformers, transformers-base + , transformers-compat, uri-encode, utf8-string }: mkDerivation { pname = "rest-client"; - version = "0.4.0.5"; - sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s"; + version = "0.5.0.0"; + sha256 = "0clhqp78i6823sxfj5xahajg450s15qqf7l2kc9dpfirz49xxpva"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default - exception-transformers http-conduit http-types hxt hxt-pickle-utils + exceptions http-conduit http-types hxt hxt-pickle-utils monad-control mtl primitive resourcet rest-types tostring - transformers-base uri-encode utf8-string + transformers transformers-base transformers-compat uri-encode + utf8-string ]; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; }) {}; "rest-core" = callPackage - ({ mkDerivation, aeson, aeson-utils, base, bytestring, either - , errors, fclabels, HUnit, hxt, hxt-pickle-utils, json-schema, mtl - , multipart, random, rest-stringmap, rest-types, safe, split + ({ mkDerivation, aeson, aeson-utils, base, bytestring + , case-insensitive, either, errors, fclabels, HUnit, hxt + , hxt-pickle-utils, json-schema, mtl, mtl-compat, multipart, random + , rest-stringmap, rest-types, safe, semigroups, split , test-framework, test-framework-hunit, text, transformers - , unordered-containers, uri-encode, utf8-string, uuid + , transformers-compat, unordered-containers, uri-encode + , utf8-string, uuid }: mkDerivation { pname = "rest-core"; - version = "0.34.0.3"; - sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19"; + version = "0.35.1"; + sha256 = "16mzvbkv69i0kabjj214166rmsqqc0ga5ad1i7yhm6202s11fx4n"; buildDepends = [ - aeson aeson-utils base bytestring either errors fclabels hxt - hxt-pickle-utils json-schema mtl multipart random rest-stringmap - rest-types safe split text transformers unordered-containers - uri-encode utf8-string uuid + aeson aeson-utils base bytestring case-insensitive either errors + fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart + random rest-stringmap rest-types safe semigroups split text + transformers transformers-compat unordered-containers uri-encode + utf8-string uuid ]; testDepends = [ base bytestring HUnit mtl test-framework test-framework-hunit - unordered-containers + transformers transformers-compat unordered-containers ]; description = "Rest API library"; license = stdenv.lib.licenses.bsd3; @@ -98204,18 +99646,19 @@ self: { ({ mkDerivation, aeson, base, containers, filepath, generic-aeson , hxt, json-schema, mtl, regular, regular-xmlpickler, rest-core , rest-gen, safe, stm, text, time, transformers, transformers-base - , unordered-containers + , transformers-compat, unordered-containers }: mkDerivation { pname = "rest-example"; - version = "0.1.2.2"; - sha256 = "0xhdk792zncqljlhvr4f04sy2mwf6j9aq2cg74ci35sjfg3bp42x"; + version = "0.2.0.0"; + sha256 = "1442hi8av2vlbzr1ffjfn32plxs0i60bb0g0fnjrprjmcii7dzd5"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base containers filepath generic-aeson hxt json-schema mtl regular regular-xmlpickler rest-core rest-gen safe stm text time - transformers transformers-base unordered-containers + transformers transformers-base transformers-compat + unordered-containers ]; homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; @@ -98232,8 +99675,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.16.1.8"; - sha256 = "0wwxx5a5s4b7j1qbcphprdpba2jy8qx449mq4k4qmz55xzacii2v"; + version = "0.17.0.1"; + sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -98254,8 +99697,8 @@ self: { }: mkDerivation { pname = "rest-happstack"; - version = "0.2.10.6"; - sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5"; + version = "0.2.10.7"; + sha256 = "17fqfax3whslip0knwr21f2h674nz5ayqk6947dryhglvwhsyn5v"; buildDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -98269,8 +99712,8 @@ self: { }: mkDerivation { pname = "rest-snap"; - version = "0.1.17.16"; - sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia"; + version = "0.1.17.17"; + sha256 = "1q2w9p9g66fv4mq566895l15l8ywz7nl4bf0zlyf1ng64fmi9far"; buildDepends = [ base bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string @@ -98296,16 +99739,18 @@ self: { }) {}; "rest-types" = callPackage - ({ mkDerivation, aeson, base, generic-aeson, hxt, json-schema, mtl - , regular, regular-xmlpickler, rest-stringmap, text, uuid + ({ mkDerivation, aeson, base, case-insensitive, generic-aeson, hxt + , json-schema, mtl, regular, regular-xmlpickler, rest-stringmap + , text, transformers, transformers-compat, uuid }: mkDerivation { pname = "rest-types"; - version = "1.12"; - sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6"; + version = "1.13.1"; + sha256 = "09lyx0a4w1mp1ivcky3wnlhisp2a8sd3f37zcr5ckxi8sjmcvsli"; buildDepends = [ - aeson base generic-aeson hxt json-schema mtl regular - regular-xmlpickler rest-stringmap text uuid + aeson base case-insensitive generic-aeson hxt json-schema mtl + regular regular-xmlpickler rest-stringmap text transformers + transformers-compat uuid ]; description = "Silk Rest Framework Types"; license = stdenv.lib.licenses.bsd3; @@ -98318,8 +99763,9 @@ self: { }: mkDerivation { pname = "rest-wai"; - version = "0.1.0.6"; - sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz"; + version = "0.1.0.7"; + sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v"; + editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981"; buildDepends = [ base bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -98418,22 +99864,22 @@ self: { "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, hashable, hspec - , hspec-smallcheck, mtl, network, old-locale, scientific - , smallcheck, template-haskell, text, time, unordered-containers - , vector + , hspec-smallcheck, mtl, network, scientific, smallcheck + , template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.13"; - sha256 = "0frbmdz0avary2rwwp9l3k6pdasjw1przi76n89kdfn4dfq5g53s"; + version = "0.0.15"; + sha256 = "0xdd9m2m61pfsn33048hz2cbjyf6rg5qkqwpib50bxdlj07s4w19"; buildDepends = [ - aeson base binary bytestring hashable mtl network old-locale - scientific template-haskell text time unordered-containers vector + aeson base binary bytestring hashable mtl network scientific + template-haskell text time unordered-containers vector ]; testDepends = [ base hspec hspec-smallcheck smallcheck text time unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; @@ -98466,14 +99912,13 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.5.1"; - sha256 = "1k5qv7c960dayhddvra1gpy1zv90rdjcrzpg8nzar9bpcxapczvj"; + version = "0.6"; + sha256 = "1ry2zqs5361mg5ibnd6awjpl3nl3a6ha18m0v2f28hs9kw6dnsgj"; buildDepends = [ base data-default-class exceptions transformers ]; testDepends = [ base data-default-class exceptions hspec HUnit QuickCheck time transformers ]; - jailbreak = true; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -98535,11 +99980,12 @@ self: { }: mkDerivation { pname = "reverse-geocoding"; - version = "0.1.1.1"; - sha256 = "05a6s6ax047b8mg73b9zs4qv33qnmlhk87a8lxnd8xx2gba9vxcb"; + version = "0.2.1"; + sha256 = "089p1fv1ghznfsnhw1bdnwna3hcxmmqakw2qgzg91w5gifzaf18s"; buildDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; + jailbreak = true; homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; @@ -98653,8 +100099,8 @@ self: { }: mkDerivation { pname = "rhythm-game-tutorial"; - version = "0.1"; - sha256 = "1ib6a0skxmhngvii11ikyibg862j5l4dcjyd2l141v8nsb0incpn"; + version = "0.1.1"; + sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s"; isLibrary = false; isExecutable = true; buildDepends = [ base call containers lens mtl objective split ]; @@ -99516,8 +100962,8 @@ self: { }: mkDerivation { pname = "rtorrent-rpc"; - version = "0.2.1.0"; - sha256 = "0l2hpdf6vn3532zk5snhwsby5rp28mzys7zbg9qc62dpfscja3v7"; + version = "0.2.2.0"; + sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s"; buildDepends = [ attoparsec base blaze-builder blaze-textual bytestring deepseq haxr mtl network split utf8-string @@ -100317,11 +101763,12 @@ self: { }: mkDerivation { pname = "satchmo"; - version = "2.8.2"; - sha256 = "1c0p5prhrm05km9sym62nyxacipdy2yib84yw6d869dh3kbd97kq"; + version = "2.9.6"; + sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; buildDepends = [ array base bytestring containers directory minisat mtl process ]; + testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; @@ -100400,6 +101847,7 @@ self: { version = "0.2.0.0"; sha256 = "10prfalf8gic4p5sj35svnypzdgn69f6vwbj9dh55bcq70gqqgn2"; buildDepends = [ array base containers satchmo toysolver ]; + jailbreak = true; homepage = "https://github.com/msakai/satchmo-toysat"; description = "toysat driver as backend for satchmo"; license = stdenv.lib.licenses.bsd3; @@ -100412,8 +101860,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "4.0"; - sha256 = "0clc65rwxdgr1ps7r06cv5dqq91cfb56z9zmmw700xdmjdjq73f4"; + version = "4.2"; + sha256 = "1q62fa2wi8sxkbx93qpxqr6sivs5q028kdbs35j3ym9mb3pa8y8q"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -100799,8 +102247,8 @@ self: { }: mkDerivation { pname = "scientific"; - version = "0.3.3.7"; - sha256 = "16976av2cag4gn06mfqqvj8knj64b966f6101cszxffk530q42y0"; + version = "0.3.3.8"; + sha256 = "0k6f9g3jpwhm52af4zayhdby8xibarn60mpxbb8xxgm78hmdw373"; buildDepends = [ array base bytestring deepseq ghc-prim hashable integer-gmp text ]; @@ -101138,6 +102586,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scroll" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, IfElse, monad-loops, mtl, ncurses + , optparse-applicative, random, text, unix, vector + }: + mkDerivation { + pname = "scroll"; + version = "1.20150314"; + sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring case-insensitive containers data-default IfElse + monad-loops mtl ncurses optparse-applicative random text unix + vector + ]; + homepage = "https://joeyh.name/code/scroll/"; + description = "scroll(6), a roguelike game"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "scrypt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -101183,20 +102652,21 @@ self: { }) {}; "scyther-proof" = callPackage - ({ mkDerivation, array, base, cmdargs, containers, directory + ({ mkDerivation, alex, array, base, cmdargs, containers, directory , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time - , uniplate + , uniplate, utf8-string }: mkDerivation { pname = "scyther-proof"; - version = "0.8.0.0"; - sha256 = "1amfa1z6lzgcq7c2qijvrb7i6cyjx5cqvz4yqfxi680m674zn0gz"; + version = "0.10.0.0"; + sha256 = "1mzv56d1v4r0024azz7s1yfxpdq53yf6231657y9hnc5z1ybsig3"; isLibrary = false; isExecutable = true; buildDepends = [ array base cmdargs containers directory filepath json mtl parsec - pretty process safe tagsoup time uniplate + pretty process safe tagsoup time uniplate utf8-string ]; + buildTools = [ alex ]; jailbreak = true; description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; @@ -101281,7 +102751,7 @@ self: { description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) SDL2; SDL2_ttf = null;}; + }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage ({ mkDerivation, base, binary, bytestring }: @@ -101337,8 +102807,8 @@ self: { }: mkDerivation { pname = "search"; - version = "0.1"; - sha256 = "1d996dkirvv22kkli5vpaxy2ismyiwd4jyzfvbxyqc79lqanf2gh"; + version = "0.1.0.1"; + sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw"; buildDepends = [ base ghc-prim profunctors semigroupoids tagged transformers ]; @@ -101666,8 +103136,8 @@ self: { }: mkDerivation { pname = "semigroups"; - version = "0.16.1"; - sha256 = "0ffy7xmzbwwbkcrpdyq0yw07w9ibiwnb2y5qmg0f5p71x830f3ad"; + version = "0.16.2.2"; + sha256 = "0mzdv05yhrvnib62mwfwwj66fmyzs3axm0y5sn374ig2r113wzni"; buildDepends = [ base bytestring containers deepseq hashable nats text unordered-containers @@ -101729,8 +103199,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.1"; - sha256 = "0vakqqdhjn7a049k1sx86ah5x85c005hrxri2xl9qcd690bvrs6f"; + version = "0.3.2"; + sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -102060,8 +103530,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.2.1"; - sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x"; + version = "0.2.2"; + sha256 = "1pblmnarq1939d2krwbmd9ssm68ar9ip54dl28zjv2j51vhhhzhc"; buildDepends = [ base parsec string-conversions template-haskell text ]; @@ -102075,18 +103545,18 @@ self: { "servant-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq - , either, exceptions, hspec, http-client, http-types, network - , network-uri, QuickCheck, safe, servant, servant-server - , string-conversions, text, transformers, wai, warp + , either, exceptions, hspec, http-client, http-client-tls + , http-types, network, network-uri, QuickCheck, safe, servant + , servant-server, string-conversions, text, transformers, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.2.1"; - sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn"; + version = "0.2.2"; + sha256 = "0b96aglic4aawdcpaxyv9k807kjfrr0a9kniqgj5nfcpgwglnp5r"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client - http-types network-uri safe servant string-conversions text - transformers + http-client-tls http-types network-uri safe servant + string-conversions text transformers ]; testDepends = [ aeson base bytestring deepseq either hspec http-types network @@ -102104,8 +103574,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.3"; - sha256 = "0frwzd90yjvrwkgbwhr4vf1cr0ndzsp56hi2lp3np8axmha4q1fr"; + version = "0.3.1"; + sha256 = "1xbwi5ix5yanrcldc97dwim7s358g7hbr5pwk3r6azknwjzf5fd4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102123,8 +103593,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.2.2"; - sha256 = "1bn8zml7p17prb3bgdhvkn5yyiw907wir2w6kfngxa78shk0vsbz"; + version = "0.2.2.1"; + sha256 = "0s3c85jpy630bfnzq0wlzv38bkr18cpw5lffn6wh8pjwshd5y8zi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102132,7 +103602,6 @@ self: { warp ]; testDepends = [ base hspec language-ecmascript servant ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -102223,8 +103692,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.2.3"; - sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9"; + version = "0.2.4"; + sha256 = "11bds7zhkvqg9w27kb0dd792qvz8gjgkmkpbnijvwwzah5gmipi0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102737,6 +104206,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "shake-minify" = callPackage + ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: + mkDerivation { + pname = "shake-minify"; + version = "0.1.2"; + sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; + buildDepends = [ base bytestring css-text hjsmin shake text ]; + homepage = "https://github.com/LukeHoersten/shake-minify"; + description = "Shake Minify Rules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shake-pack" = callPackage + ({ mkDerivation, base, bytestring, bzlib, shake, tar }: + mkDerivation { + pname = "shake-pack"; + version = "0.1.0"; + sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0"; + buildDepends = [ base bytestring bzlib shake tar ]; + homepage = "https://github.com/LukeHoersten/shake-pack"; + description = "Shake File Pack Actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shaker" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, haskeline, haskell-src, HUnit, mtl @@ -102950,8 +104443,8 @@ self: { }: mkDerivation { pname = "shell-conduit"; - version = "4.5.1"; - sha256 = "048808f4kszb0x24yh7njkbygxl2jn2aadizcssh6rajpbj4zzlj"; + version = "4.5.2"; + sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2"; buildDepends = [ async base bytestring conduit conduit-extra control-monad-loop directory filepath monad-control monads-tf process resourcet @@ -102979,8 +104472,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.2"; - sha256 = "1njnmhs5y6nmmy8yrx87x98aqsjkivrsyxz01ybdjg0y7n5r1cva"; + version = "0.6.3"; + sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v"; buildDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -103062,8 +104555,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.1"; - sha256 = "01j25pw9xywfmw3rgi756n1sdzlclwbhsj6dgwalsc8rbpwdbynv"; + version = "1.6.1.2"; + sha256 = "0iv0ypl6qbrcax43smqc7s5zpm5ck5a5zby59ibnahv5a6wn16ki"; buildDepends = [ async base bytestring containers directory enclosed-exceptions exceptions lifted-async lifted-base monad-control mtl process @@ -103320,6 +104813,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signals" = callPackage + ({ mkDerivation, array, base, constraints, containers, data-reify + , exception-mtl, exception-transformers, language-c-quote + , mainland-pretty, mtl, operational + }: + mkDerivation { + pname = "signals"; + version = "0.0.0.1"; + sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2"; + buildDepends = [ + array base constraints containers data-reify exception-mtl + exception-transformers language-c-quote mainland-pretty mtl + operational + ]; + homepage = "https://github.com/markus-git/signals"; + description = "Stream Processing for Embedded Domain Specific Languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signed-multiset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -103617,14 +105129,13 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.3.0"; - sha256 = "0blr8j52q8q1mdmb66byll3pnhzqmrlwc8jjz40km86bj73n1c7h"; + version = "0.3.1"; + sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; buildDepends = [ base containers deepseq directory filepath MonadCatchIO-transformers mtl old-locale SafeSemaphore text time transformers ]; - jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -103819,8 +105330,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.5.3"; - sha256 = "0m3ghgh2ip22808cyx1babfkpj6v0ii6lmnwgrk8adaj5aif9dfg"; + version = "0.5.4"; + sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp"; buildDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -103832,8 +105343,8 @@ self: { }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.0"; - sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + version = "0.4.1"; + sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q"; isLibrary = true; isExecutable = true; buildDepends = [ base mtl parsec pretty ]; @@ -104089,8 +105600,8 @@ self: { }: mkDerivation { pname = "singletons"; - version = "1.1"; - sha256 = "183y9kj6f8ikrf1r4j24l1r1hnmw6n3aw77nlwqz24qfficdc7z8"; + version = "1.1.1"; + sha256 = "1pbz42i2vxmw3sf3f4sqvgyp9a1b1q5my7xq64h37a9g6jd2246a"; buildDepends = [ base containers mtl template-haskell th-desugar ]; testDepends = [ base Cabal constraints filepath process tasty tasty-golden @@ -104339,6 +105850,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "slack-notify-haskell" = callPackage + ({ mkDerivation, base, bytestring, containers, HTTP, http-client + , http-client-tls, network, text + }: + mkDerivation { + pname = "slack-notify-haskell"; + version = "0.2.3"; + sha256 = "0sz05v40b78qdpz8cqpnblhjy4dxqsz5175hq5083j7iv3xi3kc7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring containers HTTP http-client http-client-tls network + text + ]; + homepage = "https://github.com/tattsun/slack-notify-haskell"; + description = "Slack notifier for Haskell project"; + license = stdenv.lib.licenses.mit; + }) {}; + "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -104588,6 +106118,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smoothie" = callPackage + ({ mkDerivation, base, linear, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.1.3"; + sha256 = "1326hqinlfipbxcynqfsskh4bq5136b48z3kjic8qnddkgkhgg1s"; + buildDepends = [ base linear vector ]; + homepage = "https://github.com/phaazon/smoothie"; + description = "Smooth curves via several splines and polynomials"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smt-lib" = callPackage ({ mkDerivation, array, base, directory, polyparse }: mkDerivation { @@ -104726,9 +106268,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.13.3.2"; - sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; - editedCabalFile = "8ec54d7a35cd1c249835815239ac79cb3171ea590a75de1fed30dadac81040e7"; + version = "0.14.0.1"; + sha256 = "1mmc6ymd0bic7rw9vsrn1jwwjhlc5jqwh8z7zik5wsk75rvddgph"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104797,6 +106338,7 @@ self: { version = "0.2.1.2"; sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh"; buildDepends = [ base blaze-html snap-core ]; + jailbreak = true; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; license = stdenv.lib.licenses.bsd3; @@ -104863,6 +106405,7 @@ self: { attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -104897,6 +106440,7 @@ self: { async base containers monad-loops MonadCatchIO-transformers snap stm time transformers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; @@ -105070,6 +106614,7 @@ self: { pname = "snaplet-acid-state"; version = "0.2.6.1"; sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; + editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-acid-state"; @@ -105171,6 +106716,7 @@ self: { base bytestring css-text directory filepath lens snap text utf8-string ]; + jailbreak = true; homepage = "https://github.com/zmthy/snaplet-css-min"; description = "A Snaplet for CSS minification"; license = stdenv.lib.licenses.mit; @@ -105200,8 +106746,8 @@ self: { }: mkDerivation { pname = "snaplet-fay"; - version = "0.3.3.10"; - sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll"; + version = "0.3.3.11"; + sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -105459,8 +107005,8 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "0.6"; - sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6"; + version = "0.6.0.1"; + sha256 = "0njs0nlznq0yh7gmihwjvxbngw3r0f7csw26pynyi3q0daccsgxg"; buildDepends = [ base bytestring clientsession configurator errors lens MonadCatchIO-transformers mtl postgresql-simple @@ -105517,6 +107063,7 @@ self: { aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text ]; + jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -105533,6 +107080,7 @@ self: { buildDepends = [ base configurator hedis lens mtl network snap text transformers ]; + jailbreak = true; homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -105674,6 +107222,7 @@ self: { SafeSemaphore snap snap-core sqlite-simple stm test-framework test-framework-hunit text time transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -105899,8 +107448,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "snowflake"; - version = "0.1.1.0"; - sha256 = "139chvzj0caxglid92njs8jaxyxmyqcvqnf6yi4d8vzpbcrly29w"; + version = "0.1.1.1"; + sha256 = "1pfd8lqwv0504hli6fhwiqckcca0x9pnfzmy3kz36w7138rclmpi"; buildDepends = [ base time ]; description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers."; license = stdenv.lib.licenses.asl20; @@ -105912,14 +107461,14 @@ self: { }: mkDerivation { pname = "snowglobe"; - version = "3"; - sha256 = "1iaynfi1jsj4vx25n9xqliaq88dbrw5kd1d610wzcfxsvf7ilkly"; + version = "3.0.0.2"; + sha256 = "0l6hy0mza344k7m9skb6v9al611zgrrknhjdzx4ipqdd9zky9p23"; isLibrary = false; isExecutable = true; buildDepends = [ base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; - jailbreak = true; + homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -106334,8 +107883,10 @@ self: { }: mkDerivation { pname = "soxlib"; - version = "0.0.1.1"; - sha256 = "0bc4s74f2sw32j17pihpq0liyaysi4n5i2704ycn5agsgnc0n8xp"; + version = "0.0.2"; + sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8"; + isLibrary = true; + isExecutable = true; buildDepends = [ base containers explicit-exception extensible-exceptions sample-frame storablevector transformers utility-ht @@ -106493,12 +108044,12 @@ self: { }) {}; "spatial-math" = callPackage - ({ mkDerivation, base, cereal, doctest, ghc-prim, linear }: + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }: mkDerivation { pname = "spatial-math"; - version = "0.2.1.0"; - sha256 = "0s6ica55d3gv3y1iwinbk3pd8i8647p8gizrfh4wnsdy908n0qqv"; - buildDepends = [ base cereal ghc-prim linear ]; + version = "0.2.1.2"; + sha256 = "18b6q3dmw7xnl53ckhcsj831b98m3vx3nk9p16sjzh10zdpb0nk8"; + buildDepends = [ base binary cereal ghc-prim linear ]; testDepends = [ base doctest ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; @@ -106609,8 +108160,8 @@ self: { ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { pname = "speculation"; - version = "1.5.0.1"; - sha256 = "1kjshccmfnigb2dxq0czn3c1ckdflz6bl1q60h38qp3rc7250ml0"; + version = "1.5.0.2"; + sha256 = "11d4v3x9phayx29lxl4na0b940ax27rjd867f7l9jb284p1rvhp5"; buildDepends = [ base ghc-prim stm transformers ]; homepage = "http://github.com/ekmett/speculation"; description = "A framework for safe, programmable, speculative parallelism"; @@ -106749,6 +108300,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spir-v" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "spir-v"; + version = "0.0.0.1"; + sha256 = "1aazv418dd4kgpm8kq7n1cfm0gwcr0amsfdks0n1d9mn1rvz7b9p"; + buildDepends = [ base ]; + homepage = "https://github.com/expipiplus1/spir-v"; + description = "Some utilities for reading and writing SPIR-V files"; + license = stdenv.lib.licenses.mit; + }) {}; + "splaytree" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -107429,8 +108992,8 @@ self: { }: mkDerivation { pname = "stable-tree"; - version = "0.6.1"; - sha256 = "02asd3qrnydmw70ibf2w2q6phkvrls1yvlrbwmwhqz839ry0jhyx"; + version = "0.7.0"; + sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -107466,9 +109029,9 @@ self: { "stackage" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal - , classy-prelude-conduit, conduit-extra, containers + , classy-prelude-conduit, conduit, conduit-extra, containers , data-default-class, directory, filepath, hspec, http-client - , http-client-tls, mono-traversable, mtl, old-locale + , http-client-tls, http-conduit, mono-traversable, mtl, old-locale , optparse-applicative, process, QuickCheck, semigroups, stm , streaming-commons, system-fileio, system-filepath, tar, temporary , text, time, transformers, unix-compat, utf8-string, xml-conduit @@ -107476,17 +109039,17 @@ self: { }: mkDerivation { pname = "stackage"; - version = "0.5.2"; - sha256 = "08rxph7xb0kcbcdhcvm3frmrcm5rsyvr8fr2pczd1xxlz37fwbh3"; + version = "0.6.0.1"; + sha256 = "0y785cc71rw5g6jlbrljabing0dpizqyid36hp97r3kwa1bc5x2m"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async base bytestring Cabal classy-prelude-conduit + aeson async base bytestring Cabal classy-prelude-conduit conduit conduit-extra containers data-default-class directory filepath - http-client http-client-tls mono-traversable mtl old-locale - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath tar temporary text time transformers - unix-compat utf8-string xml-conduit yaml zlib + http-client http-client-tls http-conduit mono-traversable mtl + old-locale optparse-applicative process semigroups stm + streaming-commons system-fileio system-filepath tar temporary text + time transformers unix-compat utf8-string xml-conduit yaml zlib ]; testDepends = [ base Cabal classy-prelude-conduit containers hspec http-client @@ -107705,6 +109268,7 @@ self: { version = "0.2.0.0"; sha256 = "10fk8kjzksym7qz9xc8pcglcn24rzi6ry03rnhxiy0mc6d6dsrb4"; buildDepends = [ base double-conversion free mtl text ]; + jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -108303,17 +109867,19 @@ self: { }) {}; "stomp-queue" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, mime, network, split - , stompl, time, utf8-string + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, mime, mtl, network-conduit-tls, split, stompl + , time, utf8-string }: mkDerivation { pname = "stomp-queue"; - version = "0.1.4"; - sha256 = "0qn6mnplwqzz05g1k8ib4q7ga6if2iw3y9a5yba61gn1ghhwhgl9"; + version = "0.2.0"; + sha256 = "0xd9sdyjasp8ncb5qyzkx77a3wrybcajxdpvndx0viykma6bfmqr"; buildDepends = [ - attoparsec base bytestring mime network split stompl time - utf8-string + attoparsec base bytestring conduit conduit-extra mime mtl + network-conduit-tls split stompl time utf8-string ]; + jailbreak = true; homepage = "http://github.com/toschoo/mom"; description = "Stompl Client Library"; license = "LGPL"; @@ -108570,6 +110136,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-histogram" = callPackage + ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "streaming-histogram"; + version = "0.1.0.0"; + sha256 = "1sm05hx5llab6ng6d27rz44kd6njk85axkn3bs3nm03pr85c9xq7"; + buildDepends = [ base containers criterion ]; + testDepends = [ + base containers tasty tasty-hunit tasty-quickcheck + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -108736,6 +110317,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-conv" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "string-conv"; + version = "0.1"; + sha256 = "0zjmlkjmdiqnfnb9qqam6bkipwqz5iwy4bjy9xcs20ljf01586l6"; + buildDepends = [ base bytestring text ]; + description = "Standardized conversion between string types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-conversions" = callPackage ({ mkDerivation, base, bytestring, text, utf8-string }: mkDerivation { @@ -108915,17 +110507,17 @@ self: { }: mkDerivation { pname = "stripe-haskell"; - version = "0.1.1.0"; - sha256 = "0ys54lwbqk8dv5pslw2krd1bdh8giwr54nwq1vq35lqijgm6ywvz"; + version = "0.1.3.0"; + sha256 = "0crh5kmb3bql0ba8srs58hn68q6cl9iaxy2p4phmwzw4xzganawq"; buildDepends = [ aeson base bytestring either HsOpenSSL http-streams io-streams mtl - text time transformers unordered-containers + random text time transformers unordered-containers ]; testDepends = [ - aeson base bytestring either HsOpenSSL hspec random text time - transformers + aeson base bytestring either HsOpenSSL hspec http-streams random + text time transformers ]; - homepage = "https://github.com/dmjio/stripe-haskell"; + homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -108938,8 +110530,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "0.7.1"; - sha256 = "1s2rbmkalrnyqfahrp5vibgdzykzanxk9g9hh9qzv8ap3j6yfi7l"; + version = "0.8.0"; + sha256 = "0n9j3mpknmqm2y4psbg2yjrs6ddgw5j3ha26aq2mxqb9cz1kb29z"; buildDepends = [ aeson base bytestring data-default gpolyline http-conduit http-types template-haskell text time transformers @@ -108987,15 +110579,14 @@ self: { }: mkDerivation { pname = "structured-haskell-mode"; - version = "1.0.19"; - sha256 = "0pf6mhd2385k5fj5a84g1gi8jnhizm3929dadq7zvcbpkzs42pf5"; + version = "1.0.20"; + sha256 = "1pcy83ic95l7k3839py4m10zlx4s4pk4n3bsx3mb7n8rp8zngcv2"; isLibrary = false; isExecutable = true; buildDepends = [ applicative-quoters base descriptive ghc-prim haskell-src-exts text ]; buildTools = [ emacs ]; - jailbreak = true; postInstall = '' emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el install -d $out/share/emacs/site-lisp @@ -109431,8 +111022,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.1.0.1"; - sha256 = "1yypbd94436c38qvgq5cfc1f9bpiq26faxb12s0xyl6551gr6rac"; + version = "0.1.0.2"; + sha256 = "1fyq0pnh6i49wdx29dg4r9i7nb4dqs36y651cmp6bxkszzqrqka5"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -109467,8 +111058,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.0.1"; - sha256 = "0s9hwvxj2nk7w9qkjkqr8ah8lgxl43v04sdvjibh15rj8w4j2hms"; + version = "0.13.0.2"; + sha256 = "1d1aicj2krij6n0dxv1da501jk5am8rl463ghppgp2amkdxdmk2d"; buildDepends = [ base cairo glib mtl text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ librsvg ]; @@ -109508,8 +111099,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, containers }: mkDerivation { pname = "svm-light-utils"; - version = "0.1.1"; - sha256 = "08mifhbmwmd0n0zvgbfzs3mgf5hdvrmn8w3wa6cqn0cqk58z0a2j"; + version = "0.1.2"; + sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa"; buildDepends = [ attoparsec base bytestring containers ]; homepage = "http://github.com/bgamari/svm-light-utils"; description = "Parsers and formatters for the SVMlight input file format"; @@ -109624,8 +111215,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.1.2"; - sha256 = "0dg6m8p8w6razxcphz3nl0di59r46sya9c2x4iq21b3n96wj1n59"; + version = "0.9.1.3"; + sha256 = "07h5677d1liap81z3gvjab5yjib2vbmzvhfzqqmkjg7grk1dblld"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109806,6 +111397,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syncthing-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, containers + , derive, either, exceptions, http-client, http-client-tls, lens + , old-locale, quickcheck-instances, regex-posix, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , wreq + }: + mkDerivation { + pname = "syncthing-hs"; + version = "0.1.2.0"; + sha256 = "15s2pz775bgygq2pnb6x546sf16vcr2dzyn5qnwf4wl7gg4hjalj"; + buildDepends = [ + aeson base bytestring connection containers either exceptions + http-client http-client-tls lens old-locale regex-posix text time + transformers unordered-containers wreq + ]; + testDepends = [ + aeson base bytestring containers derive either lens + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + transformers wreq + ]; + homepage = "https://github.com/jetho/syncthing-hs"; + description = "Haskell bindings for the Syncthing REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "synt" = callPackage ({ mkDerivation, argparser, base, haskell-src-exts, hpc, hspec , regexpr, split, Synt @@ -110191,8 +111808,8 @@ self: { }: mkDerivation { pname = "system-canonicalpath"; - version = "0.3.1.0"; - sha256 = "1ziv64rdydx0kg1wip3mskwaj35la1h94017dy5hnn2hj4g8fh3j"; + version = "0.3.2.0"; + sha256 = "031m5j7xglxdgp3rkgf2v37jya1a3hhjp3mxbfyyjl27wv7pzhjy"; buildDepends = [ base basic-prelude directory system-filepath text ]; @@ -110223,9 +111840,8 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16"; - sha256 = "1x18ffhas6bhjis0glf0xd6ap8vy7cap8lkmnkn4px83d82yzi8k"; - editedCabalFile = "27687f6a2383c74296863a8593ee788f1310d0795a5a110f4bdf80bb74e6d23f"; + version = "0.3.16.1"; + sha256 = "037p2i5gmcnw3qqh3yhn700w51kkyc7rpw9c77wlgdq5bgbyfkbk"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time @@ -110559,9 +112175,8 @@ self: { ({ mkDerivation, base, csv, html, mtl }: mkDerivation { pname = "tabular"; - version = "0.2.2.5"; - sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740"; - editedCabalFile = "9e1a07443018009aa697caa2713231daafed4dfd734a275268831bfb5aebd05f"; + version = "0.2.2.7"; + sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k"; buildDepends = [ base csv html mtl ]; homepage = "http://hub.darcs.net/kowey/tabular"; description = "Two-dimensional data tables with rendering functions"; @@ -110753,8 +112368,8 @@ self: { }: mkDerivation { pname = "taggy"; - version = "0.1.3"; - sha256 = "18azsibsfjz4zj69dk4a3jrdw6zvd8n1gsd1ynd2hy7i9z168iw8"; + version = "0.1.4"; + sha256 = "1fanngprqscpjczqi7v0h5s6qd52y3vj11jv1fasp4hwj6gx92f7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110788,21 +112403,20 @@ self: { }) {}; "taglib" = callPackage - ({ mkDerivation, base, bytestring, tag_c, taglib_c, utf8-string }: + ({ mkDerivation, base, bytestring, taglib, utf8-string }: mkDerivation { pname = "taglib"; version = "0.1.1"; sha256 = "16qyfy8rxaab0q9j2v00h4j5d3la95acfhmp32x1hdxz1rwr6zfp"; buildDepends = [ base bytestring utf8-string ]; - extraLibraries = [ tag_c ]; - pkgconfigDepends = [ taglib_c ]; + extraLibraries = [ taglib ]; + pkgconfigDepends = [ taglib ]; description = "Binding to TagLib (ID3 tag library)"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) { tag_c = null; taglib_c = null;}; + }) { inherit (pkgs) taglib;}; "taglib-api" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, taglib_c, text + ({ mkDerivation, base, bytestring, containers, mtl, taglib, text , transformers }: mkDerivation { @@ -110812,12 +112426,11 @@ self: { buildDepends = [ base bytestring containers mtl text transformers ]; - pkgconfigDepends = [ taglib_c ]; + pkgconfigDepends = [ taglib ]; jailbreak = true; description = "An FFI layer over TagLib's C bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) { taglib_c = null;}; + }) { inherit (pkgs) taglib;}; "tagset-positional" = callPackage ({ mkDerivation, base, binary, containers, parsec, text @@ -111232,8 +112845,8 @@ self: { ({ mkDerivation, base, tasty }: mkDerivation { pname = "tasty-hunit"; - version = "0.9.1"; - sha256 = "1sxha5m2kcxi16gi8xkg2zgyqilk8qdplj8fifd1qq9n2ak8qha7"; + version = "0.9.2"; + sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf"; buildDepends = [ base tasty ]; homepage = "http://documentup.com/feuerbach/tasty"; description = "HUnit support for the Tasty test framework"; @@ -111347,23 +112960,23 @@ self: { }) {}; "tasty-silver" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, mtl, optparse-applicative, process - , process-extras, tagged, tasty, tasty-hunit, temporary-rc, text + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, stm, tagged, tasty, tasty-hunit, temporary-rc + , text }: mkDerivation { pname = "tasty-silver"; - version = "3.0.1.0"; - sha256 = "18hai87p79kj0l7bhgb434ygl6lsqdwr3y6jvsvmyy2jylrz1q1z"; + version = "3.0.2.2"; + sha256 = "0pla52i547mjr06nm2d5y3bf4gnw89mgw3d2gic90v6c3daynk97"; buildDepends = [ - async base bytestring containers deepseq directory filepath mtl - optparse-applicative process process-extras tagged tasty - temporary-rc text + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras stm tagged + tasty temporary-rc text ]; testDepends = [ base directory filepath process tasty tasty-hunit temporary-rc ]; - jailbreak = true; homepage = "https://github.com/phile314/tasty-silver"; description = "Golden tests support for tasty. Fork of tasty-golden."; license = stdenv.lib.licenses.mit; @@ -111541,6 +113154,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "teeth" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "teeth"; + version = "0.1.0.0"; + sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl"; + editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416"; + buildDepends = [ base ]; + homepage = "https://github.com/expipiplus1/teeth"; + description = "Dental data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "tellbot" = callPackage ({ mkDerivation, base, bifunctors, containers, errors, mtl, network , split, time, transformers @@ -111595,12 +113221,12 @@ self: { }) {}; "template-haskell-util" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }: mkDerivation { pname = "template-haskell-util"; - version = "0.1.0.1"; - sha256 = "085b9ybdihmns45pbwzalipmak6am83fsx61m2ik3a1y2y780910"; - buildDepends = [ base template-haskell ]; + version = "0.1.1.0"; + sha256 = "032gkb6pgd5l8ih48971ckiy7spvvr6fcmjx4ysiyyaj7hra174f"; + buildDepends = [ base GenericPretty ghc-prim template-haskell ]; homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils"; description = "Some utilities for template Haskell"; license = stdenv.lib.licenses.mit; @@ -111672,8 +113298,8 @@ self: { }: mkDerivation { pname = "temporal-csound"; - version = "0.4.1"; - sha256 = "1r7v9g3qdp48j8y8g129jamz86fdksrm1amiy761s2nmmr51j6qb"; + version = "0.4.3.1"; + sha256 = "1c7difs3svrq1ka8bdf61vvg9b29baqd086l19a84f0734q5ph19"; buildDepends = [ base csound-catalog csound-expression temporal-media temporal-music-notation temporal-music-notation-western @@ -111880,12 +113506,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "terminfo_0_4_0_0" = callPackage + "terminfo_0_4_0_1" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.0.0"; - sha256 = "10y8mhpazcpwwvg1avc0zxq534rwavg82q69l7wm5np24sb5lrv8"; + version = "0.4.0.1"; + sha256 = "1qsspg1kqk68ja217fn3anv1j8arr1pwzzb5m74zpxpjaqb02153"; buildDepends = [ base ]; extraLibraries = [ ncurses ]; homepage = "https://github.com/judah/terminfo"; @@ -112169,8 +113795,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.1"; - sha256 = "1prcw01kq8ifvl918i6a6cdy8zfb54sb7321advw4z0h83gd1bpd"; + version = "0.1.3"; + sha256 = "0hkpz3l5b1vpnpgagl150g5rdawwf9mwgb7ai0xilj4d7i55gdwl"; buildDepends = [ base bytestring cereal containers data-default directory filepath lifted-base monad-control monad-loops mtl network process random @@ -112189,15 +113815,15 @@ self: { "test-sandbox-compose" = callPackage ({ mkDerivation, aeson, base, bytestring, cabal-test-bin - , containers, directory, hastache, hspec, http-conduit, lifted-base - , network, optparse-applicative, process, shakespeare, shelly - , test-sandbox, text, unix, wai, wai-extra, warp, yaml, yesod - , yesod-core + , containers, directory, hastache, hspec, hspec-test-sandbox + , http-conduit, lifted-base, network, optparse-applicative, process + , shakespeare, shelly, test-sandbox, text, unix, wai, wai-extra + , warp, yaml, yesod, yesod-core }: mkDerivation { pname = "test-sandbox-compose"; - version = "0.1.1"; - sha256 = "1v2zvds3c8g0svh4jafzpdylnkn02hfrnwgxf7pilpd7x718id17"; + version = "0.1.3"; + sha256 = "1yqh5b3gzmwqf0wj491pmkvbn9jzpg36bh427vkl1w6yj5c4ha7x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112206,7 +113832,8 @@ self: { test-sandbox text unix wai wai-extra warp yaml yesod yesod-core ]; testDepends = [ - base bytestring cabal-test-bin hspec process shakespeare text unix + base bytestring cabal-test-bin hspec hspec-test-sandbox process + shakespeare test-sandbox text unix ]; description = "Lightweight development enviroments using test-sandbox"; license = stdenv.lib.licenses.bsd3; @@ -112378,8 +114005,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.0.1"; - sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn"; + version = "0.8.0.2"; + sha256 = "11hzqfik99zydvsnwy4ihpgqvsiq398pxnw777bcaqzdrvyw7fa7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112417,6 +114044,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-and-plots" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers, markdown + , text, unordered-containers + }: + mkDerivation { + pname = "text-and-plots"; + version = "0.2.0.0"; + sha256 = "1wmb3myk1002qhnwsybca6mhzc36c7kxk4ykcnfqb9728x4jrcms"; + buildDepends = [ + base blaze-html bytestring containers markdown text + unordered-containers + ]; + homepage = "https://github.com/andersjel/haskell-text-and-plots"; + description = "EDSL to create HTML documents with plots based on the C3.js library."; + license = stdenv.lib.licenses.mit; + }) {}; + "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { @@ -112902,17 +114546,18 @@ self: { "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-lift + , template-haskell, th-lift, th-orphans }: mkDerivation { pname = "th-desugar"; - version = "1.5"; - sha256 = "18ailfvwiljscyzjxci6k9h05kf9wwb6dy3ms6q928cr80qnr4d5"; + version = "1.5.2"; + sha256 = "0kd5yn98nhji9yshnai4ffw7p8a1mn3xslbw57lvgmyln96sw096"; buildDepends = [ - base containers mtl syb template-haskell th-lift + base containers mtl syb template-haskell th-lift th-orphans ]; testDepends = [ base containers hspec HUnit mtl syb template-haskell th-lift + th-orphans ]; homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; @@ -112923,8 +114568,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.3.0.5"; - sha256 = "1xirbzcnsb8lvadsz8m6jg8yxc3wrf40dnvs66kdmhwjbg6kv4rh"; + version = "0.3.0.6"; + sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j"; buildDepends = [ base containers syb template-haskell ]; testDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -113021,9 +114666,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-lift"; - version = "0.7"; - sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza"; - editedCabalFile = "8c27e18de29621de1588e4c0e6dd5c72c6e1e088fd998d5475458062f607aed5"; + version = "0.7.2"; + sha256 = "0jl2x09mh9frsx5bccw8m4m3h72bncjaix9ylyfpvizisivj8p3m"; buildDepends = [ base template-haskell ]; testDepends = [ base template-haskell ]; homepage = "http://github.com/mboes/th-lift"; @@ -113053,14 +114697,16 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, hspec, template-haskell, th-lift + ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift , th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.9.1"; - sha256 = "04l9alpx51lqsw5l70krjjaf914wi1bmghcak514kyahv1xdcc8q"; - buildDepends = [ base template-haskell th-lift th-reify-many ]; + version = "0.11.1"; + sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy"; + buildDepends = [ + base mtl nats template-haskell th-lift th-reify-many + ]; testDepends = [ base hspec template-haskell ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; @@ -113091,12 +114737,12 @@ self: { }: mkDerivation { pname = "th-reify-many"; - version = "0.1.2"; - sha256 = "1r7ran4vi2mrhcr6qil89cni6ci3dgm775lfw5ciml3gz1948vz9"; - editedCabalFile = "fe6403c094644e2e0c987dcf2846fc068ccfe32e5291099fb4abb2073e5baf31"; + version = "0.1.3"; + sha256 = "00hryljcs434wcv1vaamfdbjk857f46djxv7mlwplkl3zsmfhlfx"; buildDepends = [ base containers mtl safe template-haskell th-expand-syns ]; + testDepends = [ base template-haskell ]; homepage = "http://github.com/mgsloan/th-reify-many"; description = "Recurseively reify template haskell datatype info"; license = stdenv.lib.licenses.bsd3; @@ -113344,18 +114990,20 @@ self: { }) {}; "threads-supervisor" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty , tasty-hunit, tasty-quickcheck, time, transformers , unordered-containers }: mkDerivation { pname = "threads-supervisor"; - version = "1.0.1.0"; - sha256 = "13j9hkdq1nxla00xzrfvk21g307zh4cj0b9ryzf7677qlf2kx2ka"; - buildDepends = [ base stm time unordered-containers ]; + version = "1.0.3.0"; + sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base retry stm time unordered-containers ]; testDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck - time transformers + base bytestring QuickCheck retry stm tasty tasty-hunit + tasty-quickcheck time transformers ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; @@ -113594,14 +115242,14 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.29"; - sha256 = "05p6iga6lzshk6vzywpxd6g53r7hqyvs1rq90v00lpxkiwyqxs6i"; + version = "0.4.30"; + sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers websockets ]; - homepage = "http://yaxu.org/tidal/"; + homepage = "http://tidal.lurk.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113872,19 +115520,15 @@ self: { }) {}; "time-patterns" = callPackage - ({ mkDerivation, base, intervals, lens, profunctors, thyme - , vector-space - }: + ({ mkDerivation, base, intervals, lens, thyme, vector-space }: mkDerivation { pname = "time-patterns"; - version = "0.1.2.0"; - sha256 = "1mjm40gwy3ddk844y7k8rjdb9zpw2rdz39d3n6mm8kbf36bh5fxq"; - buildDepends = [ - base intervals lens profunctors thyme vector-space - ]; + version = "0.1.3.1"; + sha256 = "17gfin2bd6zsk3ij4hdh5xddlki0kb05mq9xkmvly9ka39gsr82n"; + buildDepends = [ base intervals lens thyme vector-space ]; jailbreak = true; homepage = "https://bitbucket.org/jfmueller/time-patterns"; - description = "Patterns for reccurring events"; + description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114114,6 +115758,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timestamper" = callPackage + ({ mkDerivation, base, old-locale, time }: + mkDerivation { + pname = "timestamper"; + version = "1.0"; + sha256 = "14b9zg2lyd8lja9agy73vpscjbkv5nwk6h780wl0xk6m4md9vyj3"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base old-locale time ]; + homepage = "https://github.com/kisom/timestamper"; + description = "Read standard input and prepend each line with a timestamp"; + license = stdenv.lib.licenses.mit; + }) {}; + "timezone-olson" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series @@ -114173,8 +115831,8 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.12.0"; - sha256 = "1khwwikdgy202b3gscnlw87da0s9mdxzmmflcqk9c9ybmn1mx2jn"; + version = "0.12.1"; + sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9"; buildDepends = [ auto-update base bytestring containers double-conversion fast-logger text transformers unix-time @@ -114184,6 +115842,23 @@ self: { license = "unknown"; }) {}; + "titlecase" = callPackage + ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "titlecase"; + version = "0.1.0.0"; + sha256 = "09zq7z3icziad12ssn663l32k6c5z31azzlhg789q635ab3dckn0"; + buildDepends = [ base blaze-markup semigroups text ]; + testDepends = [ + base semigroups tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/nkaretnikov/titlecase"; + description = "Convert English words to title case"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tkhs" = callPackage ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework , test-framework-hunit, utf8-string, vty @@ -114318,21 +115993,20 @@ self: { }) {}; "tn" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , optparse-applicative, text, time + ({ mkDerivation, base, bytestring, containers, directory, process + , safe, text, time, yaml }: mkDerivation { pname = "tn"; - version = "0.2.0.0"; - sha256 = "0m402p4ik8z07dj08wm0jy6w82fzgmsrf1v4v2chg9qb505qigm4"; + version = "1.0.2"; + sha256 = "0rk7zqzwxc1sjar0n3k919snjpxw7an9vgxjh6b407mkzvz62n94"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson aeson-pretty base bytestring optparse-applicative text time + base bytestring containers directory process safe text time yaml ]; - jailbreak = true; - description = "A journaling program for Linux"; - license = stdenv.lib.licenses.bsd3; + description = "A simple daily journal program"; + license = stdenv.lib.licenses.gpl3; }) {}; "tnet" = callPackage @@ -114641,6 +116315,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "touched" = callPackage + ({ mkDerivation, base, cmdargs, directory, process, time }: + mkDerivation { + pname = "touched"; + version = "0.1.0.3"; + sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base cmdargs directory process time ]; + jailbreak = true; + description = "Library (and cli) to execute a procedure on file change"; + license = stdenv.lib.licenses.mit; + }) {}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, containers , data-default-class, data-interval, deepseq, exceptions @@ -114742,8 +116430,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { pname = "traced"; - version = "2014.11.15"; - sha256 = "17yrlfn54il2xf8xnl1b06cwnmmyzkqxb0k7pqycrjmwsxzqkig2"; + version = "3000"; + sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9"; buildDepends = [ base containers mtl pretty ]; description = "Simple evaluation trace"; license = stdenv.lib.licenses.bsd3; @@ -114844,12 +116532,12 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "transformers_0_4_2_0" = callPackage + "transformers_0_4_3_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.4.2.0"; - sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr"; + version = "0.4.3.0"; + sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k"; buildDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -115162,6 +116850,7 @@ self: { testDepends = [ base directory doctest filepath parsers QuickCheck ]; + jailbreak = true; homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; @@ -115199,6 +116888,7 @@ self: { pname = "trivial-constraint"; version = "0.3.0.0"; sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y"; + editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b"; buildDepends = [ base ]; homepage = "https://github.com/leftaroundabout/trivial-constraint"; description = "Constraints that any type, resp. no type fulfills"; @@ -115328,22 +117018,21 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring - , bytestring-builder, containers, directory, filepath, ghc-prim - , hashable, JuicyPixels, mtl, old-locale, parsec, process - , template-haskell, text, time, unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl + , old-locale, parsec, process, template-haskell, text, time + , unordered-containers, vector, yaml }: mkDerivation { pname = "tttool"; - version = "1.1"; - sha256 = "1qdsal3kn35npq4nd0vp5hj96cp316d5mbfr5gxrlwj12qf7kgzb"; + version = "1.3"; + sha256 = "03wb7ra4zk6x40z2h2i8rdlf53abd9lnj67c2438y2vk70ljmlny"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson base binary bytestring bytestring-builder containers - directory filepath ghc-prim hashable JuicyPixels mtl old-locale - parsec process template-haskell text time unordered-containers - vector yaml + aeson base binary bytestring containers directory filepath ghc-prim + hashable JuicyPixels mtl old-locale parsec process template-haskell + text time unordered-containers vector yaml ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -115508,8 +117197,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.0.1"; - sha256 = "15y2shxmvhhy5cpnbkqj91b4x3hpbdr1vdkw41b4q6px49f67r1x"; + version = "1.0.2"; + sha256 = "1qff8qd46583d8pyh9ac11r91cnzgncpjlnpdw5kg81xxldjv1n8"; buildDepends = [ async base clock directory foldl managed process system-fileio system-filepath temporary text time transformers unix @@ -115831,6 +117520,7 @@ self: { template-haskell text time transformers transformers-base twitter-types twitter-types-lens ]; + jailbreak = true; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; @@ -116514,10 +118204,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "types-compat"; - version = "0.1.0"; - sha256 = "14szcqcff3zl7092qnrxgiyh1gbnkx7y557n491r3am42c79d90r"; + version = "0.1.1"; + sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby"; + editedCabalFile = "9d6a31178b383e430ec161d2329d9b52bcf164266f3064e66da53d865825fc96"; buildDepends = [ base ]; - homepage = "https://github.com/philopon/apiary"; + homepage = "https://github.com/philopon/types-compat"; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; license = stdenv.lib.licenses.mit; }) {}; @@ -116611,8 +118302,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20150129.0"; - sha256 = "103f37lcz6a72hl4vyd2ynpbd7ldxkn75znss2kbkrqfggb05p9c"; + version = "0.1.20150129.1"; + sha256 = "167ik26nsq2v6xqfk0rljp4p4g3r35rkvsza7cvi8qdak96dc4ay"; buildDepends = [ base bytestring containers vector ]; testDepends = [ base bytestring directory filemanip filepath HUnit MissingH @@ -116981,8 +118672,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.0.2.1"; - sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i"; + version = "0.1"; + sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q"; buildDepends = [ base containers contravariant mtl transformers transformers-compat ]; @@ -117317,12 +119008,12 @@ self: { }) {}; "union-map" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, extensible }: mkDerivation { pname = "union-map"; - version = "0.0"; - sha256 = "01h4n9yspjicii7b7mcg0a8yg8bwfy6hwb7dp82y08846kcb9fh5"; - buildDepends = [ base containers ]; + version = "0.1"; + sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l"; + buildDepends = [ base containers extensible ]; homepage = "http://github.com/minpou/union-map"; description = "Heterogeneous map by open unions"; license = stdenv.lib.licenses.bsd3; @@ -117697,8 +119388,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.3.4"; - sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5"; + version = "0.3.5"; + sha256 = "0pk7046lmvl7dw6g7508xsixwi3gpiq5dw0a0lfwpfr80g6mh73z"; buildDepends = [ base binary bytestring old-time ]; testDepends = [ base bytestring doctest hspec old-locale old-time QuickCheck time @@ -118361,6 +120052,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "users" = callPackage + ({ mkDerivation, aeson, base, path-pieces, text, time }: + mkDerivation { + pname = "users"; + version = "0.1.0.0"; + sha256 = "1svybj4sdkvcf1d5hm82szrc3s1rql9fcd8xxl1873qrvj4idjqq"; + buildDepends = [ aeson base path-pieces text time ]; + homepage = "https://github.com/agrafix/users"; + description = "A library simplifying user management for web applications"; + license = stdenv.lib.licenses.mit; + }) {}; + + "users-postgresql-simple" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, mtl + , postgresql-simple, text, time, users, users-test, uuid + }: + mkDerivation { + pname = "users-postgresql-simple"; + version = "0.1.0.1"; + sha256 = "1k0dmh3m7998x7rqrxiwfgvsw26cwk3fw923m2dyxrifyaqzc5lk"; + buildDepends = [ + aeson base bytestring mtl postgresql-simple text time users uuid + ]; + testDepends = [ base hspec postgresql-simple users-test ]; + homepage = "https://github.com/agrafix/users"; + description = "A PostgreSQL backend for the users package"; + license = stdenv.lib.licenses.mit; + }) {}; + + "users-test" = callPackage + ({ mkDerivation, aeson, base, hspec, text, users }: + mkDerivation { + pname = "users-test"; + version = "0.1.0.0"; + sha256 = "0r3k89j5ljdp24286xirkx6arcaagljvfvgi1qzc6r6imcnbgim6"; + buildDepends = [ aeson base hspec text users ]; + homepage = "https://github.com/agrafix/users"; + description = "Library to test backends for the users library"; + license = stdenv.lib.licenses.mit; + }) {}; + "utc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, clock , QuickCheck, test-framework, test-framework-quickcheck2, text @@ -118904,6 +120636,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "validate-input" = callPackage + ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy + , QuickCheck, stringable, text + }: + mkDerivation { + pname = "validate-input"; + version = "0.2.0.0"; + sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls"; + buildDepends = [ + base bytestring either mtl pcre-heavy stringable text + ]; + testDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/agrafix/validate-input"; + description = "Input validation combinator library"; + license = stdenv.lib.licenses.mit; + }) {}; + "validation" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups @@ -119060,14 +120809,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vaultaire-common" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , cereal, containers, hashable, hslogger, hspec, locators, mtl + , old-locale, packer, QuickCheck, siphash, text, time, transformers + , unix, unordered-containers + }: + mkDerivation { + pname = "vaultaire-common"; + version = "2.9.1"; + sha256 = "178lh1cxk6ayb4918xas0g7zlan8282vjflm220pzymnxz07chsr"; + buildDepends = [ + async attoparsec base blaze-builder bytestring cereal containers + hashable hslogger locators old-locale packer QuickCheck siphash + text time transformers unix unordered-containers + ]; + testDepends = [ + base bytestring containers hspec locators mtl QuickCheck text + unordered-containers + ]; + description = "Common types and instances for Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vcache" = callPackage ({ mkDerivation, base, bytestring, containers, direct-murmur-hash , easy-file, filelock, lmdb, random, stm, transformers }: mkDerivation { pname = "vcache"; - version = "0.2.0"; - sha256 = "0g04fqblpr41cvbh3s9v5x6rzc47dk5693nz2gf1cn29q9z7g1wf"; + version = "0.2.3"; + sha256 = "0zswcrd65dv8mnifh3h5hr1bmysc7mlqyyi4viln1is08daramzz"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -119077,6 +120849,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vcache-trie" = callPackage + ({ mkDerivation, array, base, bytestring, bytestring-builder + , vcache + }: + mkDerivation { + pname = "vcache-trie"; + version = "0.1.1"; + sha256 = "12nfik4fp5snxf8w3kp6r6v327i9izs18aflj90ib0gq267qrlnk"; + buildDepends = [ array base bytestring bytestring-builder vcache ]; + homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; + description = "patricia tries modeled above VCache"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vcard" = callPackage ({ mkDerivation, base, bytestring, containers, mime-directory }: mkDerivation { @@ -119454,8 +121240,8 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.9"; - sha256 = "0rq1753rfm35x3jck4xfs8jyf6r712rp2c5lh0kzylxfib4lwkj2"; + version = "0.10"; + sha256 = "06nrjis2ba61vpbng1yfxbj6s207x94aia7g4njgjwbb8clm66aw"; buildDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -119498,6 +121284,7 @@ self: { version = "0.2.1"; sha256 = "061gpayzqz0shn2s6fx4ss0dfgxcq717dycmkxjhrx3hy0dczv34"; buildDepends = [ base vector-space ]; + jailbreak = true; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -119855,6 +121642,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vivid" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , hashable, mtl, network, split, stm + }: + mkDerivation { + pname = "vivid"; + version = "0.1.0.1"; + sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82"; + editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426"; + buildDepends = [ + base binary bytestring containers deepseq hashable mtl network + split stm + ]; + jailbreak = true; + description = "Sound synthesis with SuperCollider"; + license = "GPL"; + }) {}; + "vk-aws-route53" = callPackage ({ mkDerivation, aws, base, bytestring, containers, http-conduit , http-types, old-locale, resourcet, text, time, xml-conduit @@ -119976,8 +121781,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.2.7"; - sha256 = "158fycy2l6pahc0bb64vbadrs1xsw095f1m0d2802blb0h0z8ajn"; + version = "5.2.8"; + sha256 = "01wra0gfv94wbv0blrixix0bggjg9cg72axgg3r9brp7qmh1qv14"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -120233,8 +122038,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.4.2"; - sha256 = "0g5s6ndqnmkaqnl29chzp6b95m4yqz0v7q7iymmg0r4dc4m5pc1a"; + version = "3.0.4.6"; + sha256 = "0vl6f2by245fg5sfbzj27zb5mmskqj2h4a68rhwdb8w7gsl2mxz5"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers data-default-class deepseq directory @@ -120323,8 +122128,8 @@ self: { }: mkDerivation { pname = "wai-handler-launch"; - version = "3.0.0.2"; - sha256 = "170a48i651zxq9xb1c45x1i5qx064yd99habha31bqbncl9s5wnq"; + version = "3.0.0.3"; + sha256 = "1nx90z37f296gqh0m9rgvw7899jizpclb6fbwhp98byy9s2ssabl"; buildDepends = [ base blaze-builder bytestring http-types process streaming-commons transformers wai warp @@ -120597,18 +122402,39 @@ self: { }: mkDerivation { pname = "wai-middleware-hmac-client"; - version = "0.1.0.0"; - sha256 = "1mvd3gzvn2qanrk9xh6adsq8xjnwiynw97kbv8fd74pkhj7i9xlz"; + version = "0.1.0.2"; + sha256 = "1jmfmcdv1js6rgadfhwb071qp418440ij0hm0fmyf03dk879qhds"; + isLibrary = true; + isExecutable = true; buildDepends = [ base base64-bytestring byteable bytestring case-insensitive cryptohash http-client http-types mtl old-locale time transformers word8 ]; - homepage = "https://github.com/creichert/wai-middleware-hmac"; - description = "Wai HMAC Authentication Middleware Client"; + description = "WAI HMAC Authentication Middleware Client"; license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-preprocessor" = callPackage + ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai + , wai-middleware-static, warp + }: + mkDerivation { + pname = "wai-middleware-preprocessor"; + version = "0.2.0.0"; + sha256 = "1n9z00v5a75pas22cdm26hj888s6kc98bddh2gfs3ffrazdmgbj1"; + buildDepends = [ + base directory mtl split text wai wai-middleware-static + ]; + testDepends = [ + base Cabal directory mtl split text wai wai-middleware-static warp + ]; + jailbreak = true; + homepage = "https://github.com/taktoa/wai-middleware-preprocessor"; + description = "WAI middleware for preprocessing static files"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -120649,24 +122475,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-static-caching" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , cryptohash, directory, expiring-cache-map, filepath, http-types + , mtl, old-locale, text, time, unix, wai + }: + mkDerivation { + pname = "wai-middleware-static-caching"; + version = "0.6.0.1"; + sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk"; + buildDepends = [ + base base16-bytestring bytestring containers cryptohash directory + expiring-cache-map filepath http-types mtl old-locale text time + unix wai + ]; + homepage = "https://github.com/agrafix/wai-middleware-static"; + description = "WAI middleware that serves requests to static files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, hlint, hspec - , http-types, HUnit, network, process, regex-compat, stm, text - , token-bucket, transformers, unordered-containers, wai, wai-extra + ({ mkDerivation, base, bytestring, containers, haddock, hlint + , hspec, http-types, HUnit, network, process, regex-compat, stm + , token-bucket, transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.1.0.0"; - sha256 = "1hpwlf0wwsh0ya91pvzrlkc2shf9x5qycdql0qlgvnn0rn53vpmh"; + version = "0.2.0.0"; + sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74"; buildDepends = [ - base bytestring http-types network stm text token-bucket - transformers unordered-containers wai + base containers http-types network stm token-bucket transformers + wai ]; testDepends = [ - base bytestring doctest Glob hlint hspec http-types HUnit process - regex-compat stm transformers unordered-containers wai wai-extra + base bytestring haddock hlint hspec http-types HUnit process + regex-compat stm transformers wai wai-extra ]; - jailbreak = true; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120787,8 +122631,8 @@ self: { }: mkDerivation { pname = "wai-session"; - version = "0.3"; - sha256 = "07b9d7ggsj662zya16g36bwczw72fw9z15xnkjrpgr6fl9b4kg0y"; + version = "0.3.1"; + sha256 = "1h2z1zahbrlw9r489vd6xjwra7nmy67lmv77gr912zls5fpf9aws"; buildDepends = [ base blaze-builder bytestring containers cookie http-types StateVar time transformers vault wai @@ -120887,8 +122731,8 @@ self: { }: mkDerivation { pname = "wai-throttler"; - version = "0.1.0.3"; - sha256 = "0wfbmjdw8k63fs4425fpnq24xssl9yf16dpy6cwkz68dn0vs0dkd"; + version = "0.1.0.5"; + sha256 = "1jh53ac1q4zksxdrmwjgsyidvx8zlhx57nnf3ca4spa3paz9n9g6"; buildDepends = [ base bytestring containers http-types time wai ]; jailbreak = true; description = "Wai middleware for request throttling"; @@ -120921,8 +122765,8 @@ self: { }: mkDerivation { pname = "wai-websockets"; - version = "3.0.0.4"; - sha256 = "0bnwx1fxvr7v0v2apl1sdssz2nrmb9rn86ix2kmwv323i60f6g4c"; + version = "3.0.0.5"; + sha256 = "1gqivkjdvln6xpkhcr6k75gk2qvjp6mr691902w3m6xpcdv1q5z0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -120958,28 +122802,51 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "waitra" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , http-types, regex-applicative, tasty, tasty-hunit + , template-haskell, text, wai, wai-extra + }: + mkDerivation { + pname = "waitra"; + version = "0.0.3.0"; + sha256 = "0yismhhgwzrssla2bcg44jy0fdwwxh2szypyjn8wfjvmkfhzshvn"; + buildDepends = [ + aeson base bytestring directory filepath http-types + regex-applicative template-haskell text wai + ]; + testDepends = [ + aeson base http-types regex-applicative tasty tasty-hunit wai + wai-extra + ]; + homepage = "https://github.com/futurice/waitra"; + description = "A very simple Wai router"; + license = stdenv.lib.licenses.mit; + }) {}; + "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec , HTTP, http-date, http-types, HUnit, iproute, lifted-base, network , old-locale, QuickCheck, simple-sendfile, streaming-commons, text - , time, transformers, unix, unix-compat, void, wai + , time, transformers, unix, unix-compat, vault, void, wai }: mkDerivation { pname = "warp"; - version = "3.0.9"; - sha256 = "1rlkfxm2ryyzdl3clbs4qaka80wja9nn1pakl7rvn4rv809g1kgi"; + version = "3.0.10"; + sha256 = "07xzc8m662zp14pqfmygjzpkafdklf776xc5ihsnqaxym7wpajds"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network - simple-sendfile streaming-commons text unix unix-compat void wai + simple-sendfile streaming-commons text unix unix-compat vault void + wai ]; testDepends = [ array async auto-update base blaze-builder bytestring case-insensitive doctest ghc-prim hashable hspec HTTP http-date http-types HUnit iproute lifted-base network old-locale QuickCheck simple-sendfile streaming-commons text time transformers unix - unix-compat void wai + unix-compat vault void wai ]; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; @@ -121028,8 +122895,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.1.4"; - sha256 = "1f4bwyck6lg3jndsspimpa92p71zxmlxmk9zjx1hkplld2i4psdk"; + version = "3.0.3"; + sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -121460,8 +123327,8 @@ self: { }: mkDerivation { pname = "web-routing"; - version = "0.5.0"; - sha256 = "074yllv21djz9g3qh8wl1dn3riy0ax2i2z4c6wh8732c6pwbxygx"; + version = "0.6.0"; + sha256 = "0zs4znmg34d4q14v14h07k48921xan69wrp27xjza5kp6nmqy58w"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; @@ -121471,6 +123338,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webcrank-dispatch" = callPackage + ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text + , unordered-containers + }: + mkDerivation { + pname = "webcrank-dispatch"; + version = "0.1"; + sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k"; + buildDepends = [ + base bytestring mtl path-pieces reroute text unordered-containers + ]; + homepage = "https://github.com/webcrank/webcrank-dispatch.hs"; + description = "A simple request dispatcher"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webdriver" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree @@ -121481,8 +123364,8 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.6.0.4"; - sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf"; + version = "0.6.1"; + sha256 = "1464i2hzriimhykgi0sinndyz3r7vajkzpwyp80fc75piq6vr7wi"; buildDepends = [ aeson attoparsec base base64-bytestring bytestring cond data-default directory directory-tree exceptions filepath @@ -121491,7 +123374,6 @@ self: { transformers-base unordered-containers vector zip-archive ]; testDepends = [ base parallel text ]; - jailbreak = true; homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; @@ -121683,6 +123565,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websnap" = callPackage + ({ mkDerivation, base, filepath, gtk, webkit }: + mkDerivation { + pname = "websnap"; + version = "0.1.0.1"; + sha256 = "05favr2lpc8y3qy7wahcriq8qhvzvr3ngvrgdyjcvf5bvyfwlp84"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base filepath gtk webkit ]; + homepage = "https://github.com/jrb/websnap"; + description = "Transforms URLs to PNGs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "websockets" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy @@ -121691,8 +123587,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.2.2"; - sha256 = "0zpx16rvx8imhad4av8sa7jf39v785xrnfy6l51jnhda5mfxaip4"; + version = "0.9.3.0"; + sha256 = "0aq0mbfi1sh55z46pcy3g0n3zjqw176pah4zny0nk8l3gl8ss7v1"; buildDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy mtl network random SHA text @@ -121815,6 +123711,7 @@ self: { pname = "welshy"; version = "0.1.0.0"; sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki"; + editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c"; buildDepends = [ aeson base blaze-builder bytestring conduit http-types lifted-base resourcet text transformers unordered-containers wai warp @@ -122045,13 +123942,13 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.1.1"; - sha256 = "1i0jvxc1llcq5aayzgqhkz51mqh96pdadml6gi94h2z3yj20nicg"; + version = "0.1.2.1"; + sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; - description = "Generalization of catMaybes"; + description = "Generalization of filter and catMaybes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122103,6 +124000,7 @@ self: { version = "0.2.4"; sha256 = "0xbzk4p5jazdkrlvj67xzy9vphl6rw90jp8cv4hr8p63v7ja2kfq"; buildDepends = [ base lens linear parsec parsec-numbers ]; + jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -122125,8 +124023,8 @@ self: { }: mkDerivation { pname = "wl-pprint-ansiterm"; - version = "0.1.0.1"; - sha256 = "06v020dr7gkdv2il43hm4vpfclyffnlnrdnpn1yqm0fnxsmmjslq"; + version = "0.2.0.0"; + sha256 = "02s47f58ah08fvjqpdscxqiq9609agi5iplczrdkgxrv1vj8vkpz"; buildDepends = [ ansi-terminal base bytestring containers mtl nats semigroups text transformers wl-pprint-extras @@ -122297,8 +124195,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "word8"; - version = "0.1.1"; - sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r"; + version = "0.1.2"; + sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw"; buildDepends = [ base ]; testDepends = [ base hspec ]; description = "Word8 library"; @@ -122334,8 +124232,8 @@ self: { }: mkDerivation { pname = "wordpass"; - version = "1.0.0.2"; - sha256 = "1r1h8x3c7knvqvbv56riaig7hd91x12ymz0hc1wpk9h4zgwjgq15"; + version = "1.0.0.3"; + sha256 = "1nbgzrc3g3kcc8462sqskdywk0n1m54810r0jsw8ip2xllvkxx9b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -123004,8 +124902,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.1.5"; - sha256 = "1awflg2z6ixxngdy393q892anwpdibximkz21y95n022hl0wzlbr"; + version = "0.2.1"; + sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -123016,10 +124914,9 @@ self: { base filepath HUnit language-python test-framework test-framework-hunit xcb-types ]; - jailbreak = true; homepage = "http://github.com/tych0/xcffib"; description = "A cffi-based python binding for X"; - license = stdenv.lib.licenses.mit; + license = "unknown"; }) {}; "xchat-plugin" = callPackage @@ -123155,6 +125052,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xhb-atom-cache" = callPackage + ({ mkDerivation, base, hashable, mtl, transformers + , unordered-containers, xhb + }: + mkDerivation { + pname = "xhb-atom-cache"; + version = "0.1.0.2"; + sha256 = "113yff75i5pc0kcz4w7npbp34bl92aibpvj2cgg30f66nml61xg9"; + buildDepends = [ + base hashable mtl transformers unordered-containers xhb + ]; + jailbreak = true; + homepage = "http://github.com/jotrk/xhb-atom-cache/"; + description = "Atom cache for XHB"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "xhb-ewmh" = callPackage + ({ mkDerivation, base, binary, bytestring, dlist, hashable, mtl + , transformers, xhb, xhb-atom-cache + }: + mkDerivation { + pname = "xhb-ewmh"; + version = "0.1.3.1"; + sha256 = "02qfpwa9558svk0481dxjchr9h0phacsyqzail94kmzkhnnly64l"; + buildDepends = [ + base binary bytestring dlist hashable mtl transformers xhb + xhb-atom-cache + ]; + jailbreak = true; + homepage = "http://github.com/jotrk/xhb-ewmh/"; + description = "EWMH utilities for XHB"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "xhtml_3000_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -123290,6 +125222,7 @@ self: { testDepends = [ base blaze-markup bytestring old-locale text time zip-archive ]; + jailbreak = true; description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -123347,8 +125280,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "xml"; - version = "1.3.13"; - sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3"; + version = "1.3.14"; + sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j"; buildDepends = [ base bytestring text ]; homepage = "http://code.galois.com"; description = "A simple XML library"; @@ -123398,8 +125331,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.2.3.2"; - sha256 = "1vk4ldcacpwfmhiqpcs571s5kqsh7v0ch2sfrw2ibkm0cyqs6jk9"; + version = "1.2.3.3"; + sha256 = "0y5k2l6a4vl5gl8ch8gwjqyg0v2qkiwrixf0yb0ik71z8zb9ki8b"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -123480,8 +125413,8 @@ self: { ({ mkDerivation, base, mtl, safe, transformers, xml }: mkDerivation { pname = "xml-extractors"; - version = "0.3.0.0"; - sha256 = "0mna299sdbxxi2asaa2wk3pwnhr35ah363g2lja7lg82an7np8kp"; + version = "0.4.0.0"; + sha256 = "02380x94zvm736lj2j02926xn8asc6bq4hbhm3nshh9iw8x4phwq"; buildDepends = [ base mtl safe transformers xml ]; homepage = "https://github.com/holmisen/xml-extractors"; description = "Wrapper over xml to extract data from parsed xml"; @@ -123673,8 +125606,8 @@ self: { ({ mkDerivation, base, directory, process, tagsoup, text }: mkDerivation { pname = "xml-to-json-fast"; - version = "1.0.0"; - sha256 = "0kd5civ3rv2b1c1xfb985fri2q5arnj80qydazcp4h3vvf301gmh"; + version = "1.0.1"; + sha256 = "1gp32adky7pjspppkzz01rj3lpl2b8fvaqf7fg3j0p3cmlbhap7m"; isLibrary = true; isExecutable = true; buildDepends = [ base directory process tagsoup text ]; @@ -123780,6 +125713,7 @@ self: { pname = "xmlhtml"; version = "0.2.3.4"; sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr"; + editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring containers parsec text unordered-containers @@ -123843,12 +125777,12 @@ self: { , containers, dbus, directory, filepath, hinotify, HTTP, libmpd , libXpm, libXrandr, mtl, old-locale, parsec, process, regex-compat , stm, time, timezone-olson, timezone-series, transformers, unix - , utf8-string, wirelesstools, X11, X11-xft + , utf8-string, wirelesstools, X11, X11-xft, Xrender }: mkDerivation { pname = "xmobar"; - version = "0.22.1"; - sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz"; + version = "0.23"; + sha256 = "0nl3md4d8mzdch2i79ax09brwvm1d6b3rfxy52zbg4z05iv6grdv"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -123857,13 +125791,13 @@ self: { regex-compat stm time timezone-olson timezone-series transformers unix utf8-string X11 X11-xft ]; - extraLibraries = [ libXpm libXrandr wirelesstools ]; + extraLibraries = [ libXpm libXrandr wirelesstools Xrender ]; configureFlags = [ "-fall_extensions" ]; homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libXpm; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs) wirelesstools;}; + }) { Xrender = null; inherit (pkgs.xlibs) libXpm; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -124133,8 +126067,8 @@ self: { }: mkDerivation { pname = "xournal-parser"; - version = "0.5.0.3"; - sha256 = "1r99xv7w2gxms1ff5qpj36dcb3gb5lpccr1mjjdnkcij81i748ly"; + version = "0.5.1"; + sha256 = "07b1gflqsjsydn304vw6zwgwlc0g7riv0b80lr165mw6c2fkmx78"; buildDepends = [ attoparsec attoparsec-conduit base bytestring conduit conduit-extra containers exceptions lens mtl strict text transformers xml-conduit @@ -124170,8 +126104,8 @@ self: { }: mkDerivation { pname = "xournal-types"; - version = "0.5.0.2"; - sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm"; + version = "0.5.1"; + sha256 = "1ii4d560wvy6iky09wbz2kdf370y87ldgr0ymsv50d7cqxfgbjap"; buildDepends = [ base bytestring cereal containers lens strict TypeCompose ]; @@ -124349,6 +126283,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yabi-muno" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, mtl + , mtl-compat, parsec + }: + mkDerivation { + pname = "yabi-muno"; + version = "0.1.0.1"; + sha256 = "169ndqawpkaj43iq6mbddqxprc7w6lsv3ws8a7cq7nmyn7n3r0jg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring containers lens mtl mtl-compat parsec + ]; + jailbreak = true; + description = "Yet Another Brainfuck Interpreter"; + license = stdenv.lib.licenses.mit; + }) {}; + "yackage" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, Cabal , cmdargs, conduit, containers, directory, http-conduit, http-types @@ -124357,8 +126309,8 @@ self: { }: mkDerivation { pname = "yackage"; - version = "0.7.0.6"; - sha256 = "0c0wln31415xvnjd4bn9bqxl190a9yc3ifypif4fab2m7dkd27ly"; + version = "0.7.0.7"; + sha256 = "168dcl2ham94k0wmf75lgazn6q82yfww5lpl24nhmdr3fwd4p6p1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -124521,8 +126473,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.1.6"; - sha256 = "0f1wlq0j1xxz183siwhrrm67p35bbbyz4qi7f6qjwpy2qcn9zpyl"; + version = "0.3.1.7"; + sha256 = "0r6gkvxcd598c52z1s4rzbc80xgc571jcr3p5h0bwkn93b8bj5vf"; buildDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -124772,8 +126724,8 @@ self: { }: mkDerivation { pname = "yeller"; - version = "0.1.0.3"; - sha256 = "0anahxim88xjmmlx1nn6clckn8wa975ydvv4impyq2hfjy0brpi5"; + version = "0.1.0.4"; + sha256 = "0r9kcjax591v366m5nrm75cy97wr4ykzb7kj1bwsgss21k185a3j"; buildDepends = [ aeson base bytestring containers http-client http-client-tls http-types network stm text unordered-containers @@ -124859,8 +126811,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.3"; - sha256 = "05x4mzf6c1ab2bf724wmsl6dqhqqjw12j44q0c4v4szcp4fngsab"; + version = "1.4.3.1"; + sha256 = "08kyg83alf1z1c5llr5gbfg827ds1fvyz0d7vicmx6fzl1m9nkzb"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -125123,9 +127075,9 @@ self: { ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, Cabal, conduit, conduit-extra, containers , data-default-class, directory, file-embed, filepath, fsnotify - , ghc, ghc-paths, http-conduit, http-reverse-proxy, http-types - , lifted-base, network, optparse-applicative, parsec, process - , project-template, resourcet, shakespeare, split + , ghc, ghc-paths, http-client, http-conduit, http-reverse-proxy + , http-types, lifted-base, network, optparse-applicative, parsec + , process, project-template, resourcet, shakespeare, split , streaming-commons, system-fileio, system-filepath, tar , template-haskell, text, time, transformers, transformers-compat , unix-compat, unordered-containers, wai, wai-extra, warp, yaml @@ -125133,14 +127085,14 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.3.7"; - sha256 = "07fnh6mxhrdf7bhd0c4l8il2qswr2sbl7dzapy2f9jf9cznidbn2"; + version = "1.4.5"; + sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base base64-bytestring blaze-builder bytestring Cabal conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify ghc ghc-paths http-conduit + file-embed filepath fsnotify ghc ghc-paths http-client http-conduit http-reverse-proxy http-types lifted-base network optparse-applicative parsec process project-template resourcet shakespeare split streaming-commons system-fileio system-filepath @@ -125208,8 +127160,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.1"; - sha256 = "1ynhxzc4q80zamyyabjhiz7mgh7wjzqm23xlx67x7lpwz0q18hpb"; + version = "1.4.8.3"; + sha256 = "0k49s9cybr36knmx2lwapivszcq6xg67vpx5fw812dzv8x2cj714"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -125386,8 +127338,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.4"; - sha256 = "1vy4gscw3rgglbiq0v4l0zjmvan2sk6sgd93402hw64xwxwzc35c"; + version = "1.4.4.1"; + sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -125525,6 +127477,7 @@ self: { base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; + jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; @@ -126269,8 +128222,8 @@ self: { }: mkDerivation { pname = "yi-rope"; - version = "0.7.0.0"; - sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2"; + version = "0.7.0.1"; + sha256 = "190rb5rbvdzy4d52dj3ih0kwzigh7v0fg412p3848pkv3836vmg0"; buildDepends = [ base binary bytestring charsetdetect-ae data-default deepseq fingertree text text-icu @@ -126506,20 +128459,20 @@ self: { "yst" = callPackage ({ mkDerivation, aeson, base, containers, csv, directory, filepath - , HDBC, HDBC-sqlite3, HStringTemplate, old-locale, old-time, pandoc - , parsec, scientific, split, text, time, unordered-containers - , xhtml, yaml + , HDBC, HDBC-sqlite3, HStringTemplate, lucid, old-locale, old-time + , pandoc, parsec, scientific, split, text, time + , unordered-containers, yaml }: mkDerivation { pname = "yst"; - version = "0.4.1.1"; - sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; + version = "0.5.0.2"; + sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base containers csv directory filepath HDBC HDBC-sqlite3 - HStringTemplate old-locale old-time pandoc parsec scientific split - text time unordered-containers xhtml yaml + HStringTemplate lucid old-locale old-time pandoc parsec scientific + split text time unordered-containers yaml ]; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; @@ -126687,7 +128640,7 @@ self: { description = "Bindings to ZeroMQ 2.1.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq3-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base @@ -126729,7 +128682,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq4-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions @@ -126750,7 +128703,7 @@ self: { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath @@ -126948,8 +128901,8 @@ self: { ({ mkDerivation, base, bytestring, profunctors, zlib }: mkDerivation { pname = "zlib-lens"; - version = "0.1.1.1"; - sha256 = "1j37ic4v4q1wwysm4gf41f5bxd8ywr4qnqpxscigm0ghbwfs7f1z"; + version = "0.1.1.2"; + sha256 = "13zfh0639881nfxibl501f1b3ci9pjvhvdid2l5sf2na8kmpzr61"; buildDepends = [ base bytestring profunctors zlib ]; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; diff --git a/pkgs/development/haskell-modules/xmonad-nix.patch b/pkgs/development/haskell-modules/xmonad-nix.patch index f0785773cc14..810d8435a343 100644 --- a/pkgs/development/haskell-modules/xmonad-nix.patch +++ b/pkgs/development/haskell-modules/xmonad-nix.patch @@ -12,7 +12,7 @@ err = base ++ ".errors" src = base ++ ".hs" lib = dir </> "lib" -+ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "XMONAD_GHC") ++ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "NIX_GHC") libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib srcT <- getModTime src binT <- getModTime bin diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 7ed14b632f78..4691b8be564f 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -1,63 +1,38 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +{stdenv, fetchurl, unzip}: +let + s = # Generated upstream information + rec { baseName="angelscript"; - version = "2.29.2"; + version = "2.30.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "12ws4vp9iyxbgzxxdq7g9729vg1ld92f38gfznyhsknhsay4kmf5"; + sha256 = "00w7h2g6g1lkq9ahsvzyk78nbdzhn1adsrns9mrqb2fbxv2wbz5d"; }; + buildInputs = [ + unzip + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.sha256; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["prepareBuild" "doMake" "cleanLib" "doMakeInstall" "installDocs"]; - - prepareBuild = a.fullDepEntry '' + src = fetchurl { + inherit (s) url sha256; + }; + preConfigure = '' cd angelscript/projects/gnuc - sed -i makefile -e "s@LOCAL [?]= .*@LOCAL = $out@" - mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" - export SHARED=1 - export VERSION="${version}" - '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - - cleanLib = a.fullDepEntry '' - rm ../../lib/* - '' ["minInit"]; - - installDocs = a.fullDepEntry '' - mkdir -p "$out/share/angelscript" - cp -r ../../../docs "$out/share/angelscript" - '' ["defEnsureDir" "prepareBuild"]; - + export makeFlags="$makeFlags PREFIX=$out" + ''; + postInstall = '' + mkdir -p "$out/share/docs/angelscript" + cp -r ../../../docs/* "$out/share/docs/angelscript" + ''; meta = { + inherit (s) version; description = "Light-weight scripting library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.zlib; - homepage="http://www.angelcode.com/angelscript/"; + license = stdenv.lib.licenses.zlib ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; - inherit version; + homepage="http://www.angelcode.com/angelscript/"; }; -}) x - +} diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix new file mode 100644 index 000000000000..8600d17f3665 --- /dev/null +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }: + +stdenv.mkDerivation rec { + name = "gnu-apl-${version}"; + version = "1.4"; + + src = fetchurl { + url = "mirror://gnu/apl/apl-${version}.tar.gz"; + sha256 = "0fl9l4jb5wpnb54kqkphavi657z1cv15h9qj2rqy2shf33dk3nk9"; + }; + + buildInputs = [ liblapack readline gettext ncurses ]; + + postInstall = '' + cp -r support-files/ $out/share/doc/ + find $out/share/doc/support-files -name 'Makefile*' -delete + ''; + + meta = { + description = "Free interpreter for the APL programming language."; + homepage = http://www.gnu.org/software/apl/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + platforms = stdenv.lib.platforms.linux; + + longDescription = '' + GNU APL is a free interpreter for the programming language APL, with an + (almost) complete implementation of ISO standard 13751 aka. Programming + Language APL, Extended. GNU APL was written and is being maintained by + Jürgen Sauermann. + ''; + }; +} diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index ae3f014eee19..354a4d970ba7 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "1wb0rb89mvy1x64a8z9z3jmphw72vnkxaqbc0f2v35c2wv61p839"; + sha256 = "02vbg9ywn76rslkinjk1dw3wrj76p5bahbhvz71drlp30cs1r28w"; }; installPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; - homepage = http://groovy.codehaus.org/; + homepage = http://groovy-lang.org/; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 63cf85bc506b..54a043458a3b 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -7,7 +7,7 @@ let version="2.0.1"; name="${baseName}-${version}"; hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; - url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; + url="http://softlayer-ams.dl.sourceforge.net/project/lush/lush2/lush-2.0.1.tar.gz"; sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index dc3d700dc8e1..a0906a09a78b 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { # there is a mysterious sh: command not found doCheck = false; - enableParallelBuilding = true; + # problems on Hydra + enableParallelBuilding = false; configureFlags = [ "--enable-readline" "--enable-dl" ]; diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index 058b1776c666..7c5cb27e37f0 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -18,9 +18,7 @@ let in -with { - inherit (stdenv.lib) optional optionalString; -}; +with stdenv.lib; stdenv.mkDerivation rec { name = "perl-5.20.1"; @@ -79,4 +77,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; passthru.libPrefix = "lib/perl5/site_perl"; + + meta = { + homepage = https://www.perl.org/; + description = "The standard implementation of the Perl 5 programmming language"; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; + }; } diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4c8b80c29bd9..49740fddb466 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.37"; + version = "5.4.38"; name = "php-${version}"; @@ -189,6 +189,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-maintainer-zts"]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -229,6 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); ztsSupport = config.php.zts or false; + calendarSupport = config.php.calendar or false; }; configurePhase = '' @@ -253,15 +258,16 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "1bd8yciy13v3aw4aiw57zpf8kgxpm6rcv73grp1yj2pbbrkzcyw5"; + sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 70380889bd3c..fac046548470 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -193,6 +193,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; }; cfg = { @@ -227,6 +230,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' @@ -254,12 +258,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index bf0f2076c1c4..6559ecfa658c 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -193,6 +193,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + + calendar = { + configureFlags = ["--enable-calendar"]; + }; + }; cfg = { @@ -227,6 +232,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' @@ -254,12 +260,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "0vfhvwn84lrz9psf10sjnwljbna1r7yqxq3lmsh5qajifl3lraxd"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/fix-5.4.patch b/pkgs/development/interpreters/php/fix-paths.patch index 51d98549eee2..51d98549eee2 100644 --- a/pkgs/development/interpreters/php/fix-5.4.patch +++ b/pkgs/development/interpreters/php/fix-paths.patch diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index adc0261eddbd..ddb2a26bab2e 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -12,12 +12,12 @@ let sourceInfo = rec { baseName="picolisp"; tarballBaseName="picoLisp"; - version="3.1.8"; + version="3.1.9"; name="${baseName}-${version}"; tarballName="${tarballBaseName}-${version}"; extension="tgz"; url="http://www.software-lab.de/${tarballName}.${extension}"; - sha256="0bkr1ck157871bv4a8dp9dmcvxigjsikm5rr2khylxc3l6il7s1i"; + sha256="1rhfd743ga9qsgn4h2aw1xcgrc7amsllli2zqg8cgm408vxkr6j1"; }; in rec { diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 5c99428463d7..10bb8b3215df 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -21,7 +21,7 @@ with stdenv.lib; let majorVersion = "3.4"; pythonVersion = majorVersion; - version = "${majorVersion}.2"; + version = "${majorVersion}.3"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "1vrd9gqdqw7rw0kiiprqvng7ywnfc2hbyys7gr9mdh25s619cv8w"; + sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile index b9ae407c4d4e..7d2f78133c57 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile @@ -1,4 +1,4 @@ source "http://rubygems.org" gem "bundix", :git => "https://github.com/cstrahan/bundix.git", - :ref => "5df25b11b5b86e636754d54c2a8859c7c6ec78c7" + :ref => "v1.0.2" diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock index c8869fdb1e30..038fa1a7a503 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock @@ -1,10 +1,9 @@ GIT remote: https://github.com/cstrahan/bundix.git - revision: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7 - ref: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7 + revision: e098b8c04087079c897aaf9542990e9fdd503bcf + ref: v1.0.2 specs: - bundix (0.1.0) - bundler (~> 1.7.9) + bundix (1.0.2) thor (~> 0.19.1) GEM diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix index a3e732c68e12..adde97a49f21 100644 --- a/pkgs/development/interpreters/ruby/bundix/gemset.nix +++ b/pkgs/development/interpreters/ruby/bundix/gemset.nix @@ -1,12 +1,12 @@ { "bundix" = { - version = "0.1.0"; + version = "1.0.2"; source = { type = "git"; url = "https://github.com/cstrahan/bundix.git"; - rev = "5df25b11b5b86e636754d54c2a8859c7c6ec78c7"; + rev = "e098b8c04087079c897aaf9542990e9fdd503bcf"; + sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803"; fetchSubmodules = false; - sha256 = "1iqx12y777v8gszggj25x0xcf6lzllx58lmv53x6zy3jmvfh4siv"; }; dependencies = [ "thor" @@ -19,4 +19,4 @@ sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; }; -} +} \ No newline at end of file diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix index f90e756030f0..b51a6d49bd3d 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix @@ -11,6 +11,7 @@ , postInstall ? null , documentation ? false , meta ? {} +, ... }@args: let @@ -246,67 +247,94 @@ let (map mkBuildFlags (lib.filter needsBuildFlags (attrValues instantiated))); -in + derivation = stdenv.mkDerivation { + inherit name; -stdenv.mkDerivation { - inherit name; + buildInputs = [ + ruby + bundler + git + ] ++ args.buildInputs or []; - buildInputs = [ - ruby - bundler - git - ]; + phases = [ "installPhase" "fixupPhase" ]; - phases = [ "installPhase" "fixupPhase" ]; + outputs = [ + "out" # the installed libs/bins + "bundle" # supporting files for bundler + ]; - outputs = [ - "out" # the installed libs/bins - "bundle" # supporting files for bundler - ]; + installPhase = '' + mkdir -p $bundle + export BUNDLE_GEMFILE=$bundle/Gemfile + cp ${gemfile} $BUNDLE_GEMFILE + cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock - installPhase = '' - mkdir -p $bundle - export BUNDLE_GEMFILE=$bundle/Gemfile - cp ${gemfile} $BUNDLE_GEMFILE - cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock + export NIX_GEM_SOURCES=${sources} + export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} - export NIX_GEM_SOURCES=${sources} - export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} + export GEM_HOME=$out/${ruby.gemPath} + export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME + mkdir -p $GEM_HOME - export GEM_HOME=$out/${ruby.gemPath} - export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME - mkdir -p $GEM_HOME + ${allBuildFlags} - ${allBuildFlags} + mkdir gems + cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems + ${copyGems} - mkdir gems - cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems - ${copyGems} + ${lib.optionalString (!documentation) '' + mkdir home + HOME="$(pwd -P)/home" + echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc + ''} - ${lib.optionalString (!documentation) '' - mkdir home - HOME="$(pwd -P)/home" - echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc - ''} + mkdir env + ${runPreInstallers} - mkdir env - ${runPreInstallers} + mkdir $out/bin + cp ${./monkey_patches.rb} monkey_patches.rb + export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)" + bundler install --frozen --binstubs ${lib.optionalString enableParallelBuilding "--jobs $NIX_BUILD_CORES"} + RUBYOPT="" - mkdir $out/bin - cp ${./monkey_patches.rb} monkey_patches.rb - export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)" - bundler install --frozen --binstubs ${lib.optionalString enableParallelBuilding "--jobs $NIX_BUILD_CORES"} - RUBYOPT="" + runHook postInstall + ''; - runHook postInstall - ''; + inherit postInstall; - inherit postInstall; + passthru = { + inherit ruby; + inherit bundler; + + env = let + irbrc = builtins.toFile "irbrc" '' + if not ENV["OLD_IRBRC"].empty? + require ENV["OLD_IRBRC"] + end + require 'rubygems' + require 'bundler/setup' + ''; + in stdenv.mkDerivation { + name = "interactive-${name}-environment"; + nativeBuildInputs = [ ruby derivation ]; + shellHook = '' + export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile + export GEM_HOME=${derivation}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} + export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME + export OLD_IRBRC="$IRBRC" + export IRBRC=${irbrc} + ''; + buildCommand = '' + echo >&2 "" + echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; - passthru = { - inherit ruby; - inherit bundler; + inherit meta; }; - inherit meta; -} +in derivation diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index fc4546bc09e2..74f0fe2b83a4 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { preCheck = '' rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 + # Test broken on ARM. Fedora disables it. + # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html + echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls + paxmark m shell/js17 paxmark mr jsapi-tests/jsapi-tests ''; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix new file mode 100644 index 000000000000..d1600ee8a8f4 --- /dev/null +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, SDL2, freetype }: + +stdenv.mkDerivation rec { + name = "SDL2_ttf-2.0.12"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + sha256 = "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47"; + }; + + buildInputs = [SDL2 freetype]; + + postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/"; + + meta = { + description = "SDL TrueType library"; + }; +} diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 57df3e7c9153..3006a5a456d2 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; revision = "9"; sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8"; + extraConfigureFlags = "--with-gnump"; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 8d68009390d7..c843a00b8362 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 +, extraConfigureFlags ? "" , ... }: @@ -10,14 +11,17 @@ stdenv.mkDerivation rec { src = fetchurl { name = "Botan-${version}.tgz"; - url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"; + urls = [ + "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz" + "http://botan.randombit.net/releases/Botan-${version}.tgz" + ]; inherit sha256; }; buildInputs = [ python bzip2 zlib gmp openssl boost ]; configurePhase = '' - python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} + python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index cc18b8c63abc..f586d6fd6227 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "13"; - sha256 = "1jg36k376w6d6g7hgs2d67sr84pail5qf6yy1s5ys7pc16k2dy41"; + revision = "15"; + sha256 = "1rkv84v09llbxyvh33szi7zsjm19l02j7h60n9g7jhhc2w667jk0"; openssl = null; }) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix new file mode 100644 index 000000000000..4dce56a8f1ab --- /dev/null +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, eigen +, fetchurl +, cmake +, google-gflags ? null +, glog ? null +, runTests ? false +}: + +# google-gflags is required to run tests +assert runTests -> google-gflags != null; + +let + version = "1.10.0"; + + # glog currently doesn't build on darwin + # Issue: https://code.google.com/p/google-glog/issues/detail?id=121 + useGlog = glog != null && !stdenv.isDarwin; + +in +stdenv.mkDerivation { + name = "ceres-solver-${version}"; + + src = fetchurl { + url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; + sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; + }; + + buildInputs = [ cmake ] + ++ stdenv.lib.optional useGlog glog + ++ stdenv.lib.optional (google-gflags != null) google-gflags; + + inherit eigen; + + doCheck = runTests; + + checkTarget = "test"; + + cmakeFlags = " + -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 + ${if !useGlog then "-DMINIGLOG=ON" else ""} + "; + + meta = with stdenv.lib; { + description = "C++ library for modeling and solving large, complicated optimization problems"; + license = licenses.bsd3; + homepage = "http://ceres-solver.org"; + maintainers = with stdenv.lib.maintainers; [ giogadi ]; + inherit version; + }; +} diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 276f1219444a..3fad256e5728 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "0m3gzv5l7hw3zwhndjjvwmkhh66lvgnk0mspa2s12r1hlzc91zi3"; + sha256 = "0mh3z8ibiwidc6qvrv8bx9slgcycxwy06kfngfzfza6nihrymzl9"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 8c513978cfdb..69ef08b91d90 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zeromq4}: +{ stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { baseName="czmq"; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9"; }; - buildInputs = [ zeromq4 ]; + buildInputs = [ zeromq ]; - meta = { - license = stdenv.lib.licenses.mpl20; + meta = with stdenv.lib; { homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 16a20ec94a4d..00b302bde8d5 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.102"; + name = "dbus-glib-0.104"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "177j5p2vrvpmzk2xrrj6akn73kvpbvnmsjvlmca9l55qbdcfsr39"; + sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f6c42f2136cb..8fc75721c23a 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.8.14"; - sha256 = "06hzrvlpm91c4a4a19bk5pzxvs00fwd7fjd3njd3pjd4lr854hl3"; + version = "1.8.16"; + sha256 = "01rba8mp8kqvmy6ibdmi806kjr3m14swnskqk02gyhykxxl54ybz"; inherit (stdenv) lib; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 54fb0aa49321..81c23f7e41ce 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -4,9 +4,9 @@ let s = rec { - version = "1.7.6"; + version = "1.7.7"; name="directfb-${version}"; - sha256 = "1qf94vgsbcwfa00x2aqd6795n6z43x4ghclmb4sa4bl4zfn2pws4"; + sha256 = "18r7h0pwbyyk8z3pgdv77nmma8lvr1si9gl1ghxgxf1ivhwcd1dp"; url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz"; } ; in diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh deleted file mode 100644 index 6ac1d223b47e..000000000000 --- a/pkgs/development/libraries/eglibc/builder.sh +++ /dev/null @@ -1,63 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - -preConfigure() { - - for i in libc/configure libc/io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # Include source for debugging - mkdir -p $out/src - cp -R libc ports $out/src - ln -s $out/src/ports $out/src/libc/ports - # glibc wants -O2 minimum - export CFLAGS="-pipe -g -O2" - - mkdir $NIX_BUILD_TOP/build - cd $NIX_BUILD_TOP/build - - configureScript=$out/src/libc/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/eglibc/default.nix b/pkgs/development/libraries/eglibc/default.nix deleted file mode 100644 index a27d0f53fbf8..000000000000 --- a/pkgs/development/libraries/eglibc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchsvn, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation rec { - name = "eglibc-2.10"; - - src = fetchsvn { - url = svn://svn.eglibc.org/branches/eglibc-2_10; - rev = 8690; - sha256 = "029hklrx2rlhsb5r2csd0gapjm0rbr8n28ib6jnnhms12x302viq"; - }; - - inherit kernelHeaders installLocales; - - configureFlags = [ - "--with-headers=${kernelHeaders}/include" - "--without-fp" - "--enable-add-ons=libidn,ports,nptl" - "--disable-profile" - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - ]; - - builder = ./builder.sh; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index 556a41e2dca9..bad142f6f96a 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -1,88 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -, dc1394Support ? false, libdc1394 ? null -}: +{ callPackage, ... } @ args: -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-0.10.15"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = with stdenv.lib; { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - branch = "0.10"; - }; -} +callPackage ./generic.nix (args // rec { + version = "${branch}.15"; + branch = "0.10"; + sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; +}) diff --git a/pkgs/development/libraries/ffmpeg/0.11.nix b/pkgs/development/libraries/ffmpeg/0.11.nix new file mode 100644 index 000000000000..abdb26668770 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0.11.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.5"; + branch = "0.11"; + sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll"; +}) diff --git a/pkgs/development/libraries/ffmpeg/0.5.nix b/pkgs/development/libraries/ffmpeg/0.5.nix new file mode 100644 index 000000000000..82e0026ecbe4 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0.5.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.15"; + branch = "0.5"; + sha256 = "1rcy15dv5bnpnncb78kgki9xl279bh99b76nzqdd87b61r04z74z"; +}) diff --git a/pkgs/development/libraries/ffmpeg/0.6.90.nix b/pkgs/development/libraries/ffmpeg/0.6.90.nix deleted file mode 100644 index 7455410d51ac..000000000000 --- a/pkgs/development/libraries/ffmpeg/0.6.90.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-0.6.90-rc0"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - - buildInputs = [ pkgconfig lame yasm ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - broken = true; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/0.6.nix b/pkgs/development/libraries/ffmpeg/0.6.nix deleted file mode 100644 index 79ab5f1c9800..000000000000 --- a/pkgs/development/libraries/ffmpeg/0.6.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-0.6.7"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "13l78gv2qhyw05bl9s6wkmykzsn4p04bb69a849a5c4hiffwz837"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - - buildInputs = [ pkgconfig lame yasm ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - branch = "0.6"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix new file mode 100644 index 000000000000..c87cf581c76c --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/1.2.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.12"; + branch = "1.2"; + sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; +}) diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix deleted file mode 100644 index ae64135a4c3b..000000000000 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, opusSupport ? true, libopus ? null -, vdpauSupport ? true, libvdpau ? null -, vaapiSupport ? true, libva ? null -, faacSupport ? false, faac ? null -, dc1394Support ? false, libdc1394 ? null -, x11grabSupport ? false, libXext ? null, libXfixes ? null -, playSupport ? true, SDL ? null -, freetypeSupport ? true, freetype ? null, fontconfig ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert opusSupport -> libopus != null; -assert vdpauSupport -> libvdpau != null; -assert vaapiSupport -> libva != null; -assert faacSupport -> faac != null; -assert x11grabSupport -> libXext != null && libXfixes != null; -assert playSupport -> SDL != null; -assert freetypeSupport -> freetype != null; - -stdenv.mkDerivation rec { - version = "1.2.10"; - name = "ffmpeg-${version}"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "02wdxr55a68rjxbyrsxczp55z2qmspw8cfa0yd55x3dv82657hnj"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--enable-shared" - "--enable-avresample" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional opusSupport "--enable-libopus" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional playSupport "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional opusSupport libopus - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional vaapiSupport libva - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional playSupport SDL - ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - license = if faacSupport then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.unix; - branch = "1"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix new file mode 100644 index 000000000000..e382fe7154de --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.2.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.13"; + branch = "2.2"; + sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0"; +}) diff --git a/pkgs/development/libraries/ffmpeg/2.2.x.nix b/pkgs/development/libraries/ffmpeg/2.2.x.nix deleted file mode 100644 index d6e3c6a7db9d..000000000000 --- a/pkgs/development/libraries/ffmpeg/2.2.x.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl -, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus -, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL -, freetype, fontconfig, fdk_aac, gnutls -}: - -stdenv.mkDerivation rec { - version = "2.2.12"; - name = "ffmpeg-${version}"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1a1ki0v7c94l68blbimh3xl5adz599ql8nrdm2q0g285qy6mqxck"; - }; - - subtitleSupport = config.ffmpeg.subtitle or true; - mp3Support = config.ffmpeg.mp3 or true; - speexSupport = config.ffmpeg.speex or true; - theoraSupport = config.ffmpeg.theora or true; - vorbisSupport = config.ffmpeg.vorbis or true; - vpxSupport = config.ffmpeg.vpx or true; - x264Support = config.ffmpeg.x264 or true; - xvidSupport = config.ffmpeg.xvid or true; - opusSupport = config.ffmpeg.opus or true; - vdpauSupport = config.ffmpeg.vdpau or true; - vaapiSupport = config.ffmpeg.vaapi or true; - faacSupport = config.ffmpeg.faac or false; - fdkAACSupport = config.ffmpeg.fdk or false; - dc1394Support = config.ffmpeg.dc1394 or false; - x11grabSupport = config.ffmpeg.x11grab or false; - playSupport = config.ffmpeg.play or true; - freetypeSupport = config.ffmpeg.freetype or true; - gnutlsSupport = config.ffmpeg.gnutls or true; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--enable-shared" - "--enable-avresample" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional opusSupport "--enable-libopus" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" - ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" - ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional opusSupport libopus - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional vaapiSupport libva - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL - ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] - ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - branch = "2.2"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/2.5.nix b/pkgs/development/libraries/ffmpeg/2.5.nix new file mode 100644 index 000000000000..dbd5e0e24032 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.5.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.4"; + branch = "2.5"; + sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc"; +}) diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix new file mode 100644 index 000000000000..9e097ddfebb6 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.6.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.1"; + branch = "2.6"; + sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; +}) diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix deleted file mode 100644 index 55747061406c..000000000000 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl -, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus -, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL -, freetype, fontconfig, fdk_aac, gnutls -}: - -stdenv.mkDerivation rec { - version = "2.5.4"; - name = "ffmpeg-${version}"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc"; - }; - - subtitleSupport = config.ffmpeg.subtitle or true; - mp3Support = config.ffmpeg.mp3 or true; - speexSupport = config.ffmpeg.speex or true; - theoraSupport = config.ffmpeg.theora or true; - vorbisSupport = config.ffmpeg.vorbis or true; - vpxSupport = config.ffmpeg.vpx or true; - x264Support = config.ffmpeg.x264 or true; - xvidSupport = config.ffmpeg.xvid or true; - opusSupport = config.ffmpeg.opus or true; - vdpauSupport = config.ffmpeg.vdpau or true; - vaapiSupport = config.ffmpeg.vaapi or true; - faacSupport = config.ffmpeg.faac or false; - fdkAACSupport = config.ffmpeg.fdk or false; - dc1394Support = config.ffmpeg.dc1394 or false; - x11grabSupport = config.ffmpeg.x11grab or false; - playSupport = config.ffmpeg.play or true; - freetypeSupport = config.ffmpeg.freetype or true; - gnutlsSupport = config.ffmpeg.gnutls or true; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--enable-shared" - "--enable-avresample" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional opusSupport "--enable-libopus" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" - ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" - ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional opusSupport libopus - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional vaapiSupport libva - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL - ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] - ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix new file mode 100644 index 000000000000..1a46a0e5386f --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -0,0 +1,527 @@ +{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +/* + * Licensing options (yes some are listed twice, filters and such are not listed) + */ +, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab +, version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc +, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,faac,aacplus,blackmagic-design-desktop-video +/* + * Build options + */ +, smallBuild ? false # Optimize for size instead of speed +, runtime-cpudetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) +, grayBuild ? true # Full grayscale support +, swscale-alphaBuild ? true # Alpha channel support in swscale +, incompatible-libav-abiBuild ? false # Incompatible Libav fork ABI +, hardcoded-tablesBuild ? true # Hardcode decode tables instead of runtime generation +, safe-bitstream-readerBuild ? true # Buffer boundary checking in bitreaders +, memalign-hackBuild ? false # Emulate memalign +, multithreadBuild ? true # Multithreading via pthreads/win32 threads +, networkBuild ? true # Network support +, pixelutilsBuild ? true # Pixel utils in libavutil +/* + * Program options + */ +, ffmpegProgram ? true # Build ffmpeg executable +, ffplayProgram ? true # Build ffplay executable +, ffprobeProgram ? true # Build ffprobe executable +, ffserverProgram ? true # Build ffserver executable +, qt-faststartProgram ? true # Build qt-faststart executable +/* + * Library options + */ +, avcodecLibrary ? true # Build avcodec library +, avdeviceLibrary ? true # Build avdevice library +, avfilterLibrary ? true # Build avfilter library +, avformatLibrary ? true # Build avformat library +, avresampleLibrary ? true # Build avresample library +, avutilLibrary ? true # Build avutil library +, postprocLibrary ? true # Build postproc library +, swresampleLibrary ? true # Build swresample library +, swscaleLibrary ? true # Build swscale library +/* + * Documentation options + */ +, htmlpagesDocumentation ? false # HTML documentation pages +, manpagesDocumentation ? true # Man documentation pages +, podpagesDocumentation ? false # POD documentation pages +, txtpagesDocumentation ? false # Text documentation pages +/* + * External libraries options + */ +#, aacplusExtlib ? false, aacplus ? null # AAC+ encoder +, alsaLib ? null # Alsa in/output support +#, avisynth ? null # Support for reading AviSynth scripts +, bzip2 ? null +, celt ? null # CELT decoder +#, crystalhd ? null # Broadcom CrystalHD hardware acceleration +#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support +, faacExtlib ? false, faac ? null # AAC encoder +, faad2Extlib ? false, faad2 ? null # AAC decoder - DEPRECATED +, fdk-aacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder +#, flite ? null # Flite (voice synthesis) support +, fontconfig ? null # Needed for drawtext filter +, freetype ? null # Needed for drawtext filter +, frei0r ? null # frei0r video filtering +, fribidi ? null # Needed for drawtext filter +, game-music-emu ? null # Game Music Emulator +, gnutls ? null +, gsm ? null # GSM de/encoder +#, ilbc ? null # iLBC de/encoder +, jack2 ? null # Jack audio (only version 2 is supported in this build) +, ladspaH ? null # LADSPA audio filtering +, lame ? null # LAME MP3 encoder +, libass ? null # (Advanced) SubStation Alpha subtitle rendering +, libbluray ? null # BluRay reading +, libbs2b ? null # bs2b DSP library +, libcaca ? null # Textual display (ASCII art) +#, libcdio-paranoia ? null # Audio CD grabbing +, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) +, libiconv ? null +#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) +#, libmfx ? null # Hardware acceleration vis libmfx +, libmodplug ? null # ModPlug support +#, libnut ? null # NUT (de)muxer, native (de)muser exists +, libogg ? null # Ogg container used by vorbis & theora +, libopus ? null # Opus de/encoder +, libsndio ? null # sndio playback/record support +, libssh ? null # SFTP protocol +, libtheora ? null # Theora encoder +, libva ? null # Vaapi hardware acceleration +, libvdpau ? null # Vdpau hardware acceleration +, libvorbis ? null # Vorbis de/encoding, native encoder exists +, libvpx ? null # VP8 & VP9 de/encoding +, libwebp ? null # WebP encoder +, libX11 ? null # Xlib support +, libxcb ? null # X11 grabbing using XCB +, libxcb-shmExtlib ? true # X11 grabbing shm communication +, libxcb-xfixesExtlib ? true # X11 grabbing mouse rendering +, libxcb-shapeExtlib ? true # X11 grabbing shape rendering +, libXv ? null # Xlib support +, lzma ? null # xz-utils +#, nvenc ? null # NVIDIA NVENC support +, openal ? null # OpenAL 1.1 capture support +#, opencl ? null # OpenCL code +#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder +, opencv ? null # Video filtering +, openglExtlib ? false, mesa ? null # OpenGL rendering +#, openh264 ? null # H.264/AVC encoder +, openjpeg_1 ? null # JPEG 2000 de/encoder +, opensslExtlib ? false, openssl ? null +, pulseaudio ? null # Pulseaudio input support +, rtmpdump ? null # RTMP[E] support +#, libquvi ? null # Quvi input support +, sambaExtlib ? false, samba ? null # Samba protocol +#, schroedinger ? null # Dirac de/encoder +, SDL ? null +#, shine ? null # Fixed-point MP3 encoder +, soxr ? null # Resampling via soxr +, speex ? null # Speex de/encoder +#, twolame ? null # MP2 encoder +#, utvideo ? null # Ut Video de/encoder +, v4l_utils ? null # Video 4 Linux support +, vid-stab ? null # Video stabilization +#, vo-aacenc ? null # AAC encoder +#, vo-amrwbenc ? null # AMR-WB encoder +, wavpack ? null # Wavpack encoder +, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy) +, x264 ? null # H.264/AVC encoder +, x265 ? null # H.265/HEVC encoder +, xavs ? null # AVS encoder +, xvidcore ? null # Xvid encoder, native encoder exists +, zeromq4 ? null # Message passing +, zlib ? null +#, zvbi ? null # Teletext support +/* + * Developer options + */ +, debugDeveloper ? false +, optimizationsDeveloper ? true +, extra-warningsDeveloper ? false +, strippingDeveloper ? false +/* + * Inherit generics + */ +, branch, sha256, version, ... +}: + +/* Maintainer notes: + * + * Version bumps: + * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) + * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed + * and make the necessary changes. + * + * En/disabling in/outdevs was added in 0.6 + * + * Packages with errors: + * flite ilbc schroedinger + * + * Not packaged: + * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 + * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame + * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video + * + * Not supported: + * stagehright-h264(android only) + * + * Known issues: + * 0.5 - libgsm: configure fails to find library (fix: disable for 0.5) + * 0.5-0.8 - qt-quickstart: make error (fix: disable for 0.5-0.8) + * 0.6 - fails to compile (unresolved) (so far, only disabling a number of features + * works, but that is not a feasible solution) + * 0.6.90 - mmx: compile errors (fix: disable for 0.6.90-rc0) + * 0.7-1.1 - opencv: compile error, flag added in 0.7 (fix: disable for 0.7-1.1) + * 1.1 - libsoxr: compile error (fix: disable for 1.1) + * Support was initially added in 1.1 before soxr api change, fix would probably be to add soxr-1.0 + * 2.0-2.1 - vid-stab: compile errors, flag added in 2.0 (fix: disable for 2.0-2.1) + * Recent changes (circa 2014) more than likely broke compatibility and a fix has not been back ported + * ALL - flite: configure fails to find library (tested against 1.4 & 1.9 & 2.0) + * Tried modifying configure and flite to use pkg-config + * ALL - Cross-compiling will disable features not present on host OS + * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) + * + */ + +let + # Minimum/maximun/matching version + cmpVer = builtins.compareVersions; + reqMin = requiredVersion: (cmpVer requiredVersion branch != 1); + reqMax = requiredVersion: (cmpVer branch requiredVersion != 1); + reqMatch = requiredVersion: (cmpVer requiredVersion branch == 0); + + # Configure flag + mkFlag = optSet: minVer: flag: if reqMin minVer then ( + if optSet then "--enable-${flag}" else "--disable-${flag}") + else null; + # Deprecated configure flag (e.g. faad2) + depFlag = optSet: minVer: maxVer: flag: if reqMin minVer && reqMax maxVer then mkFlag optSet minVer flag else null; + + # Version specific fix + verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix; + + # Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1) + chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag; + + isCygwin = stdenv.isCygwin; +in + +/* + * Licensing dependencies + */ +assert version3Licensing && reqMin "0.5" -> gplLicensing; +assert nonfreeLicensing && reqMin "0.5" -> gplLicensing && version3Licensing; +/* + * Build dependencies + */ +assert networkBuild -> gnutls != null || opensslExtlib; +assert pixelutilsBuild -> avutilLibrary; +/* + * Program dependencies + */ +assert ffmpegProgram && reqMin "0.5" -> avcodecLibrary + && avfilterLibrary + && avformatLibrary + && swresampleLibrary; +assert ffplayProgram && reqMin "0.5" -> avcodecLibrary + && avformatLibrary + && swscaleLibrary + && swresampleLibrary + && SDL != null; +assert ffprobeProgram && reqMin "0.6" -> avcodecLibrary && avformatLibrary; +assert ffserverProgram && reqMin "0.5" -> avformatLibrary; +/* + * Library dependencies + */ +assert avcodecLibrary && reqMin "0.6" -> avutilLibrary; # configure flag since 0.6 +assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary + && avcodecLibrary + && avutilLibrary; # configure flag since 0.6 +assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 +assert avresampleLibrary && reqMin "0.11" -> avutilLibrary; +assert postprocLibrary && reqMin "0.5" -> gplLicensing && avutilLibrary; +assert swresampleLibrary && reqMin "0.9" -> soxr != null; +assert swscaleLibrary && reqMin "0.5" -> avutilLibrary; +/* + * External libraries + */ +#assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing; +#assert cdio-paranoia != null && reqMin "0.9" -> gplLicensing; +#assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null +# && !isCygwin && multithreadBuild # POSIX threads required +# && nonfreeLicensing; +assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing; +assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && gplLicensing && nonfreeLicensing; +assert frei0r != null && reqMin "0.7" -> gplLicensing; +assert gnutls != null && reqMin "0.9" -> !opensslExtlib; +assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null; +assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null; +assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null; +#assert opencore-amr != null && reqMin "0.5" -> version3Licensing; +assert openglExtlib && reqMin "2.2" -> mesa != null; +assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && gplLicensing && nonfreeLicensing; +assert sambaExtlib && reqMin "2.3" -> samba != null && gplLicensing && version3Licensing; +#assert utvideo != null && reqMin "0.9" -> gplLicensing; +assert vid-stab != null && reqMin "2.0" -> gplLicensing; +#assert vo-aacenc != null && reqMin "0.6" -> version3Licensing; +#assert vo-amrwbenc != null && reqMin "0.7" -> version3Licensing; +assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null && gplLicensing; +assert x264 != null && reqMin "0.5" -> gplLicensing; +assert x265 != null && reqMin "2.2" -> gplLicensing; +assert xavs != null && reqMin "0.7" -> gplLicensing; +assert xvidcore != null && reqMin "0.5" -> gplLicensing; +#assert zvbi != null && reqMin "2.1" -> gplLicensing; + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "ffmpeg-${version}"; + inherit version; + + src = fetchurl { + url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; + inherit sha256; + }; + + patchPhase = ''patchShebangs .''; + + configureFlags = [ + /* + * Licensing flags + */ + (mkFlag gplLicensing "0.5" "gpl") + (mkFlag version3Licensing "0.5" "version3") + (mkFlag nonfreeLicensing "0.5" "nonfree") + /* + * Build flags + */ + # One some ARM platforms --enable-thumb + "--enable-shared --disable-static" + (mkFlag true "0.6" "pic") + (mkFlag smallBuild "0.5" "small") + (mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect") + (mkFlag grayBuild "0.5" "gray") + (mkFlag swscale-alphaBuild "0.6" "swscale-alpha") + (mkFlag incompatible-libav-abiBuild "2.0" "incompatible-libav-abi") + (mkFlag hardcoded-tablesBuild "0.5" "hardcoded-tables") + (mkFlag safe-bitstream-readerBuild "0.9" "safe-bitstream-reader") + (mkFlag memalign-hackBuild "0.5" "memalign-hack") + (if reqMin "0.5" then ( + if multithreadBuild then ( + if isCygwin then + "--disable-pthreads --enable-w32threads" + else # Use POSIX threads by default + "--enable-pthreads --disable-w32threads") + else + "--disable-pthreads --disable-w32threads") + else null) + (if reqMin "0.9" then "--disable-os2threads" else null) # We don't support OS/2 + (mkFlag networkBuild "0.5" "network") + (mkFlag pixelutilsBuild "2.4" "pixelutils") + /* + * Program flags + */ + (mkFlag ffmpegProgram "0.5" "ffmpeg") + (mkFlag ffplayProgram "0.5" "ffplay") + (mkFlag ffprobeProgram "0.6" "ffprobe") + (mkFlag ffserverProgram "0.5" "ffserver") + /* + * Library flags + */ + (mkFlag avcodecLibrary "0.6" "avcodec") + (mkFlag avdeviceLibrary "0.6" "avdevice") + (mkFlag avfilterLibrary "0.5" "avfilter") + (mkFlag avformatLibrary "0.6" "avformat") + (mkFlag avresampleLibrary "1.0" "avresample") + (mkFlag avutilLibrary "1.1" "avutil") + (mkFlag postprocLibrary "0.5" "postproc") + (mkFlag swresampleLibrary "0.9" "swresample") + (mkFlag swscaleLibrary "0.5" "swscale") + /* + * Documentation flags + */ + (mkFlag (htmlpagesDocumentation + || manpagesDocumentation + || podpagesDocumentation + || txtpagesDocumentation) "0.6" "doc") + (mkFlag htmlpagesDocumentation "1.0" "htmlpages") + (mkFlag manpagesDocumentation "1.0" "manpages") + (mkFlag podpagesDocumentation "1.0" "podpages") + (mkFlag txtpagesDocumentation "1.0" "txtpages") + /* + * External libraries + */ + #(mkFlag aacplus "0.7" "libaacplus") + #(mkFlag avisynth "0.5" "avisynth") + (mkFlag (bzip2 != null) "0.5" "bzlib") + (mkFlag (celt != null) "0.8" "libcelt") + #crystalhd + #(mkFlag decklinkExtlib "2.2" "decklink") + (mkFlag faacExtlib "0.5" "libfaac") + (depFlag faad2Extlib "0.5" "0.6" "libfaad") + (mkFlag fdk-aacExtlib "1.0" "libfdk-aac") + #(mkFlag (flite != null) "1.0" "libflite") + (if reqMin "1.0" then # Force disable until a solution is found + "--disable-libflite" + else null) + (mkFlag (fontconfig != null) "1.0" "fontconfig") + (mkFlag (freetype != null) "0.7" "libfreetype") + (mkFlag (frei0r != null) "0.7" "frei0r") + (mkFlag (fribidi != null) "2.3" "libfribidi") + (mkFlag (game-music-emu != null) "2.2" "libgme") + (mkFlag (gnutls != null) "0.9" "gnutls") + (verFix (mkFlag (gsm != null) "0.5" "libgsm") "0.5" "--disable-libgsm") + #(mkFlag (ilbc != null) "1.0" "libilbc") + (mkFlag (ladspaH !=null) "2.1" "ladspa") + (mkFlag (lame != null) "0.5" "libmp3lame") + (mkFlag (libass != null) "0.9" "libass") + #(mkFlag (libavc1394 != null) null null) + (mkFlag (libbluray != null) "1.0" "libbluray") + (mkFlag (libbs2b != null) "2.3" "libbs2b") + (mkFlag (libcaca != null) "1.0" "libcaca") + #(mkFlag (cdio-paranoia != null) "0.9" "libcdio") + (mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394") + (mkFlag (libiconv != null) "1.2" "iconv") + #(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") + #(mkFlag (libmfx != null) "2.6" "libmfx") + (mkFlag (libmodplug != null) "0.9" "libmodplug") + #(mkFlag (libnut != null) "0.5" "libnut") + (mkFlag (libopus != null) "1.0" "libopus") + (mkFlag (libssh != null) "2.1" "libssh") + (mkFlag (libtheora != null) "0.5" "libtheora") + (mkFlag (libva != null) "0.6" "vaapi") + (mkFlag (libvdpau != null) "0.5" "vdpau") + (mkFlag (libvorbis != null) "0.5" "libvorbis") + (mkFlag (libvpx != null) "0.6" "libvpx") + (mkFlag (libwebp != null) "2.2" "libwebp") + (mkFlag (libX11 != null && libXv != null) "2.3" "xlib") + (mkFlag (libxcb != null) "2.5" "libxcb") + (mkFlag libxcb-shmExtlib "2.5" "libxcb-shm") + (mkFlag libxcb-xfixesExtlib "2.5" "libxcb-xfixes") + (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape") + (mkFlag (lzma != null) "2.4" "lzma") + #(mkFlag nvenc "2.6" "nvenc") + (mkFlag (openal != null) "0.9" "openal") + #(mkFlag opencl "2.2" "opencl") + #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrnb") + #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrwb") + (mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 + (mkFlag openglExtlib "2.2" "opengl") + #(mkFlag (openh264 != null) "2.6" "openh264") + (mkFlag (openjpeg_1 != null) "0.5" "libopenjpeg") + (mkFlag opensslExtlib "0.9" "openssl") + (mkFlag (pulseaudio != null) "0.9" "libpulse") + #(mkFlag quvi "2.0" "libquvi") + (mkFlag (rtmpdump != null) "0.6" "librtmp") + #(mkFlag (schroedinger != null) "0.5" "libschroedinger") + #(mkFlag (shine != null) "2.0" "libshine") + (mkFlag sambaExtlib "2.3" "libsmbclient") + (mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then + (mkFlag (soxr != null) "1.2" "libsoxr") + (mkFlag (speex != null) "0.5" "libspeex") + #(mkFlag (twolame != null) "1.0" "libtwolame") + #(mkFlag (utvideo != null) "0.9" "libutvideo") + (mkFlag (v4l_utils != null) "0.9" "libv4l2") + (mkFlag (vid-stab != null) "2.2" "libvidstab") # Actual min. version 2.0 + #(mkFlag (vo-aacenc != null) "0.6" "libvo-aacenc") + #(mkFlag (vo-amrwbenc) "0.7" "libvo-amrwbenc") + (mkFlag (wavpack != null) "2.0" "libwavpack") + (mkFlag (x11grabExtlib) "0.5" "x11grab") + (mkFlag (x264 != null) "0.5" "libx264") + (mkFlag (x265 != null) "2.2" "libx265") + (mkFlag (xavs != null) "0.7" "libxavs") + (mkFlag (xvidcore != null) "0.5" "libxvid") + (mkFlag (zeromq4 != null) "2.0" "libzmq") + (mkFlag (zlib != null) "0.5" "zlib") + #(mkFlag (zvbi != null) "2.1" "libzvbi") + /* + * Developer flags + */ + (mkFlag debugDeveloper "0.5" "debug") + (mkFlag optimizationsDeveloper "0.5" "optimizations") + (mkFlag extra-warningsDeveloper "0.5" "extra-warnings") + (mkFlag strippingDeveloper "0.5" "stripping") + + # Disable mmx support for 0.6.90 + (verFix null "0.6.90" "--disable-mmx") + ]; + + nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; + + buildInputs = [ + alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi + game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b + libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora + libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes + libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump + samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore + zeromq4 zlib + ] ++ optional faacExtlib faac; + + # Build qt-faststart executable + buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; + postInstall = optional (qt-faststartProgram && (reqMin "0.9")) ''cp -a tools/qt-faststart $out/bin/''; + + enableParallelBuilding = true; + + /* Cross-compilation is untested, consider this an outline, more work + needs to be done to portions of the build to get it to work correctly */ + crossAttrs = let + os = '' + if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then + # Probably should look for mingw too + echo "cygwin" + elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then + echo "darwin" + elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then + echo "freebsd" + elif [ "${stdenv.cross.config}" = "*linux*" ] ; then + echo "linux" + elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then + echo "netbsd" + elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then + echo "openbsd" + fi + ''; + in { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=${os}" + "--arch=${stdenv.cross.arch}" + ]; + }; + + /* TODO: In the future more FFmpeg optionals should be added so that packages that + depend on FFmpeg can check to make sure a required feature is enabled. Since + features are version dependent, versioning needs to be handled as well */ + passthru = { + vdpauSupport = libvdpau != null; + }; + + meta = { + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + homepage = http://www.ffmpeg.org/; + longDescription = '' + FFmpeg is the leading multimedia framework, able to decode, encode, transcode, + mux, demux, stream, filter and play pretty much anything that humans and machines + have created. It supports the most obscure ancient formats up to the cutting edge. + No matter if they were designed by some standards committee, the community or + a corporation. + ''; + licenses = ( + if nonfreeLicensing then + licenses.unfreeRedistributable + else if version3Licensing then + licenses.gpl3 + else if gplLicensing then + licenses.gpl2Plus + else + licenses.lgpl21Plus + ); + platforms = platforms.all; + maintainers = with maintainers; [ codyopel fuuzetsu ]; + inherit branch; + }; +} diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 2e3db4c2d73a..f3c9b95d6b47 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4"; src = fetchurl { - url = "https://files.dyne.org/.xsend.php?file=frei0r/releases/${name}.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index b0feb2b60083..579d22ad754a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj}: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }: composableDerivation.composableDerivation {} (fixed: rec { - version = "1.11.1"; + version = "1.11.2"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl"; + sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ]; + buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -26,6 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional + "--with-geos=${geos}/bin/geos-config"# optional ]; meta = { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1dff672b3489..4749e2394b5e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -40,7 +40,7 @@ let ''; ver_maj = "2.42"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "16pqvikrps1fvwwqvk0qi4a13mfg7gw6w5qfhk7bhi8f51jhhgwg"; + sha256 = "1nz7vb549gzkxcpmb7yj9dvg3k8kwwz2kr1aykysj46k5fyixk53"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 81abd4f19d4b..01b60361e8e1 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -13,7 +13,7 @@ cross: let - version = "2.20"; + version = "2.21"; in @@ -127,7 +127,8 @@ stdenv.mkDerivation ({ # I.e. when gcc is compiled with --with-arch=i686, then the # preprocessor symbol `__i686' will be defined to `1'. This causes # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686" + + " -Wno-error=strict-prototypes"; } # Remove the `gccCross' attribute so that the *native* glibc store path @@ -150,7 +151,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; - sha256 = "1g6ysvk15arpi7c1f1fpx5slgfr2k3dqd5xr0yvijajp1m0xxq9p"; + sha256 = "0f4prv4c0fcpi85wv4028wqxn075197gwxhgf0vp571fiw2pi3wd"; }; # Remove absolute paths from `configure' & co.; build out-of-tree. diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index b0a284064731..f60df4a30d67 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -36,6 +36,7 @@ in if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + ln -s libgcc_s.so.1 $out/lib/libgcc_s.so fi ''; diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index 95f537733204..fc14553c3ee0 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -15,13 +15,14 @@ diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 @@ -415,12 +415,12 @@ - $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) + $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) -SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' -CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +PREFIX-FLAGS := -D'PREFIX="$(prefix)"' +CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 + -D'SLIBDIR="$(slibdir)"' + libof-ldconfig = ldconfig -CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) -CFLAGS-cache.c = $(SYSCONF-FLAGS) -CFLAGS-rtld.c = $(SYSCONF-FLAGS) @@ -29,8 +30,8 @@ diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +CFLAGS-cache.c = $(PREFIX-FLAGS) +CFLAGS-rtld.c = $(PREFIX-FLAGS) - CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ - -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) + cpp-srcs-left := $(all-rtld-routines:=.os) + lib := rtld diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h --- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 +++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index b95de7105be4..774193cc06c8 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.25"; + name = "gtk+-2.24.27"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3"; + sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 0b75797b366f..a7ec3a758788 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.37"; + name = "harfbuzz-0.9.38"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "01q22an29ni6b7yaial7l2zq0yyr8dk2230x7n31dbfy88w3npr5"; + sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7"; }; configureFlags = [ diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix new file mode 100644 index 000000000000..fc4b2b47959f --- /dev/null +++ b/pkgs/development/libraries/hiredis/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "hiredis-${version}"; + version = "0.12.1"; + + src = fetchgit { + url = "git://github.com/redis/hiredis"; + rev = "37c06facda57af9bad68f50c18edfa22d6ef76f7"; + sha256 = "1z1rzhh1659g8i5bl78k1i1imlz2prwirhzbkn6j7hvq4mxbf2yz"; + }; + + PREFIX = "\${out}"; + + meta = with stdenv.lib; { + homepage = https://github.com/redis/hiredis; + description = "Minimalistic C client for Redis >= 1.2"; + licenses = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh index bf86d59497e4..83edfe04a653 100644 --- a/pkgs/development/libraries/java/smack/builder.sh +++ b/pkgs/development/libraries/java/smack/builder.sh @@ -1,6 +1,7 @@ source $stdenv/setup +mkdir smack +cd smack tar xfvz $src -cd smack* mkdir -p $out/share/java -cp *.jar $out/share/java +cp smack-*.jar $out/share/java diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index 14b8e1f56336..9d1d8f535336 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "smack-3_2_1"; + name = "smack-3.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz; - sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd"; - }; + url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz; + sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4"; + }; } diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index f64edce7b4c1..795062f12d5f 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -6,16 +6,24 @@ , libsoup }: -stdenv.mkDerivation { - name = "swt-3.7.2-201202080800"; +let metadata = if stdenv.system == "i686-linux" + then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } + else if stdenv.system == "x86_64-linux" + then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } + else { }; +in stdenv.mkDerivation rec { + version = "3.7.2"; + fullVersion = "${version}-201202080800"; + name = "swt-${version}"; + builder = ./builder.sh; # Alas, the Eclipse Project apparently doesn't produce source-only # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; - sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-gtk-linux-${metadata.arch}.zip"; + sha256 = metadata.sha256; }; buildInputs = [unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup]; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix new file mode 100644 index 000000000000..b08f5b7dd762 --- /dev/null +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jemalloc-3.6.0"; + + src = fetchurl { + url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; + sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71"; + }; + + meta = with stdenv.lib; { + homepage = http://www.canonware.com/jemalloc/index.html; + description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix new file mode 100644 index 000000000000..69dfc2175731 --- /dev/null +++ b/pkgs/development/libraries/jsoncpp/1.6.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, python }: + +let + basename = "jsoncpp"; + version = "1.6.0"; +in +stdenv.mkDerivation rec { + name = "${basename}-${version}"; + src = fetchurl { + url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz"; + sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz"; + }; + + nativeBuildInputs = [ cmake python ]; + + meta = { + inherit version; + homepage = https://github.com/open-source-parsers/jsoncpp; + description = "A simple API to manipulate JSON data in C++"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = with stdenv.lib.licenses; [ mit ]; + branch = "1.6"; + }; +} diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 4199becb06d9..13b50286380f 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation { sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; + # gcc 4.8 optimisations break judy. + # http://sourceforge.net/p/judy/mailman/message/31995144/ + preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) '' + configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") + ''; + meta = { homepage = http://judy.sourceforge.net/; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 3b899a91d4ae..b2d59246bc25 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,6 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: + let inherit (builtins.parseDrvName drv.name) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; @@ -26,13 +27,10 @@ let enableParallelBuilding = drv.enableParallelBuilding or true; cmakeFlags = (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" - "-DKDE_DEFAULT_HOME=.kde5" - "-DKDE4_DEFAULT_HOME=.kde" - ] + ++ [ "-DBUILD_TESTING=OFF" ] ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = drv.meta or + meta = { license = with stdenv.lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -40,7 +38,9 @@ let platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; - }; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); + } // (drv.meta or {}); }); renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; @@ -56,8 +56,8 @@ let Qt5DBus = qt5.base; Qt5Gui = qt5.base; Qt5LinguistTools = qt5.tools; - Qt5Qml = qt5.declarative; - Qt5Quick = qt5.quickcontrols; + Qt5Qml = [qt5.declarative qt5.graphicaleffects]; + Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects]; Qt5Script = qt5.script; Qt5Svg = qt5.svg; Qt5WebkitWidgets = qt5.webkit; @@ -69,8 +69,9 @@ let # packages from the nixpkgs collection (with pkgs; { - inherit cmake epoxy; Boost = boost155; + cmake = cmake-3_2; + inherit epoxy; GIF = giflib; GLIB2 = glib; Gpgme = gpgme; @@ -102,18 +103,22 @@ let extra-cmake-modules = { inherit (super.extra-cmake-modules) name src; - propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ]; + propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; cmakeFlags = ["-DBUILD_TESTING=OFF"]; patches = [ ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch ]; - meta = { - license = with stdenv.lib.licenses; [ bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; + meta = + let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in + { + license = with stdenv.lib.licenses; [ bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); + }; }; frameworkintegration = super.frameworkintegration // { diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 49598cfae688..8b7d73462c24 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -2,11 +2,11 @@ gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { - name = "kdevplatform-1.7.0"; + name = "kdevplatform-1.7.1"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.7.0/src/${name}.tar.xz"; - sha256 = "bfd765019511c5c9abc19bc412c75d7abd468f1a077ce4bc471cd6704b9f53f7"; + url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz"; + sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; }; propagatedBuildInputs = [ kdelibs qt4 phonon ]; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index c9dd28cd3964..aeea290bdb28 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -50,4 +50,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; + + passthru.implementation = "heimdal"; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index d4e4a59ec5f6..74d26d2fa032 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -34,4 +34,6 @@ stdenv.mkDerivation (rec { platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; + + passthru.implementation = "krb5"; }) diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0cc875e2656f..0ab24df57bad 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/engla/keybinder/; license = licenses.gpl2Plus; - platform = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 75704848f7f3..581e6e70b711 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Library for registering global key bindings"; homepage = https://github.com/engla/keybinder/; license = licenses.mit; - platform = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.cstrahan ]; }; } diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 4e6dd6d5b028..c5b0c7156207 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "levmar-2.5"; + name = "levmar-2.6"; src = fetchurl { url = "http://www.ics.forth.gr/~lourakis/levmar/${name}.tgz"; - sha256 = "0xcx9fvymr0j5kmfy5cqaa2lxf1c64vv25z2a28w43pkxz1nl3xp"; + sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 0e8dae7bb911..35ffe6d5fa59 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index be3f803cff8e..41a8b391eb32 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; - libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_11 = libavFun "11.2" "52ba52cabe5d86b45ce62f56e11fa7912c6e5083"; + libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; + libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; + libav_11 = libavFun "11.3" "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { @@ -79,10 +79,10 @@ let outputs = [ "out" "tools" ]; + # move avplay to get rid of the SDL dependency in the main output postInstall = '' mkdir -p "$tools/bin" mv "$out/bin/avplay" "$tools/bin" - cp -s "$out"/bin/* "$tools/bin/" ''; doInstallCheck = false; # fails randomly diff --git a/pkgs/development/libraries/libctemplate/2.2.nix b/pkgs/development/libraries/libctemplate/2.2.nix new file mode 100644 index 000000000000..36652f7abc7e --- /dev/null +++ b/pkgs/development/libraries/libctemplate/2.2.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + meta = { + description = "A simple but powerful template language for C++"; + longDescription = '' + CTemplate is a simple but powerful template language for C++. It + emphasizes separating logic from presentation: it is impossible to + embed application logic in this template language. ''; + homepage = http://code.google.com/p/google-ctemplate/; + license = "bsd"; + }; + + pname = "ctemplate"; + version = "2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; + }; +} diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 6f61d9b3cade..542aa3cb340e 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,31 +1,61 @@ -{ stdenv, fetchurl, libdbi, mysql ? null, sqlite ? null }: +{ stdenv, fetchurl, libdbi +, mysql ? null, sqlite ? null, postgresql ? null +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "libdbi-drivers-0.8.3-1"; + name = "libdbi-drivers-0.9.0"; src = fetchurl { url = "mirror://sourceforge/libdbi-drivers/${name}.tar.gz"; - sha256 = "0wng59xnq8jjyp6f3bfjrhjvqrswamrjykdnxq6rqxnfk11r9faa"; + sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql sqlite ]; - - configureFlags = - [ "--disable-docs" - "--enable-libdbi" - "--with-dbi-incdir=${libdbi}/include" - "--with-dbi-libdir=${libdbi}/lib" - ] ++ stdenv.lib.optionals (mysql != null) - [ "--with-mysql" - "--with-mysql-incdir=${mysql}/include/mysql" - "--with-mysql-libdir=${mysql}/lib/mysql" - ] ++ stdenv.lib.optionals (sqlite != null) - [ "--with-sqlite3" - "--with-sqlite3-incdir=${sqlite}/include/sqlite" - "--with-sqlite3-libdir=${sqlite}/lib/sqlite" - ]; + buildInputs = [ libdbi mysql sqlite postgresql ]; + + postPatch = '' + sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; + ''; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-docs" + "--enable-libdbi" + "--with-dbi-incdir=${libdbi}/include" + "--with-dbi-libdir=${libdbi}/lib" + ] ++ optionals (mysql != null) [ + "--with-mysql" + "--with-mysql-incdir=${mysql}/include/mysql" + "--with-mysql-libdir=${mysql}/lib/mysql" + ] ++ optionals (postgresql != null) [ + "--with-pgsql" + "--with-pgsql_incdir=${postgresql}/include" + "--with-pgsql_libdir=${postgresql}/lib" + ] ++ optionals (sqlite != null) [ + "--with-sqlite3" + "--with-sqlite3-incdir=${sqlite}/include/sqlite" + "--with-sqlite3-libdir=${sqlite}/lib/sqlite" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + # Remove the unneeded var/lib directories + rm -rf $out/var + ''; meta = { + homepage = http://libdbi-drivers.sourceforge.net/; description = "Database drivers for libdbi"; + platforms = platforms.all; + license = licenses.lgpl21; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 11bb4965a4e3..4f6b9dd099dd 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdbi-0.8.3"; + name = "libdbi-0.9.0"; src = fetchurl { url = "mirror://sourceforge/libdbi/${name}.tar.gz"; - sha256 = "1qx5d5ikx65k73ir9rf557ri6j99ihsnjqqyznqsf7dvprb1ir3j"; + sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; - configureFlags = "--disable-docs"; - - meta = { + meta = with stdenv.lib; { + homepage = http://libdbi.sourceforge.net/; description = "DB independent interface to DB"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 6cbbddfdba83..abc7dd3af40e 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; } ) ./ftbfs-libpng15.patch + ./il_endian.h.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/pkgs/development/libraries/libdevil/il_endian.h.patch new file mode 100644 index 000000000000..c220e6802fd9 --- /dev/null +++ b/pkgs/development/libraries/libdevil/il_endian.h.patch @@ -0,0 +1,27 @@ +Source: http://sourceforge.net/p/resil/tickets/8/ +--- devil-1.7.8.orig/src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600 ++++ devil-1.7.8/src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600 +@@ -19,9 +19,13 @@ + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ 1 + #endif ++#else ++ #ifndef __LITTLE_ENDIAN__ ++ #define __LITTLE_ENDIAN__ 1 ++ #endif + #endif + +-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ ++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ + || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) + #undef __LITTLE_ENDIAN__ + #define Short(s) iSwapShort(s) +@@ -39,8 +43,6 @@ + #define BigDouble(d) + #else + #undef __BIG_ENDIAN__ +- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler... +- #define __LITTLE_ENDIAN__ + #define Short(s) + #define UShort(s) + #define Int(i) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 12e25b03a7b0..ecc92fce40c9 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.58"; + name = "libdrm-2.4.59"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd"; + sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 271311cf46ca..ad37f9010c5c 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,8 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libestr-0.1.9"; + +stdenv.mkDerivation rec { + name = "libestr-0.1.10"; + src = fetchurl { - url = http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz; - sha256 = "06km9mlw5qq4aa7503l81d0qcghzl0n3lh0z41r1xjpa04nnwb42"; + url = "http://libestr.adiscon.com/files/download/${name}.tar.gz"; + sha256 = "0g3hmh3wxgjbn5g6cgy2l0ja806jd0ayp22bahcds3kmdq95wrdx"; + }; + + meta = with stdenv.lib; { + homepage = http://libestr.adiscon.com/; + description = "some essentials for string handling"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix new file mode 100644 index 000000000000..f909d6d8ff2f --- /dev/null +++ b/pkgs/development/libraries/libevhtp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, openssl, libevent }: + +stdenv.mkDerivation rec { + name = "libevhtp-${version}"; + version = "1.2.10"; + + src = fetchFromGitHub { + owner = "ellzey"; + repo = "libevhtp"; + rev = version; + sha256 = "0z5cxa65zp89vkaj286gp6fpmc5fylr8bmd17g3j1rgc42nysm6a"; + }; + + buildInputs = [ cmake openssl libevent ]; + + buildPhase = "cmake"; + + meta = with stdenv.lib; { + description = "A more flexible replacement for libevent's httpd API"; + homepage = "https://github.com/ellzey/libevhtp"; + license = licenses.bsd3; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index cdcba4756aaa..a1f6716009ee 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -21,14 +21,13 @@ stdenv.mkDerivation rec { dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. - postInstall = - # Install headers in the right place. - '' ln -s${if stdenv.isBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include" - ''; + # Install headers in the right place. + postInstall = '' + ln -s${if (stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) then "" else "r"}v "$out/lib/"libffi*/include "$out/include" + ''; meta = { description = "A foreign function call interface library"; - longDescription = '' The libffi library provides a portable, high level programming interface to various calling conventions. This allows a @@ -43,12 +42,9 @@ stdenv.mkDerivation rec { interface. A layer must exist above libffi that handles type conversions for values passed between the two languages. ''; - homepage = http://sourceware.org/libffi/; - # See http://github.com/atgreen/libffi/blob/master/LICENSE . license = stdenv.lib.licenses.free; - maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 19c2d2a6b800..078a2ab0733a 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -13,7 +13,7 @@ let sourceInfo = rec { method="fetchgit"; baseName="libfixposix"; - url="git://gitorious.org/${baseName}/${baseName}"; + url="https://github.com/sionescu/libfixposix"; rev="30b75609d858588ea00b427015940351896867e9"; version="git-${rev}"; name="${baseName}-${version}"; diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index e468c3163d3c..39160675a2a8 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }: stdenv.mkDerivation rec { - name = "libgcrypt-1.6.2"; + name = "libgcrypt-1.6.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c"; + sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21"; }; nativeBuildInputs = [ transfig ghostscript texinfo ]; @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { doCheck = true; - # For some reason the tests don't find `libgpg-error.so'. - checkPhase = '' - LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \ - make check - ''; - crossAttrs = let isCross64 = stdenv.cross.config == "x86_64-w64-mingw32"; in stdenv.lib.optionalAttrs isCross64 { diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 8f41f24cae4a..586d48a8daa7 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libgpg-error-1.17"; + name = "libgpg-error-1.18"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1dapxzxl1naghf342fwfc2w2f2c5hb9gr1a1s4n8dsqn26kybx1z"; + sha256 = "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 27e1c6adc008..313934c66574 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = with platforms; linux; + hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index eb617ed6b9e9..5d120f61e086 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,40 +1,18 @@ -{ stdenv, fetchurl, zlib, libpng, patchutils }: +{ stdenv, fetchzip, cmake, zlib, libpng }: stdenv.mkDerivation { - name = "libharu-2.2.1"; + name = "libharu-2.3.0"; - src = fetchurl { - url = http://libharu.org/files/libharu-2.2.1.tar.bz2; - sha256 = "04493rjb4z8f04p3kjvnya8phg4b0vzy3mbdbp8jfy0dhvqg4h4j"; + src = fetchzip { + url = https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz; + sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; - configureFlags = "--with-zlib=${zlib} --with-png=${libpng}"; - - buildInputs = [ zlib libpng ]; - - patches = - [ (stdenv.mkDerivation { - name = "linpng15.patch"; - - src = fetchurl { - url = https://github.com/libharu/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff; - sha256 = "07k2x5d4pvpf8a5hvfb9pj0dpjgcvv8sdvxwx3wzbwqsf9swwrxb"; - }; - - nativeBuildInputs = [ patchutils ]; - - buildCommand = "filterdiff -x '*/CHANGES' $src > $out"; - }) - (fetchurl { - url = https://github.com/libharu/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff; - name = "endless-loop.patch"; - sha256 = "1jrajz6zdch2pyzjkhmhm1b6ms8dk62snps7fwphnpvndrm4h4rr"; - }) - ]; + buildInputs = [ zlib libpng cmake ]; meta = { description = "Cross platform, open source library for generating PDF files"; - homepage = http://libharu.org/wiki/Main_Page; + homepage = http://libharu.org/; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 1a39e0941535..ad0fa8589f34 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -11,10 +11,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.5.5"; + name = "libinfinity-0.6.5"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1i4cnwbvfv56m7zyyf9wki2bj000r8md414yv3cf1jdz4jbyxij7"; + sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 52b88244fd9a..a57ff0bb7378 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,20 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }: +{ stdenv, fetchurl, pkgconfig +, libevdev, mtdev, udev +, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation +, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support +, testsSupport ? false, check ? null, valgrind ? null +}: +assert documentationSupport -> doxygen != null && graphviz != null; +assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; +assert testsSupport -> check != null && valgrind != null; + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-0.10.0"; + name = "libinput-0.11.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0h8lbhhxb5020bhdblxp1pkapy4bchjj3l44fxabz9pi1zw03q2c"; + sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j"; }; - buildInputs = [ pkgconfig mtdev udev libevdev ]; + configureFlags = [ + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "event-gui") + (mkFlag testsSupport "tests") + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libevdev mtdev udev ] + ++ optionals eventGUISupport [ cairo glib gtk3 ] + ++ optionals documentationSupport [ doxygen graphviz ] + ++ optionals testsSupport [ check valgrind ]; - meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/libinput; - description = "handles input devices in Wayland compositors and to provide a generic X.Org input driver"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ wkennington ]; + meta = { + description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; + homepage = http://www.freedesktop.org/wiki/Software/libinput; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ codyopel wkennington ]; }; } diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 7a754a28e3d1..aa75acb7d6d3 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,18 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, systemd }: +{ stdenv, fetchurl, pkgconfig +, systemd ? null +}: stdenv.mkDerivation rec { - name = "liblogging-1.0.4"; + name = "liblogging-1.0.5"; src = fetchurl { url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; - sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc"; + sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; }; buildInputs = [ pkgconfig systemd ]; - meta = { + configureFlags = [ + "--enable-rfc3195" + "--enable-stdlog" + (if systemd != null then "--enable-journal" else "--disable-journal") + "--enable-man-pages" + ]; + + meta = with stdenv.lib; { + homepage = http://www.liblogging.org/; description = "Lightweight signal-safe logging library"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix new file mode 100644 index 000000000000..f9095be8425f --- /dev/null +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre }: + +stdenv.mkDerivation rec { + name = "liblognorm-1.1.1"; + + src = fetchurl { + url = "http://www.liblognorm.com/files/download/${name}.tar.gz"; + sha256 = "1wi28n5ahajvl64wfn7jpvnskccd6837i0cyq8w8cvrm362b6pd7"; + }; + + buildInputs = [ pkgconfig libestr json_c pcre ]; + + configureFlags = [ "--enable-regexp" ]; + + meta = with stdenv.lib; { + homepage = http://www.liblognorm.com/; + description = "help to make sense out of syslog data, or, actually, any event data that is present in text form"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix new file mode 100644 index 000000000000..4cbc51ea6786 --- /dev/null +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "libmongo-client-0.1.8"; + + src = fetchFromGitHub { + owner = "algernon"; + repo = "libmongo-client"; + rev = name; + sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; + }; + + buildInputs = [ autoreconfHook pkgconfig ]; + propagatedBuildInputs = [ glib ]; + + postPatch = '' + # Fix when uses glib in public headers + sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in + ''; + + meta = with stdenv.lib; { + homepage = http://algernon.github.io/libmongo-client/; + description = "An alternative C driver for MongoDB"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch index 84377962d7f1..84377962d7f1 100644 --- a/pkgs/development/libraries/libmsgpack/CMakeLists.patch +++ b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch diff --git a/pkgs/development/libraries/libmsgpack/0.5.nix b/pkgs/development/libraries/libmsgpack/0.5.nix new file mode 100644 index 000000000000..4f14dcd8b131 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/0.5.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "0.5.9"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "19cmlxfr0sc2b08a1mq9plk9fj5l1i20f69j4pvbhlnah3xqfdjs"; + }; + + patches = [ ./0.5-CMake.patch ]; +}) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index d9f4bfcc7508..4bec67f85131 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,22 +1,12 @@ -{ stdenv, fetchurl, cmake}: +{ callPackage, fetchFromGitHub, ... } @ args: -stdenv.mkDerivation rec { - version = "0.5.9"; - name = "libmsgpack-${version}"; +callPackage ./generic.nix (args // rec { + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"; - sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq"; + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; }; - - buildInputs = [ cmake ]; - patches = [ ./CMakeLists.patch ]; - - meta = with stdenv.lib; { - description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; - maintainers = [ maintainers.redbaron ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} +}) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix new file mode 100644 index 000000000000..72943c098ba1 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -0,0 +1,20 @@ +{ stdenv, cmake +, version, src, patches ? [ ] +, ... +}: + +stdenv.mkDerivation rec { + name = "libmsgpack-${version}"; + + inherit src patches; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = with maintainers; [ redbaron wkennington ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 783739dda717..1e445b20f682 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { name = "libnet-${version}"; - version = "1.2-rc2"; + version = "1.2-rc3"; src = fetchurl { url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; - sha256 = "1pc74p839a7wvhjdgy0scj7c4yarr6mqdqvj56k6sp8pkc763az7"; + sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix new file mode 100644 index 000000000000..6ff5d8167760 --- /dev/null +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, protobuf}: + +stdenv.mkDerivation rec { + name = "libosmpbf-1.3.3"; + + src = fetchurl { + url = "https://github.com/scrosby/OSM-binary/archive/v1.3.3.tar.gz"; + sha256 = "a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798"; + }; + + buildInputs = [ protobuf ]; + + sourceRoot = "OSM-binary-1.3.3/src"; + + installFlags = "PREFIX=$(out)"; + + meta = { + homepage = https://github.com/scrosby/OSM-binary; + description = "C library to read and write OpenStreetMap PBF files."; + license = stdenv.lib.licenses.lgpl3; + }; +} diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix new file mode 100644 index 000000000000..626b5220ebf4 --- /dev/null +++ b/pkgs/development/libraries/librelp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: + +stdenv.mkDerivation rec { + name = "librelp-1.2.7"; + + src = fetchurl { + url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; + sha256 = "1lfpd06cchi1mhlxwq0xhmbx42b8isx9677v9h80c9vpf4f4lhrs"; + }; + + buildInputs = [ pkgconfig gnutls zlib ]; + + meta = with stdenv.lib; { + homepage = http://www.librelp.com/; + description = "a reliable logging library"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index c35f0a7efe55..aa138613ec4c 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0z2g609526pc8zmz2frkmhlfgvn8cmj5agj5yq5b33s0f44kfbzb"; + sha256 = "1fy3x5idx5mnncbzhsw1ahwnh7ram4d05ksz0ipf5x6p7y8pj8x8"; }; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 4e85e6d597a8..cabdd1385d74 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; }; - doCheck = true; + # https://github.com/NixOS/nixpkgs/issues/6028 + doCheck = false; meta = { homepage = http://www.gnu.org/software/libsigsegv/; diff --git a/pkgs/development/libraries/libsoup/bad-symbol.patch b/pkgs/development/libraries/libsoup/bad-symbol.patch new file mode 100644 index 000000000000..df1b0af0c69b --- /dev/null +++ b/pkgs/development/libraries/libsoup/bad-symbol.patch @@ -0,0 +1,10 @@ +--- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700 ++++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700 +@@ -348,7 +348,6 @@ + soup_server_get_async_context + soup_server_get_listener + soup_server_get_listeners +-soup_server_get_gsocket + soup_server_get_port + soup_server_get_type + soup_server_get_uris diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 7f655d274919..82629ca3c6fa 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { patchPhase = '' patchShebangs libsoup/ + patch -p1 < ${./bad-symbol.patch} ''; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix new file mode 100644 index 000000000000..4316b2dda6b9 --- /dev/null +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }: + +stdenv.mkDerivation rec { + name = "libtermkey-${version}"; + + version = "0.17"; + + src = fetchzip { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; + sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildInputs = [ libtool pkgconfig ncurses ]; + + meta = with lib; { + description = "Terminal keypress reading library"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 09d2e9dfc43c..ae1f0e414487 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.1.9"; + name = "libvirt-glib-0.2.0"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5"; + sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8bd4866cb21c..9c9bf40b8e81 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng -, dnsmasq, libnl, libpcap -, pythonPackages +, dnsmasq, libnl, libpcap, libxslt, xhtml1 +, pythonPackages, perlPackages }: -let version = "1.2.9"; in +let version = "1.2.12"; in assert version == pythonPackages.libvirt.version; @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm"; + sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg"; }; buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper - libcap_ng libnl + libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath ]; preConfigure = '' diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index b831fd9bdd33..dc2f0338b483 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "An abstraction library for audio visualisations"; homepage = "http://sourceforge.net/projects/libvisual/"; license = stdenv.lib.licenses.lgpl21Plus; - platform = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix new file mode 100644 index 000000000000..f2a903a21da7 --- /dev/null +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: + +let version = "3.5.0.31"; in +stdenv.mkDerivation { + name = "libxcomp-${version}"; + + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11"; + }; + + meta = with stdenv.lib; { + description = "NX compression library"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ]; + + preConfigure = '' + cd nxcomp/ + autoconf + ''; + + enableParallelBuilding = true; + + postInstall = '' + mkdir $out/lib + cp libXcomp.so* $out/lib + mkdir $out/include + cp NX.h $out/include + ''; +} diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 71c641770e49..46d38b16ccf1 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; # For the x86_64 GNU/Linux arch to be recognized by 'configure' - preConfigure = "cp ${libtool}/share/libtool/config/config.sub ."; + preConfigure = "cp ${libtool}/share/libtool/build-aux/config.sub ."; meta = { description = "Library for rasterizing 2-D vector graphics"; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 9d71c33cb305..8d3dd65adbf3 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libyubikey-1.12"; + name = "libyubikey-1.13"; src = fetchurl { url = "https://developers.yubico.com/yubico-c/Releases/${name}.tar.gz"; - sha256 = "1f0plzmr1gwry4rfgq9q70v6qwqny009hac289ad5m6sj7vqflxr"; + sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 278eb8e9e523..d84e0219294d 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }: stdenv.mkDerivation rec { - name = "lirc-0.9.1a"; + name = "lirc-0.9.2a"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r"; + sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim"; }; - patches = [ - (fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc"; - sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh"; - }) - ]; + patchPhase = '' + sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py + ''; preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man ]; + buildInputs = [ alsaLib help2man pkgconfig x11 python3 ]; configureFlags = [ "--with-driver=devinput" diff --git a/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch b/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch new file mode 100644 index 000000000000..7ac495777b54 --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_boost_1.57_fix.patch @@ -0,0 +1,23 @@ +diff --git a/luabind/object.hpp b/luabind/object.hpp +index f7b7ca5..1c18e04 100644 +--- a/luabind/object.hpp ++++ b/luabind/object.hpp +@@ -536,6 +536,8 @@ namespace detail + handle m_key; + }; + ++#if BOOST_VERSION < 105700 ++ + // Needed because of some strange ADL issues. + + #define LUABIND_OPERATOR_ADL_WKND(op) \ +@@ -557,7 +559,8 @@ namespace detail + LUABIND_OPERATOR_ADL_WKND(!=) + + #undef LUABIND_OPERATOR_ADL_WKND +- ++ ++#endif // BOOST_VERSION < 105700 + } // namespace detail + + namespace adl diff --git a/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch new file mode 100644 index 000000000000..6e5fe6aa6f82 --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_discover_luajit.patch @@ -0,0 +1,22 @@ +diff --git a/Jamroot b/Jamroot +index 94494bf..83dfcbb 100755 +--- a/Jamroot ++++ b/Jamroot +@@ -64,7 +64,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD + $(LUA_PATH) $(HOME)/Library/Frameworks /Library/Frameworks /usr /usr/local /opt/local /opt ; + + local possible-suffixes = +- include/lua5.1 include/lua51 include/lua include ; ++ include/lua5.1 include/lua51 include/lua include include/luajit-2.0 ; + + local includes = [ GLOB $(possible-prefixes)/$(possible-suffixes) : lua.h ] ; + +@@ -83,7 +83,7 @@ else if [ os.name ] in LINUX MACOSX FREEBSD + + local lib = $(prefix)/lib ; + +- local names = liblua5.1 liblua51 liblua ; ++ local names = liblua5.1 liblua51 liblua libluajit-5.1 ; + local extensions = .a .so ; + + library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) : diff --git a/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch b/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch new file mode 100644 index 000000000000..92e32828a03c --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1_modern_boost_fix.patch @@ -0,0 +1,59 @@ +diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp +index 1b45ec1..8f5afff 100644 +--- luabind-0.9.1/luabind/detail/call_function.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp +@@ -323,7 +323,8 @@ namespace luabind + + #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -440,4 +441,5 @@ namespace luabind + + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp +index de8d563..e63555b 100644 +--- luabind-0.9.1/luabind/detail/call_member.hpp ++++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp +@@ -316,7 +316,8 @@ namespace luabind + + #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -360,4 +361,5 @@ namespace luabind + #undef LUABIND_TUPLE_PARAMS + + #endif ++#endif + +diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp +index d54c668..0f88cc5 100755 +--- luabind-0.9.1/luabind/wrapper_base.hpp ++++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp +@@ -89,7 +89,8 @@ namespace luabind + + #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED + +-#elif BOOST_PP_ITERATION_FLAGS() == 1 ++#else ++#if BOOST_PP_ITERATION_FLAGS() == 1 + + #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * + #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n +@@ -188,3 +189,4 @@ namespace luabind + #undef N + + #endif ++#endif diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix new file mode 100644 index 000000000000..edb914123e17 --- /dev/null +++ b/pkgs/development/libraries/luabind/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, boost-build, lua, boost}: + +stdenv.mkDerivation rec { + name = "luabind-0.9.1"; + + src = fetchurl { + url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz"; + sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; + }; + + patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ]; + + buildInputs = [ boost-build lua boost ]; + + propagatedBuildInputs = [ lua ]; + + buildPhase = "LUA_PATH=${lua} bjam release"; + + installPhase = "LUA_PATH=${lua} bjam --prefix=$out release install"; + + passthru = { + inherit lua; + }; + + meta = { + homepage = https://github.com/luabind/luabind; + description = "Luabind is a library that helps you create bindings between C++ and Lua."; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d562b2364d4b..875dabc37342 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -15,16 +15,15 @@ else - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) and are designed to be the buildInput of other packages. - - DRI and EGL drivers are compiled into $drivers output, - which is much bigger and depends on LLVM. - These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*" - and so are kind-of impure (given by NixOS). + - DRI drivers are compiled into $drivers output, which is much bigger and + depends on LLVM. These should be searched at runtime in + "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) - libOSMesa is in $osmesa (~4 MB) */ let - version = "10.2.9"; + version = "10.4.5"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -38,46 +37,35 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/MesaLib-${version}.tar.bz2" "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2" ]; - sha256 = "f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d"; + sha256 = "bf60000700a9d58e3aca2bfeee7e781053b0d839e61a95b1883e05a2dee247a0"; }; prePatch = "patchShebangs ."; patches = [ - ./static-gallium.patch ./glx_ro_text_segm.patch # fix for grsecurity/PaX # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog - (fetchpatch { - name = "fix-lp_test_arit.diff"; - url = "http://cgit.freedesktop.org/mesa/mesa/patch/" - + "?id=8148a06b8fdb734f7f9a11ce787ee6505939fdaa"; - sha256 = "0k2bnl7d28nx2y88jchw6jj4f3xfdjjvz4vpvhc40060c2iz8fla"; - }) ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; inherit udev; }); - # Change the search path for EGL drivers from $drivers/* to driverLink postPatch = '' - sed '/D_EGL_DRIVER_SEARCH_DIR=/s,EGL_DRIVER_INSTALL_DIR,${driverLink}/lib/egl,' \ - -i src/egl/main/Makefile.am - '' + /* work around RTTI LLVM problems */ '' - patch -R -p1 < ${./rtti.patch} + substituteInPlace src/egl/main/egldriver.c \ + --replace _EGL_DRIVER_SEARCH_DIR '"${driverLink}"' ''; outputs = ["out" "drivers" "osmesa"]; configureFlags = [ "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-egl-driver-dir=$(drivers)/lib/egl" "--with-dri-searchpath=${driverLink}/lib/dri" "--enable-dri" "--enable-glx-tls" - "--enable-shared-glapi" "--enable-shared-gallium" + "--enable-shared-glapi" "--enable-driglx-direct" # seems enabled anyway "--enable-gallium-llvm" "--enable-llvm-shared-libs" "--enable-xa" # used in vmware driver @@ -112,7 +100,7 @@ stdenv.mkDerivation { ; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big @@ -178,6 +166,6 @@ stdenv.mkDerivation { homepage = http://www.mesa3d.org/; license = "bsd"; platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ simons vcunat ]; + maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/mesa/rtti.patch b/pkgs/development/libraries/mesa/rtti.patch deleted file mode 100644 index 6b123139013d..000000000000 --- a/pkgs/development/libraries/mesa/rtti.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://lists.freedesktop.org/archives/mesa-dev/2013-October/046311.html - -* As discussed on the mailing list, - forced no-rtti breaks C++ public - API's such as the Haiku C++ libGL.so -* -fno-rtti *can* be still set however - instead of blindly forcing -fno-rtti, - we can rely on the llvm-config - --cppflags output. - If the system llvm is built without - rtti (default), the no-rtti flag will be - present in llvm-config --cppflags - (which we pick up on) - If llvm is built with rtti - (REQUIRES_RTTI=1), then -fno-rtti is - removed from llvm-config --cppflags. -* We could selectively add / remove rtti - from various components, however mixing - rtti and non-rtti code is tricky and - could introduce bugs. -* This needs impact tested. ---- - configure.ac | 1 - - scons/llvm.py | 3 --- - src/gallium/auxiliary/Makefile.am | 6 ------ - 3 files changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0d082d2..3335575 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1943,7 +1943,6 @@ AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes) - AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes) - AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) - AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1) --AM_CONDITIONAL(LLVM_NEEDS_FNORTTI, test $LLVM_VERSION_INT -ge 302) - - AC_SUBST([ELF_LIB]) - -diff --git a/scons/llvm.py b/scons/llvm.py -index 7cd609c..c1c3736 100644 ---- a/scons/llvm.py -+++ b/scons/llvm.py -@@ -195,9 +195,6 @@ def generate(env): - if llvm_version >= distutils.version.LooseVersion('3.1'): - components.append('mcjit') - -- if llvm_version >= distutils.version.LooseVersion('3.2'): -- env.Append(CXXFLAGS = ('-fno-rtti',)) -- - env.ParseConfig('llvm-config --libs ' + ' '.join(components)) - env.ParseConfig('llvm-config --ldflags') - except OSError: -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index 670e124..2d2d8d4 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -25,12 +25,6 @@ AM_CXXFLAGS += \ - $(GALLIUM_CFLAGS) \ - $(LLVM_CXXFLAGS) - --if LLVM_NEEDS_FNORTTI -- --AM_CXXFLAGS += -fno-rtti -- --endif -- - libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) --- -1.8.4 diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch deleted file mode 100644 index bb3f60eaf88a..000000000000 --- a/pkgs/development/libraries/mesa/static-gallium.patch +++ /dev/null @@ -1,64 +0,0 @@ -117-static-gallium.patch from Ubuntu Trusty - -diff --git a/configure.ac b/configure.ac -index b9fcb0b..be89843 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -747,6 +747,19 @@ if test "x$enable_shared_glapi" = xyes; then - fi - AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) - -+AC_ARG_ENABLE([shared-gallium], -+ [AS_HELP_STRING([--enable-shared-gallium], -+ [Enable shared gallium core @<:@default=yes@:>@])], -+ [enable_shared_gallium="$enableval"], -+ [enable_shared_gallium=yes]) -+ -+SHARED_GALLIUM="0" -+if test "x$enable_shared_gallium" = xyes; then -+ SHARED_GALLIUM="1" -+fi -+AC_SUBST([SHARED_GALLIUM]) -+AM_CONDITIONAL(HAVE_SHARED_GALLIUM, test $SHARED_GALLIUM = 1) -+ - dnl - dnl Driver specific build directories - dnl -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index f14279b..3cdec83 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -3,14 +3,19 @@ AUTOMAKE_OPTIONS = subdir-objects - include Makefile.sources - include $(top_srcdir)/src/gallium/Automake.inc - --noinst_LTLIBRARIES = libgallium.la -- - AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/auxiliary/util \ -- $(GALLIUM_CFLAGS) \ -- $(VISIBILITY_CFLAGS) -+ $(GALLIUM_CFLAGS) - --AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -+AM_CXXFLAGS = -+ -+if HAVE_SHARED_GALLIUM -+lib_LTLIBRARIES = libgallium.la -+else -+noinst_LTLIBRARIES = libgallium.la -+AM_CFLAGS += $(VISIBILITY_CFLAGS) -+AM_CXXFLAGS += $(VISIBILITY_CXXFLAGS) -+endif - - libgallium_la_SOURCES = \ - $(C_SOURCES) \ -@@ -29,6 +34,8 @@ if LLVM_NEEDS_FNORTTI - - AM_CXXFLAGS += -fno-rtti - -+libgallium_la_LIBADD = $(LLVM_LIBS) -+ - endif - - libgallium_la_SOURCES += \ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 51656f7ac426..a9c7d51923b5 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.17.3"; + version = "3.17.4"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${name}.tar.gz"; - sha256 = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz"; + sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix new file mode 100644 index 000000000000..b0595e61e65d --- /dev/null +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "nss_wrapper-1.0.3"; + + src = fetchgit { + url = "git://git.samba.org/nss_wrapper.git"; + rev = "refs/tags/${name}"; + sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw"; + }; + + buildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "A wrapper for the user, group and hosts NSS API"; + homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary"; + license = licenses.bsd3; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 7cc47a30eb70..b0ef9e83242a 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -2,10 +2,10 @@ ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.5.4"; + name = "opencascade-6.5.5"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; - sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + url = http://files.opencascade.com/OCCT/OCC_6.5.5_release/OpenCASCADE655.tgz; + sha256 = "1dnik00adfh6dxvn9kgf35yjda8chbi05f71i9119idmmrcapipm"; }; buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { # -fpermissive helps building opencascade, although gcc detects a flaw in the code # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; + NIX_CFLAGS_COMPILE = "-fpermissive" + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + + " -DGLX_GLXEXT_LEGACY"; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 1ce38ab7b3cf..ec15d9d631e6 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix index 480664a0d4d3..4988ee6ef240 100644 --- a/pkgs/development/libraries/opencascade/oce.nix +++ b/pkgs/development/libraries/opencascade/oce.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" ''; + # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index a0f7f88e8dcf..aafdd60e415f 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,21 +1,41 @@ -{stdenv, fetchurl, libtool, pcsclite, libusb, pkgconfig}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb +, doxygen, libxslt +}: stdenv.mkDerivation rec { - name = "openct-0.6.19"; + name = "openct-${version}"; + version = "0.6.20"; - src = fetchurl { - url = "http://www.opensc-project.org/files/openct/${name}.tar.gz"; - sha256 = "1y4jlr877g3lziq7i3p6pdkscqpkn1lld874q6r2hsvc39n7c88z"; + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "openct"; + rev = name; + sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2"; }; + + postPatch = '' + sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am + ''; - configureFlags = [ "--enable-usb" "--enable-pcsc" "--localstatedir=/var" ]; - buildInputs = [ libtool pcsclite libusb pkgconfig ]; + configureFlags = [ + "--enable-api-doc" + "--enable-usb" + "--enable-pcsc" + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; + + buildInputs = [ autoreconfHook pkgconfig pcsclite libusb doxygen libxslt ]; + + preInstall = '' + mkdir -p $out/etc + ''; - meta = { - homepage = http://www.opensc-project.org/openct/; - license = "LGPL"; + meta = with stdenv.lib; { + homepage = https://github.com/OpenSC/openct/; + license = licenses.lgpl21; description = "Drivers for several smart card readers"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with maintainers; [ viric wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix new file mode 100644 index 000000000000..14886f021421 --- /dev/null +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.2"; + branch = "1.5"; + src = fetchurl { + url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz"; + sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; + }; +}) diff --git a/pkgs/development/libraries/openjpeg/2.0.1.nix b/pkgs/development/libraries/openjpeg/2.0.1.nix new file mode 100644 index 000000000000..25575450b477 --- /dev/null +++ b/pkgs/development/libraries/openjpeg/2.0.1.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.0.1"; + branch = "2"; + src = fetchurl { + url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz"; + sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"; + }; +}) diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix new file mode 100644 index 000000000000..7e48b656ae28 --- /dev/null +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.0"; + branch = "2.1"; + src = fetchurl { + url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz"; + sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"; + }; +}) diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix deleted file mode 100644 index 7f23929efb08..000000000000 --- a/pkgs/development/libraries/openjpeg/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, cmake, glib/*passthru only*/ }: - -stdenv.mkDerivation rec { - name = "openjpeg-2.0.0"; - passthru = { - incDir = "openjpeg-2.0"; - }; - - src = fetchurl { - url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; - sha1 = "0af78ab2283b43421458f80373422d8029a9f7a7"; - }; - - buildInputs = [ cmake ]; - nativebuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway - - postInstall = glib.flattenInclude + '' - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/libopenjp2.pc" <<EOF - prefix=$out - libdir=$out/lib - includedir=$out/include - - Name: openjp2 - Description: JPEG2000 library (Part 1 and 2) - URL: http://www.openjpeg.org/ - Version: @OPENJPEG_VERSION@ - Libs: -L$out/lib -lopenjp2 - Cflags: -I$out/include - EOF - ''; - - meta = { - homepage = http://www.openjpeg.org/; - description = "Open-source JPEG 2000 codec written in C language"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix new file mode 100644 index 000000000000..a635f68839b7 --- /dev/null +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -0,0 +1,83 @@ +{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ +, sharedLibsSupport ? true # Build shared libraries +, codecSupport ? true # Codec executables +, mj2Support ? true # MJ2 executables +, jpwlLibSupport ? true # JPWL library & executables +, jpipLibSupport ? true # JPIP library & executables +, jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server +#, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable +, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java) +, jp3dSupport ? true # # JP3D comp +, thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build +, testsSupport ? false +# Inherit generics +, branch, src, version, ... +}: + +assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null)); +#assert opjViewerSupport -> (wxGTK != null); +assert openjpegJarSupport -> (jdk != null); +assert testsSupport -> codecSupport; + +let + mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "openjpeg-${version}"; + inherit branch; + inherit version; + inherit src; + + cmakeFlags = [ + (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS") + (mkFlag codecSupport "BUILD_CODEC") + (mkFlag mj2Support "BUILD_MJ2") + (mkFlag jpwlLibSupport "BUILD_JPWL") + (mkFlag jpipLibSupport "BUILD_JPIP") + (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") + #(mkFlag opjViewerSupport "BUILD_VIEWER") + (mkFlag openjpegJarSupport "BUILD_JAVA") + (mkFlag jp3dSupport "BUILD_JP3D") + (mkFlag thirdPartySupport "BUILD_THIRDPARTY") + (mkFlag testsSupport "BUILD_TESTING") + ]; + + nativebuildInputs = [ pkgconfig ]; + + buildInputs = [ cmake ] + ++ optionals jpipServerSupport [ curl fcgi ] + #++ optional opjViewerSupport wxGTK + ++ optional openjpegJarSupport jdk; + + propagatedBuildInputs = [ libpng libtiff lcms2 ]; + + postInstall = glib.flattenInclude + '' + mkdir -p "$out/lib/pkgconfig" + cat > "$out/lib/pkgconfig/libopenjp2.pc" <<EOF + prefix=$out + libdir=$out/lib + includedir=$out/include + + Name: openjp2 + Description: JPEG2000 library (Part 1 and 2) + URL: http://www.openjpeg.org/ + Version: @OPENJPEG_VERSION@ + Libs: -L$out/lib -lopenjp2 + Cflags: -I$out/include + EOF + ''; + + passthru = { + incDir = "openjpeg-${branch}"; + }; + + meta = { + description = "Open-source JPEG 2000 codec written in C language"; + homepage = http://www.openjpeg.org/; + license = licenses.bsd2; + maintainer = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 01993fa1cd87..9be9f8386326 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,7 +2,8 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 - , curl, a52dec, faad2, gdk_pixbuf + , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL + , qt4, poppler, librsvg, gtk , ...}: builderDefsPackage (a : @@ -14,10 +15,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="OpenSceneGraph"; - version="3.0.1"; + version="3.2.1"; name="${baseName}-${version}"; - url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip"; - hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c"; + url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip"; + hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; }; in rec { @@ -32,8 +33,6 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"]; - patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659 - cmakeFlags = [ "-D MATH_LIBRARY=" ]; diff --git a/pkgs/development/libraries/openscenegraph/xine.patch b/pkgs/development/libraries/openscenegraph/xine.patch deleted file mode 100644 index 8fbc8ceec52e..000000000000 --- a/pkgs/development/libraries/openscenegraph/xine.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c -+++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c -@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - rgb_class->driver_class.get_identifier = get_identifier; - rgb_class->driver_class.get_description = get_description; -+#else -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); -+#endif -+ - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); - diff --git a/pkgs/development/libraries/openssl/1.0.1j.nix b/pkgs/development/libraries/openssl/1.0.1j.nix deleted file mode 100644 index 29656f7ef888..000000000000 --- a/pkgs/development/libraries/openssl/1.0.1j.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, fetchurl, perl -, withCryptodev ? false, cryptodevHeaders }: - -let - name = "openssl-1.0.1j"; - - opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; - - patchesCross = isCross: let - isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem"); - in - [ # Allow the location of the X509 certificate file (the CA - # bundle) to be set through the environment variable - # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the - # default location ($out/ssl/cert.pem) doesn't exist, and - # hardcoding something like /etc/ssl/cert.pem is impure and - # cannot be overriden per-process. For security, the - # environment variable is ignored for setuid binaries. - ./cert-file.patch - # Remove the compilation time from the library - ./no-date-in-library.patch - ] - - ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") - [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually - ./gnu.patch # submitted upstream - ] - - ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") - [ ./gnu.patch - ./kfreebsd-gnu.patch - ] - - ++ stdenv.lib.optional isDarwin ./darwin-arch.patch; - -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - urls = [ - "http://www.openssl.org/source/${name}.tar.gz" - "http://openssl.linux-mirror.org/source/${name}.tar.gz" - ]; - sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; - }; - - patches = patchesCross false; - - buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; - - nativeBuildInputs = [ perl ]; - - # On x86_64-darwin, "./config" misdetects the system as - # "darwin-i386-cc". So specify the system type explicitly. - configureScript = - if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" - else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc" - else "./config"; - - configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + - stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + - stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm"; - - preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") '' - sed -i -e "s|-march=i486|-march=x86-64|g" Makefile - ''; - - makeFlags = "MANDIR=$(out)/share/man"; - - # Parallel building is broken in OpenSSL. - enableParallelBuilding = false; - - postInstall = - '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then - rm $out/lib/*.a - fi - ''; # */ - - crossAttrs = { - patches = patchesCross true; - - preConfigure='' - # It's configure does not like --build or --host - export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" - ''; - - postInstall = '' - # Openssl installs readonly files, which otherwise we can't strip. - # This could at some stdenv hash change be put out of crossAttrs, too - chmod -R +w $out - - # Remove references to perl, to avoid depending on it at runtime - rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget - ''; - configureScript = "./Configure"; - } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") { - CC = "gcc"; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - priority = 10; # resolves collision with ‘man-pages’ - }; -} diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch index 26b51c0295e0..e6e661112015 100644 --- a/pkgs/development/libraries/openssl/cert-file.patch +++ b/pkgs/development/libraries/openssl/cert-file.patch @@ -1,6 +1,6 @@ -diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypto/x509/x509_def.c ---- openssl-1.0.0e-orig/crypto/x509/x509_def.c 1999-09-11 19:54:11.000000000 +0200 -+++ openssl-1.0.0e/crypto/x509/x509_def.c 2011-09-12 18:30:59.386501609 +0200 +diff -ru openssl-1.0.1m-orig/crypto/x509/x509_def.c openssl-1.0.1m/crypto/x509/x509_def.c +--- openssl-1.0.1m-orig/crypto/x509/x509_def.c 2015-03-19 14:19:00.000000000 +0100 ++++ openssl-1.0.1m/crypto/x509/x509_def.c 2015-03-19 15:50:44.676683616 +0100 @@ -57,6 +57,10 @@ */ @@ -12,30 +12,28 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt #include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/x509.h> -@@ -71,7 +75,25 @@ - { return(X509_CERT_DIR); } +@@ -78,7 +82,23 @@ const char *X509_get_default_cert_file(void) -- { return(X509_CERT_FILE); } -+ { -+ static char buf[PATH_MAX] = X509_CERT_FILE; -+ static int init = 0; -+ if (!init) { -+ init = 1; -+ char * s = getenv("OPENSSL_X509_CERT_FILE"); -+ if (s) { + { +- return (X509_CERT_FILE); ++ static char buf[PATH_MAX] = X509_CERT_FILE; ++ static int init = 0; ++ if (!init) { ++ init = 1; ++ char * s = getenv("OPENSSL_X509_CERT_FILE"); ++ if (s) { +#ifndef OPENSSL_SYS_WINDOWS -+ if (getuid() == geteuid()) { ++ if (getuid() == geteuid()) { +#endif -+ strncpy(buf, s, sizeof(buf)); -+ buf[sizeof(buf) - 1] = 0; ++ strncpy(buf, s, sizeof(buf)); ++ buf[sizeof(buf) - 1] = 0; +#ifndef OPENSSL_SYS_WINDOWS -+ } ++ } +#endif -+ } -+ } -+ return buf; -+ } ++ } ++ } ++ return buf; + } const char *X509_get_default_cert_dir_env(void) - { return(X509_CERT_DIR_EVP); } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c78cd25e1287..7255e91f282d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1k"; + name = "openssl-1.0.1m"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -18,6 +18,8 @@ let # hardcoding something like /etc/ssl/cert.pem is impure and # cannot be overriden per-process. For security, the # environment variable is ignored for setuid binaries. + # FIXME: drop this patch; it really isn't necessary, because + # OpenSSL already supports a ‘SSL_CERT_FILE’ variable. ./cert-file.patch ] @@ -43,7 +45,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "0754wzmzr90hiiqs5cy6g3cf8as75ljkhppgyirfg26hpapax7wg"; + sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9"; }; patches = patchesCross false; diff --git a/pkgs/development/libraries/openssl/no-date-in-library.patch b/pkgs/development/libraries/openssl/no-date-in-library.patch deleted file mode 100644 index 3eb501dfa020..000000000000 --- a/pkgs/development/libraries/openssl/no-date-in-library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur openssl-1.0.1f.orig/crypto/Makefile openssl-1.0.1f/crypto/Makefile ---- openssl-1.0.1f.orig/crypto/Makefile 2014-01-06 15:35:56.000000000 +0100 -+++ openssl-1.0.1f/crypto/Makefile 2014-04-09 13:05:28.071346204 +0200 -@@ -57,7 +57,7 @@ - echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \ - echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \ - echo ' #define PLATFORM "$(PLATFORM)"'; \ -- echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \ -+ echo " #define DATE \"Thu Jan 1 00:00:01 UTC 1970\""; \ - echo '#endif' ) >buildinf.h - - x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 84a7a9b4ccf7..b9962c2a2d7d 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, cmake, openssl, popt, xmlto }: +{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { - version = "0.4.1"; name = "rabbitmq-c-${version}"; + version = "0.6.0"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93"; + src = fetchFromGitHub { + owner = "alanxz"; + repo = "rabbitmq-c"; + rev = "v${version}"; + sha256 = "00264mvwwcibd36w9a3s3cv2x7pvz88al64q2maaw1kbd9mg1ky5"; }; buildInputs = [ cmake openssl popt xmlto ]; - meta = { + meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; - license = with stdenv.lib.licenses; mit; - platforms = with stdenv.lib.platforms; linux; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index cd7cc2e55057..8ba2d52741f0 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchgit, pkgs }: +{ stdenv, fetchFromGitHub, zlib, perl }: stdenv.mkDerivation rec { + name = "rdkafka-${version}"; version = "0.8.5"; - name = "rdkafka"; - # Maintenance repo for libtar (Arch Linux uses this) - src = fetchgit { - url = "https://github.com/edenhill/librdkafka.git"; - rev = "refs/tags/${version}"; - sha256 = "05a83hmpz1xmnln0wa7n11ijn08zxijdvpdswyymxbdlg69w31y1"; + src = fetchFromGitHub { + owner = "edenhill"; + repo = "librdkafka"; + rev = version; + sha256 = "0qx5dnq9halqaznmbwg44p1wl64pzl485r4054569rbx9y9ak1zy"; }; - patchPhase = "patchShebangs ."; - - buildInputs = [ pkgs.zlib pkgs.perl ]; + buildInputs = [ zlib perl ]; + + postPatch = '' + patchShebangs . + ''; meta = with stdenv.lib; { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.boothead ]; + maintainers = with maintainers; [ boothead wkennington ]; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a452037a235e..8dc2b542be75 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,5 +1,15 @@ { stdenv, fetchurl, gfortran, perl, liblapack, config }: +# Minimum CPU requirements: +# x86: Pentium 4 (Prescott, circa 2004) +# x86_64: Opteron (circa 2003) +# These are the settings used for the generic builds. Performance will +# be poor on modern systems. The goal of the Hydra builds is simply to +# support as many systems as possible. OpenBLAS may support older +# CPU architectures, but you will need to set 'config.openblas.target' +# and 'config.openblas.preferLocalBuild', which will build it on your +# local machine. + let local = config.openblas.preferLocalBuild or false; localTarget = config.openblas.target or ""; in @@ -20,18 +30,24 @@ stdenv.mkDerivation rec { cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); target = if local then localTarget else - if cpu == "i686" then "P2" else - if cpu == "x86_64" then "CORE2" else + if cpu == "i686" then "PRESCOTT" else + if cpu == "x86_64" then "OPTERON" else # allow autodetect ""; - makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; + makeFlags = [ + "${if target != "" then "TARGET=" else ""}${target}" + "FC=gfortran" + "CC=gcc" + ''PREFIX="''$(out)"'' + "INTERFACE64=1" + ]; meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = [ "x86_64-linux" ]; + platforms = with platforms; linux; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 0fd3caffd5cc..df732c40f57e 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "simgear-${version}"; - version = "3.0.0"; + version = "3.4.0"; src = fetchurl { url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2"; - sha256 = "1ssrcmvk3a4dv0k4vjzndmirwmdgzk689d7wpmjm423nydmwajh0"; + sha256 = "152q3aqlrg3631ppvl6kr1mp5iszplq68l6lrsn9vjxafbz6czcj"; }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 69617c0345e9..bf1f38fbb83d 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A multi-platform programmer's library designed to allow a developer to create robust software"; homepage = http://www.jedsoft.org/slang/; license = stdenv.lib.licenses.gpl2Plus; - platform = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix new file mode 100644 index 000000000000..1344ad18d09f --- /dev/null +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "socket_wrapper-1.1.3"; + + src = fetchgit { + url = "git://git.samba.org/socket_wrapper.git"; + rev = "refs/tags/${name}"; + sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn"; + }; + + buildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "a library passing all socket communications through unix sockets"; + homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary"; + license = licenses.bsd3; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 0598b0bd684a..98a71993253b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.7.1"; + name = "sqlite-3.8.8.3"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz"; - sha1 = "5601be1263842209d7c5dbf6128f1cc0b6bbe2e5"; + url = "http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz"; + sha1 = "2fe3f6226a2a08a2e814b97cd53e36bb3c597112"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco np ]; }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix new file mode 100644 index 000000000000..b387c59efa13 --- /dev/null +++ b/pkgs/development/libraries/stxxl/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, cmake, parallel ? true }: + +stdenv.mkDerivation rec { + name = "stxxl-1.4.1"; + + src = fetchurl { + url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz"; + sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; + }; + + buildInputs = [ cmake ]; + + cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}"; + + passthru = { + inherit parallel; + }; + + meta = { + homepage = https://github.com/stxxl/stxxl; + description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations."; + license = stdenv.lib.licenses.boost; + }; +} diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8a523593c4b3..9aad51f9fade 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.1"; + name = "talloc-2.1.2"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y"; + sha256 = "13c365f7y8idjf2v1jxdjpkc3lxdmsxxfxjx1ymianm7zjiph393"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 833fd69aa9c6..db863d951a69 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.22"; + name = "tevent-0.9.24"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0myyi3lwsi6f3f0a5qw8rjpm2d5yf18pw4vljdwyi885l411sksl"; + sha256 = "0l1zjx2z6nhvn6gwbcvzn8w0cca53j717fwi10s7a5v1jb04rfad"; }; buildInputs = [ diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix new file mode 100644 index 000000000000..b19d404bee2f --- /dev/null +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "uid_wrapper-1.1.0"; + + src = fetchgit { + url = "git://git.samba.org/uid_wrapper.git"; + rev = "refs/tags/${name}"; + sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj"; + }; + + buildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "a wrapper for the user, group and hosts NSS API"; + homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; + license = licenses.bsd3; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix new file mode 100644 index 000000000000..11f3294b2894 --- /dev/null +++ b/pkgs/development/libraries/unibilium/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: + +stdenv.mkDerivation rec { + name = "unibilium-${version}"; + + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "mauke"; + repo = "unibilium"; + rev = "v${version}"; + sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildInputs = [ libtool pkgconfig ]; + + meta = with lib; { + description = "A very basic terminfo library"; + license = with licenses; [ lgpl3Plus ]; + }; +} diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix new file mode 100644 index 000000000000..8c715fbd9288 --- /dev/null +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + version = "v1.1.6"; + + name = "utf8proc-${version}"; + + src = fetchurl { + url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz"; + sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + }; + + installPhase = '' + mkdir -pv $out/lib $out/include + cp libutf8proc.so libutf8proc.a $out/lib + cp utf8proc.h $out/include + ''; + + meta = { + description = "A library for processing UTF-8 encoded Unicode strings"; + homepage = http://www.public-software-group.org/utf8proc; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 62fce3c1d2d3..59063645232d 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt +{ stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt , qtLib ? null }: with stdenv.lib; @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi"; }; + # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 + postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h"; + buildInputs = [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib; diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 33285897d11c..50eba33670f9 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -1,18 +1,21 @@ -{stdenv, fetchurl, libuuid}: +{ stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { - name = "zeromq-3.2.4"; + name = "zeromq-3.2.5"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0n9gfhwgkwq08kvvgk5zxjga08v628ij5chddk5w4ravr10s35nz"; + sha256 = "0911r7q4i1x9gnfinj39vx08fnz59mf05vl75zdkws36lib3wr89"; }; buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { branch = "3"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + license = licenses.gpl3; + platform = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index db4c8fb8b94e..eaa719b92c9a 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libuuid}: +{ stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { name = "zeromq-4.0.5"; @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 4f7ed6e9e8e4..241aaeb0e812 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -217,6 +217,30 @@ in }; }; - + + android_support_extra = buildGoogleApis { + name = "android_support_extra"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/support_r20.zip; + sha1 = "719c260dc3eb950712988f987daaf91afa9e36af"; + }; + meta = { + description = "Android Support Library"; + url = http://developer.android.com/; + }; + }; + google_play_services = buildGoogleApis { + name = "google_play_services"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_play_services_3265130_r12.zip; + sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; + }; + meta = { + description = "Google Play services client library and sample code"; + url = http://developer.android.com/; + }; + }; + + } - \ No newline at end of file + diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix new file mode 100644 index 000000000000..5e04bbf0116d --- /dev/null +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper +, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which +, platformTools +}: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "android-ndk-r8e"; + + src = if stdenv.system == "i686-linux" + then fetchurl { + url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; + sha256 = "c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98"; + } + else if stdenv.system == "x86_64-linux" then fetchurl { + url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; + sha256 = "093gf55zbh38p2gk5bdykj1vg9p5l774wjdzw5mhk4144jm1wdq7"; + } + else throw "platform ${stdenv.system} not supported!"; + + phases = "buildPhase"; + + buildInputs = [ makeWrapper ]; + + buildCommand = let + bin_path = "$out/bin"; + pkg_path = "$out/libexec/${name}"; + sed_script_1 = + "'s|^PROGDIR=`dirname $0`" + + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; + sed_script_2 = + "'s|^MYNDKDIR=`dirname $0`" + + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; + runtime_paths = (lib.makeSearchPath "bin" [ + coreutils file findutils + gawk gnugrep gnused + jdk + which + ]) + ":${platformTools}/platform-tools"; + in '' + set -x + mkdir -pv $out/libexec + cd $out/libexec + tar -xjf $src + + # so that it doesn't fail because of read-only permissions set + cd - + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } + cd ${pkg_path} + + find $out \( \ + \( -type f -a -name "*.so*" \) -o \ + \( -type f -a -perm /0100 \) \ + \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ + --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build ndk-gdb ndk-gdb-py + do + sed -i -e ${sed_script_1} $i + done + sed -i -e ${sed_script_2} ndk-which + # a bash script + patchShebangs ndk-which + # make some executables available in PATH + mkdir -pv ${bin_path} + for i in \ + ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which + do + ln -sf ${pkg_path}/$i ${bin_path}/$i + done + # wrap + for i in ndk-build ndk-gdb ndk-gdb-py ndk-which + do + wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}" + done + ''; +} diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 7c854d052d6c..f4c3448c9213 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -5,7 +5,7 @@ , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib , freetype, fontconfig, glib, gtk, atk, file, jdk }: -{platformVersions, abiVersions, useGoogleAPIs}: +{platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}: stdenv.mkDerivation rec { name = "android-sdk-${version}"; @@ -134,6 +134,18 @@ stdenv.mkDerivation rec { ln -s ${supportRepository}/m2repository + ${if useExtraSupportLibs then + "ln -s ${addons.android_support_extra}/support ." + else ""} + + cd .. + mkdir -p google + cd google + + ${if useGooglePlayServices then + "ln -s ${addons.google_play_services}/google-play-services google_play_services" + else ""} + cd ../.. # Symlink required platforms diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 513b0763446d..e99ab93b7aeb 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -134,11 +134,26 @@ rec { useGoogleAPIs = true; }; + androidsdk_5_0_1_extras = androidsdk { + platformVersions = [ "21" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; + + androidndk_r8e = import ./androidndk_r8e.nix { + inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper; + inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit platformTools; + }; + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant gnumake gawk file which; diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch new file mode 100644 index 000000000000..4a9f9a4a9dd3 --- /dev/null +++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch @@ -0,0 +1,13 @@ +diff -ru android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh android-ndk-r8e/build/tools/make-standalone-toolchain.sh +--- android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200 ++++ android-ndk-r8e/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200 +@@ -194,6 +194,9 @@ + # Now copy the GCC toolchain prebuilt binaries + run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" + ++# Making it writable again ++chmod -R +w "$TMPDIR" ++ + if [ -n "$LLVM_VERSION" ]; then + # Copy the clang/llvm toolchain prebuilt binaries + run copy_directory "$LLVM_TOOLCHAIN_PATH" "$TMPDIR" diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix new file mode 100644 index 000000000000..bb4b5f7b3125 --- /dev/null +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +let version = "0.1.1"; in + +stdenv.mkDerivation { + name = "ocaml-asn1-combinators-${version}"; + + src = fetchzip { + url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz"; + sha256 = "1wl5g2cqd4dk33w0ski6z425cs4sgj980fw0xkwgz1w1xzywh4i2"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ cstruct zarith ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirleft/ocaml-asn1-combinators; + description = "Combinators for expressing ASN.1 grammars in OCaml"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix new file mode 100644 index 000000000000..f7e4513d8265 --- /dev/null +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +let version = "2.0.0"; in + +stdenv.mkDerivation { + name = "ocaml-base64-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; + sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-base64; + platforms = ocaml.meta.platforms; + description = "Base64 encoding and decoding in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index ac7b8adfd8ca..e83ea743263b 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,17 +1,22 @@ -{stdenv, fetchurl, ocaml, findlib, camomile, ounit}: +{ stdenv, fetchzip, ocaml, findlib, qtest }: + +let version = "2.3.1"; in stdenv.mkDerivation { - name = "ocaml-batteries-2.2.0"; + name = "ocaml-batteries-${version}"; - src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz; - sha256 = "0z4wg357fzz7cnarjsrrdnpmxw8mxcj10fp67dm3bnn0l3zkjwbs"; + src = fetchzip { + url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; + sha256 = "1hjbzczchqnnxbn4ck84j5pi6prgfjfjg14kg26fzqz3gql427rl"; }; - buildInputs = [ocaml findlib camomile ounit]; + buildInputs = [ ocaml findlib qtest ]; configurePhase = "true"; # Skip configure + doCheck = true; + checkTarget = "test test"; + createFindlibDestdir = true; meta = { @@ -22,7 +27,7 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = stdenv.lib.licenses.lgpl21; + license = stdenv.lib.licenses.lgpl21Plus; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix new file mode 100644 index 000000000000..6d046ce5294b --- /dev/null +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +let version = "1.0"; in + +stdenv.mkDerivation { + name = "ocaml-dolog-${version}"; + src = fetchzip { + url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; + sha256 = "1yy3a0h9xn5mv8q38yx5jgavj2hgfw42mdnrzixl25pqx7idvcmf"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + doCheck = true; + checkTarget = "test"; + + meta = { + homepage = https://github.com/UnixJunkie/dolog; + description = "Minimalistic lazy logger in OCaml"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix new file mode 100644 index 000000000000..ce20cdd47bb4 --- /dev/null +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; + +stdenv.mkDerivation { + name = "ocaml-enumerate-111.08.00"; + + src = fetchurl { + url = https://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz; + sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ type_conv camlp4 ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://ocaml.janestreet.com/; + description = "Quotation expanders for enumerating finite types"; + license = stdenv.lib.licenses.asl20; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix new file mode 100644 index 000000000000..7508a14738dc --- /dev/null +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }: + +let + version = "0.2"; + disable-tests = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/erm_xmpp/erm_xmpp.0.2/files/disable_tests.patch; + sha256 = "09d8630nmx2x8kb8ap1zmsb93zs14cqg7ga1gmdl92jvsjxbhgc1"; + }; +in + +stdenv.mkDerivation { + name = "ocaml-erm_xmpp-${version}"; + + src = fetchzip { + url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz"; + sha256 = "0saw2dmrzv2aadrznvyvchnhivvcwm78x9nwf6flq5v0pqddapk2"; + }; + + patches = [ disable-tests ]; + + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ erm_xml cryptokit ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/ermine/xmpp; + description = "OCaml based XMPP implementation"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix new file mode 100644 index 000000000000..8c3c42758375 --- /dev/null +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, ocaml, findlib }: + +stdenv.mkDerivation { + name = "ocaml-fileutils-0.4.5"; + + src = fetchurl { + url = https://forge.ocamlcore.org/frs/download.php/1194/ocaml-fileutils-0.4.5.tar.gz; + sha256 = "0rlqmcgjrfjihjgw5cfmack169cag8054gh5yrqph15av3lx5cra"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; + platforms = ocaml.meta.platforms; + description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix new file mode 100644 index 000000000000..25fa60139d6e --- /dev/null +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, cstruct }: + +let version = "1.4.0"; in + +stdenv.mkDerivation { + name = "ocaml-io-page-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; + sha256 = "05m1gbcy72i6gikdijbkpw8pfygc86a3l4k8ayyl58019l6qa2fq"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ cstruct ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/io-page; + platforms = ocaml.meta.platforms; + description = "IO memory page library for Mirage backends"; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 544d85c6f5fc..89efb58ecbb5 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,30 +1,25 @@ -{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}: +{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }: + +let version = "0.7"; in stdenv.mkDerivation { - name = "ocsigen-deriving"; - src = fetchgit { - url = "git://github.com/ocsigen/deriving"; - rev = "refs/tags/0.6.2"; - sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662"; + name = "ocsigen-deriving-${version}"; + src = fetchzip { + url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; + sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw"; }; - buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4]; - - configurePhase = '' - make setup-dev.exe - ./setup-dev.exe -configure --prefix $out - ''; + buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ]; createFindlibDestdir = true; - meta = { homepage = https://github.com/ocsigen/deriving; description = "Extension to OCaml for deriving functions from type declarations"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.gal_bolle + maintainers = with stdenv.lib.maintainers; [ + gal_bolle vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix new file mode 100644 index 000000000000..e68a8729c014 --- /dev/null +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip, ocaml, oasis, findlib, ounit }: + +let version = "2.0.1"; in + +stdenv.mkDerivation { + name = "ocaml-qtest-${version}"; + src = fetchzip { + url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; + sha256 = "00sir7q7z78s22w8fzrgw9gqm7r8ww0bgwqxrq6nsbbclgxj9c6i"; + }; + + buildInputs = [ ocaml oasis findlib ]; + propagatedBuildInputs = [ ounit ]; + + buildPhase = "ocaml do.ml qtest build $out"; + createFindlibDestdir = true; + installPhase = "ocaml do.ml qtest install $out"; + + meta = { + description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; + homepage = https://github.com/vincent-hugot/iTeML; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 6fd7f2f2e5e0..b2dd0609a0e4 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-re-1.3.0"; + name = "ocaml-re-1.3.1"; - src = fetchgit { - url = https://github.com/ocaml/ocaml-re.git; - rev = "refs/tags/${name}"; - sha256 = "1h8hz0dbjp8l39pva2js380c8bsm8rb4v326l62rkrdv8jvyh6bx"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz"; + sha256 = "11d4k43pc97kvdbjgjcxpc0gq6yal4galkxlrfdp1iypwdcni92g"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix new file mode 100644 index 000000000000..5eb4fbfd6b15 --- /dev/null +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "xml-light"; + version = "2.4"; +in +stdenv.mkDerivation { + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/ncannasse/${pname}/archive/${version}.tar.gz"; + sha256 = "10b55qf6mvdp11ny3h0jv6k6wrs78jr9lhsiswl0xya7z8r8j0a2"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + buildPhase = '' + make all + make opt + ''; + + installPhase = '' + make install_ocamlfind + mkdir -p $out/share + cp -vai doc $out/share/ + ''; + + meta = { + description = "Minimal Xml parser and printer for OCaml"; + longDescription = '' + Xml-Light provides functions to parse an XML document into an OCaml + data structure, work with it, and print it back to an XML + document. It support also DTD parsing and checking, and is + entirely written in OCaml, hence it does not require additional C + library. + ''; + homepage = "http://tech.motion-twin.com/xmllight.html"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch deleted file mode 100644 index 79ff9a7e4afa..000000000000 --- a/pkgs/development/python-modules/boto-1.9-python-2.7.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix Boto 1.9 on Python 2.7. - -https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79 - -diff --git a/boto/connection.py b/boto/connection.py -index c5779e2..71942f1 100644 ---- a/boto/connection.py -+++ b/boto/connection.py -@@ -252,8 +252,9 @@ class AWSAuthConnection(object): - # versions, it would append ":443" to the hostname sent - # in the Host header and so we needed to make sure we - # did the same when calculating the V2 signature. In 2.6 -+ # (and higher!) - # it no longer does that. Hence, this kludge. -- if sys.version[:3] == "2.6" and port == 443: -+ if sys.version[:3] in ('2.6', '2.7') and port == 443: - signature_host = self.host - else: - signature_host = '%s:%d' % (self.host, port) diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch new file mode 100644 index 000000000000..7895e223c6b5 --- /dev/null +++ b/pkgs/development/python-modules/boto/content-length-str.patch @@ -0,0 +1,16 @@ +Cherry-picked from https://github.com/boto/boto/pull/2932 + +This fix is required for things like docker-registry to interact with S3. Will +be obsolete after the next boto release (> 2.36.0) + +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -381,7 +381,7 @@ class HTTPRequest(object): + if 'Content-Length' not in self.headers: + if 'Transfer-Encoding' not in self.headers or \ + self.headers['Transfer-Encoding'] != 'chunked': +- self.headers['Content-Length'] = len(self.body) ++ self.headers['Content-Length'] = str(len(self.body)) + + + class HTTPResponse(http_client.HTTPResponse): diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index f1bb496ac007..20fb2ec496b4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -51,7 +51,7 @@ # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -python.stdenv.mkDerivation (attrs // { +if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; @@ -167,7 +167,6 @@ python.stdenv.mkDerivation (attrs // { meta = with lib.maintainers; { # default to python's platforms platforms = python.meta.platforms; - broken = disabled; } // meta // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 857f002cace9..e343536b8fa8 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -16,13 +16,13 @@ wrapPythonProgramsIn() { done for i in $(find "$dir" -type f -perm +0100); do - # Rewrite "#! .../env python" to "#! /nix/store/.../python". if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q '/python\|/pypy'; then + # catch /python and /.python-wrapped + if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch index 10c61478bd6b..a9bb0eab5de9 100644 --- a/pkgs/development/python-modules/gevent_sslwrap.patch +++ b/pkgs/development/python-modules/gevent_sslwrap.patch @@ -1,8 +1,17 @@ -Index: b/gevent/ssl.py -=================================================================== +From 485cebc4d9bab2dae51cf29f91fad2f1cf157fec Mon Sep 17 00:00:00 2001 +From: Eugene Pankov <john.pankov@gmail.com> +Date: Sun, 21 Sep 2014 12:04:13 +0300 +Subject: [PATCH] Work around missing sslwrap in Python 2.7.9 (fixes #477) + +--- + gevent/_ssl2.py | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/gevent/ssl.py b/gevent/ssl.py +index 21491b7..85e6a86 100644 --- a/gevent/ssl.py +++ b/gevent/ssl.py -@@ -81,15 +81,14 @@ class SSLSocket(socket): +@@ -80,15 +80,27 @@ def __init__(self, sock, keyfile=None, certfile=None, self._sslobj = None else: # yes, create the SSL object @@ -10,19 +19,31 @@ Index: b/gevent/ssl.py - self._sslobj = _ssl.sslwrap(self._sock, server_side, - keyfile, certfile, - cert_reqs, ssl_version, ca_certs) -- else: ++ if hasattr(_ssl, 'sslwrap'): ++ if ciphers is None: ++ self._sslobj = _ssl.sslwrap(self._sock, server_side, ++ keyfile, certfile, ++ cert_reqs, ssl_version, ca_certs) ++ else: ++ self._sslobj = _ssl.sslwrap(self._sock, server_side, ++ keyfile, certfile, ++ cert_reqs, ssl_version, ca_certs, ++ ciphers) + else: - self._sslobj = _ssl.sslwrap(self._sock, server_side, - keyfile, certfile, - cert_reqs, ssl_version, ca_certs, - ciphers) -+ ctx = __ssl__.SSLContext(ssl_version) -+ if keyfile or certfile: -+ ctx.load_cert_chain(certfile, keyfile) -+ if ca_certs: -+ ctx.load_verify_locations(ca_certs) -+ if ciphers: -+ ctx.set_ciphers(ciphers) -+ self._sslobj = ctx._wrap_socket(self._sock, server_side=server_side) ++ self.context = __ssl__.SSLContext(ssl_version) ++ self.context.verify_mode = cert_reqs ++ if ca_certs: ++ self.context.load_verify_locations(ca_certs) ++ if certfile: ++ self.context.load_cert_chain(certfile, keyfile) ++ if ciphers: ++ self.context.set_ciphers(ciphers) ++ self._sslobj = self.context._wrap_socket(self._sock, server_side=server_side, ssl_sock=self) ++ if do_handshake_on_connect: self.do_handshake() self.keyfile = keyfile diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 835b4f6514a8..e647dfc809fc 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper }: +{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, +pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, +gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { version = "2.2.36"; @@ -20,9 +22,26 @@ stdenv.mkDerivation rec { configureFlags="--with-python-module-path=$out/${python.sitePackages}" ''; - buildInputs = [ python cairomm pycairo sparsehash automake m4 pkgconfig makeWrapper boost expat scipy numpy cgal lndir gmp mpfr ]; + buildInputs = [ automake m4 pkgconfig makeWrapper ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + boost + cgal + expat + gmp + mpfr + python + scipy + # optional + sparsehash + # drawing + cairomm + gobjectIntrospection + gtk3 + pycairo + matplotlib + pygobject3 + ]; enableParallelBuilding = false; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 2418192e5fbf..1661152664f6 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -11,12 +11,12 @@ ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9 ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; }; ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; -ACNE = derive { name="ACNE"; version="0.7.0"; sha256="137xp69adhggz1wxzm5r95vcphrlrqpxsrz0gny59isx4xr28aal"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets]; }; +ACNE = derive { name="ACNE"; version="0.8.0"; sha256="0ps38lljzm2aszqf8fhh74zbdxh46kypmybkw5w7xaf9nv5kcq8g"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets aroma_core]; }; ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; }; ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; }; ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; -AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; }; +AER = derive { name="AER"; version="1.2-3"; sha256="0823zjpl0b7fzhszi28lg1paa41vbxq2xpjil1d4f6dxdysalxlx"; depends=[car lmtest sandwich survival zoo Formula]; }; AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; }; AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; }; AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; }; @@ -74,6 +74,7 @@ ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdx ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; }; AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; }; AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; +AsynchLong = derive { name="AsynchLong"; version="1.0"; sha256="097d0zvzjkz3v32qhxdir0xv7kbjkhzy6q5k54w8l4fa2632j3mk"; depends=[]; }; AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; }; AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; AutoSEARCH = derive { name="AutoSEARCH"; version="1.4"; sha256="1jhw005nm2dmawpdjyh9y55cn9069dcv5dihg70c3x5l65rkrliy"; depends=[zoo gets lgarch]; }; @@ -82,14 +83,14 @@ BACA = derive { name="BACA"; version="0.99.0"; sha256="19n6ajq6szpzwj36lfg7wrh2j BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; }; BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; }; BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; -BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; }; +BAMMtools = derive { name="BAMMtools"; version="2.0.4"; sha256="1cy7lplw2i8dabipmjnclywh36agj37hmqcwsk0x99dl6k3mb3d7"; depends=[ape]; }; BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; }; BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; -BAT = derive { name="BAT"; version="1.2"; sha256="06r2y9l07kj3fm3mm38xjrl7q6yz66vr514xx37957r9s8zf7i92"; depends=[vegan spatstat nls2]; }; +BAT = derive { name="BAT"; version="1.2.1"; sha256="073qqx2xmiccf4h7allfavmr2sxhvwc1njnkc0slmyn46nlsk7sl"; depends=[vegan spatstat nls2]; }; BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; }; BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; -BBEST = derive { name="BBEST"; version="0.1-2"; sha256="1zfnd379xgj29g8cld19w8ali1ny30l1q7ca47ykf07myj62ckv0"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; +BBEST = derive { name="BBEST"; version="0.1-3"; sha256="0ys314bbic4yvgfsbpdhy918z3zjpg2km96v9z6vipcm4vnmsj6a"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; }; BBmisc = derive { name="BBmisc"; version="1.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; }; @@ -99,18 +100,18 @@ BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mh BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; }; BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; -BDgraph = derive { name="BDgraph"; version="2.15"; sha256="1vsdj0lwl13cjhcmfpvzqfqhvcmv6d1rb7vibkxi6qbixdwwxclg"; depends=[Matrix igraph]; }; +BDgraph = derive { name="BDgraph"; version="2.17"; sha256="03r44x6wvnirw46hq1kjvj12n83l8d9wzdxxivxw6rdi7pvv51yz"; depends=[Matrix igraph]; }; BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; }; BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; }; BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; }; BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; }; -BGPhazard = derive { name="BGPhazard"; version="1.1"; sha256="0wfwc97fakhv63wgjln5fdz558z1890zmi0m5ai46bjhda1rbx3f"; depends=[survival]; }; +BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; }; BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; BH = derive { name="BH"; version="1.55.0-3"; sha256="0p3xbbnj4l844sgg59ply5ng8z42lbs6z8cghsr3bxbbv4w9lkbs"; depends=[]; }; BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; }; BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; }; -BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.1"; sha256="1iwaw2nvs6qgmgqxlc3a7zvda6r8mkyalb6ianc643i3az8cnnxf"; depends=[Rcpp miceadds Rcpp RcppArmadillo]; }; +BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[Rcpp miceadds mitools TAM Rcpp RcppArmadillo]; }; BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp Rcpp RcppArmadillo]; }; BLCOP = derive { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[MASS quadprog RUnit timeSeries fBasics fMultivar fPortfolio]; }; @@ -123,6 +124,7 @@ BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83 BNPTSclust = derive { name="BNPTSclust"; version="1.0"; sha256="04qryrhbhi4qfp9rckw3x0g3292lyfrvphcwgb1p5ig661pxgg7p"; depends=[mvtnorm MASS]; }; BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; }; +BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; }; BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; }; BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; }; BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; @@ -138,8 +140,8 @@ BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45m BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; }; BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; }; BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp Rcpp]; }; -BatchExperiments = derive { name="BatchExperiments"; version="1.4"; sha256="1px1id2jd34vknlygljqd3cwq6bwch8jfb2npq59cvvwlxxx4qpc"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; }; -BatchJobs = derive { name="BatchJobs"; version="1.5"; sha256="1aa41rlj0n0mw03kb5n645shfrm18y5snpmlm5hm6fmlvrykqn4p"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; +BatchExperiments = derive { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; }; +BatchJobs = derive { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; BayClone2 = derive { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; }; BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; @@ -148,15 +150,15 @@ BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lh BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mvtnorm Rlab truncdist mnormt rootSolve]; }; BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; -BayesFactor = derive { name="BayesFactor"; version="0.9.10-2"; sha256="1kb7dbxnjsn7nppwqrn3znb6j7zfldn9xy4f6jfyq9n411zbf8xy"; depends=[coda pbapply mvtnorm stringr Rcpp gtools Rcpp]; }; +BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda Matrix pbapply mvtnorm stringr gtools MatrixModels Rcpp Rcpp RcppEigen]; }; BayesGESM = derive { name="BayesGESM"; version="1.2"; sha256="1mbi4lb7bjpmkwc3ns3mfvmfqr85pfx85rkcq95pl91saxichs4s"; depends=[truncdist GIGrvg normalp Formula]; }; -BayesLCA = derive { name="BayesLCA"; version="1.6"; sha256="1f7xmq3pni68s112k0hvdhag7nqgmm84hhycbm88cyvkdjd0kfba"; depends=[e1071 coda fields nlme MCMCpack]; }; BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; }; BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[R2jags QRM polspline MCMCpack]; }; BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; }; BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; }; BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; }; +BayesSummaryStatLM = derive { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[mvnfast ff]; }; BayesTree = derive { name="BayesTree"; version="0.3-1.2"; sha256="1if6x7xxs8pv37c3w4yij17gxnf63k83lawzlmd2644w1i6p7sw1"; depends=[nnet]; }; BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; BayesVarSel = derive { name="BayesVarSel"; version="1.6.1"; sha256="1pmhbyvsq4k2kqnbnxm089qxil0ac61msa204pck6r0b360pmpnh"; depends=[MASS]; }; @@ -176,12 +178,13 @@ BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139s Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; }; Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; -BiSEp = derive { name="BiSEp"; version="2.0"; sha256="1nm76bcdwwy8c434a94rnhfvnc3va54q0jd8blkbh79qm5nwcpf9"; depends=[mclust]; }; +BiSEp = derive { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[mclust]; }; BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; }; BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; }; -BinNonNor = derive { name="BinNonNor"; version="1.1"; sha256="035xarfsbi7908aipzymxwgyl6x1arrgl17frzc0bzgy36hfkd6m"; depends=[BB corpcor mvtnorm Matrix]; }; +BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor mvtnorm Matrix]; }; BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; }; BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[GenOrd OrdNor BB corpcor Matrix mvtnorm]; }; +Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; }; BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; }; BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; }; BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; }; @@ -197,7 +200,7 @@ Bmix = derive { name="Bmix"; version="0.4"; sha256="0q6bxfdbvd3z3x4ifkmsqpfm8r5f BoSSA = derive { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64xnz8j956y30pqzwciinb4hgq1nr"; depends=[ape SoDA]; }; Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; }; Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; -BoolNet = derive { name="BoolNet"; version="2.0.2"; sha256="025bn1s6wskc82z5v7xv5jwiwn1klhbasqp0p960hfcx4v43ms5y"; depends=[igraph XML]; }; +BoolNet = derive { name="BoolNet"; version="2.1.1"; sha256="0g8f2pv8s8kj84qcp2fy3h8p91ja6ap2dgxkdaf5kjv7r3hfddg0"; depends=[igraph XML]; }; Boom = derive { name="Boom"; version="0.2"; sha256="0myb8pihjz25y9sj8b844jrkkd2x7zxyr3pg212cgkx9arby0afn"; depends=[MASS BH]; }; BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nkznsaajx4z4bkzjx99b56mjpd8543jc1dq6ki81yxlr1v"; depends=[Boom BH]; }; BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; @@ -209,14 +212,16 @@ Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvm BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; BurStFin = derive { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; }; -C50 = derive { name="C50"; version="0.1.0-21"; sha256="1hwkzf4ravf75cx5xrikh3pfsfjm2ri8qqjbhyyz1ysi0vg4jhji"; depends=[]; }; +C50 = derive { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk7idx6f761sc849m41vsc6pfhzk1"; depends=[partykit]; }; CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; }; CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; }; CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; }; +CAM = derive { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet mboost Matrix mgcv]; }; CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[sp mvtnorm]; }; CARBayes = derive { name="CARBayes"; version="4.0"; sha256="1v5pl1hfmmmlcnl324g45playkki20n33w4p5g536260kva74zly"; depends=[MASS Rcpp truncdist spam coda sp Rcpp]; }; CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; }; CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; +CARLIT = derive { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; }; CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; }; CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; }; @@ -229,17 +234,19 @@ CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; -CDM = derive { name="CDM"; version="4.1"; sha256="1dh18fak4g6ncbnzqmvrdpbx7qzrccjbvkj1pn46vpm69dip6f28"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr Rcpp RcppArmadillo]; }; +CDM = derive { name="CDM"; version="4.2-12"; sha256="18ix2l3mlk9vzv7iks16mdi4h0194bfjcvsxmya5219dfmw5vqfz"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr WrightMap lattice Rcpp RcppArmadillo]; }; CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; }; CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; }; +CEoptim = derive { name="CEoptim"; version="1.0"; sha256="1mrv2vhrwd7hvw67ys08nilbn3f1fp3bsvlbc8ggwyl3lw957fi9"; depends=[MASS msm]; }; +CFC = derive { name="CFC"; version="0.7.0"; sha256="1sl0gsx4gcbcf7bc6xf84g3lx58zraj2h51riacch2iyxl1ygspq"; depends=[abind]; }; CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; }; CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; }; CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; }; -CIDnetworks = derive { name="CIDnetworks"; version="0.6.0"; sha256="0bx1wgcsbkg6zqza435fd11kaqkdspl4mlnjjjca8j0gcfvdjxgc"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm Rcpp]; }; +CIDnetworks = derive { name="CIDnetworks"; version="0.8.0"; sha256="183mv0jq2l2zvqywxkdnmkclm7wix96fll9m4ypdp782i0qil2rr"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm Rcpp]; }; CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; }; CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; }; @@ -251,7 +258,7 @@ CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; }; CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; CNOGpro = derive { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; -CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; }; +CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mixdist mclust survival]; }; CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; @@ -280,7 +287,7 @@ CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pw CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; }; CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; -CaDENCE = derive { name="CaDENCE"; version="1.2.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; depends=[]; }; +CaDENCE = derive { name="CaDENCE"; version="1.2.2"; sha256="1rbwm3s63dxd366bs7pdxl0zpv7svsfr3ayznach9bjjrnjk3z3g"; depends=[pso]; }; Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; }; CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; }; CatDyn = derive { name="CatDyn"; version="1.0-6"; sha256="07n7qwpq8b70i2f48npy0pd87w0fj5xzjg00xw53m2idikqf82pn"; depends=[optimx BB]; }; @@ -292,10 +299,10 @@ CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256=" CensRegMod = derive { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; }; CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; -ChainLadder = derive { name="ChainLadder"; version="0.1.9"; sha256="1ysx4g16v75jn2727i56shkfbyyr08vfyngfpapc644xkf69nlq5"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; }; +ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[systemfit statmod Matrix actuar Hmisc reshape2 MASS lattice tweedie]; }; ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; -ChemoSpec = derive { name="ChemoSpec"; version="3.0-1"; sha256="1c8ark711hy4a48pvn8n6c76ibxz8dbpymh3vykpx85a2csjzslv"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation clusterCrit speaq]; }; +ChemoSpec = derive { name="ChemoSpec"; version="4.0.1"; sha256="08z85g0r38xh57h3f4hdcg8wlaklpqmxvjla1562f3lxbqm1r9k1"; depends=[plyr rgl]; }; ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; }; ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; @@ -308,13 +315,13 @@ ClickClust = derive { name="ClickClust"; version="1.1.3"; sha256="03xcmz1php6hl5 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; }; ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; }; ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; -ClustVarLV = derive { name="ClustVarLV"; version="1.3.1"; sha256="0ilfpiah8jw11n4bnr7chgycldjkqp3xgq3majisiqfqn2ankxl3"; depends=[Rcpp Rcpp]; }; +ClustVarLV = derive { name="ClustVarLV"; version="1.3.2"; sha256="0lnrpvfkhsmjjaimxqjrvwv4wrh6mxl6ifr9dj1kfkmnparyp6fp"; depends=[Rcpp Rcpp]; }; CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; }; CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; }; CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; }; CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; }; -CombinS = derive { name="CombinS"; version="1.0"; sha256="0gi66hmj3jmr301r2ahrln4zjjjvl6gabdv3y5df7aqidxlbhqbb"; depends=[]; }; +CombinS = derive { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; }; CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; }; CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; }; CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; }; @@ -328,11 +335,13 @@ CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid3 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking psych boot Hmisc MASS GPArotation lpSolve nonparaeff]; }; Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.4"; sha256="1dq9nlg04xs2n9g62y4gbl8ay4vsa25d7d7dra7q8zq6a561hzz5"; depends=[Rcpp Rcpp]; }; +Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; }; CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; }; ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; }; ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[tkrplot lattice]; }; +CopulaREMADA = derive { name="CopulaREMADA"; version="0.5-1"; sha256="1lrqx07986f7cv0ws1dd9p0dza0qkc67p8mp7rdq58b9f1h7yk2r"; depends=[statmod]; }; CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; }; CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; }; CorReg = derive { name="CorReg"; version="1.0"; sha256="061lb443wydlrgrnrpi9ibrwa0xw328wcyhsx7lndzjrni9mhcbp"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; }; @@ -342,7 +351,8 @@ CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[Formula expm numDeriv]; }; CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; }; CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; }; -CoxRidge = derive { name="CoxRidge"; version="0.9.1"; sha256="11vlsrv03j6kcxq9an7g210nq6cc6qd04b7w0pfbdk4bniqc0k60"; depends=[survival]; }; +CoxRidge = derive { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; +Coxnet = derive { name="Coxnet"; version="0.1"; sha256="1q5si53hjgf3w10km3f0185ffhw57y96356vykfmdz8gm26w4sky"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; }; Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; }; @@ -357,7 +367,7 @@ DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5 DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; }; DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; }; DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; }; -DAMOCLES = derive { name="DAMOCLES"; version="1.0"; sha256="1zk9r17f0nf3w78iwglw3hfz750pnjrd9p1d29bgh31zpc1714wi"; depends=[geiger caper ape deSolve matrixStats]; }; +DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[geiger caper ape deSolve matrixStats expm picante]; }; DAMisc = derive { name="DAMisc"; version="1.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; }; DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; }; DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; }; @@ -366,8 +376,8 @@ DBI = derive { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwr DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[minpack_lm SDD TSA lattice]; }; DCGL = derive { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph]; }; DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; -DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; }; -DDD = derive { name="DDD"; version="2.6"; sha256="002i6256mm41cy7c6vac62dbjwch4bvz6z8w7vxk1qlj7zvnkifx"; depends=[deSolve ape ade4]; }; +DCluster = derive { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot spdep MASS]; }; +DDD = derive { name="DDD"; version="2.7"; sha256="06nnfn84vhfix8ks08y3kar2cpm63fqghf9y2dhgrnb4midpk5ig"; depends=[deSolve ape ade4]; }; DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; }; DDIwR = derive { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[XML foreign]; }; DECIDE = derive { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; @@ -393,7 +403,7 @@ DPw = derive { name="DPw"; version="1.1.3"; sha256="1cw9qig5z2nfp2b3k4ng5hpar9iz DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; }; DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[spatstat RandomFields rgeos mgcv sp]; }; -DSsim = derive { name="DSsim"; version="1.0.2"; sha256="1dydglwgmzn3916kxngrc6wshdk9gvxm3rxqi6if63ljrb8yarnj"; depends=[shapefiles splancs mrds mgcv]; }; +DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[shapefiles splancs mrds mgcv]; }; DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[rpart pec Ecdat rpart_plot survival Rcpp Rcpp]; }; DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; @@ -418,18 +428,18 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; }; -Deriv = derive { name="Deriv"; version="2.0"; sha256="0yshw6fssbnj5mvx2k42iqfz62s49d3056xdwwhamsbmpqdxmzxj"; depends=[]; }; -DescTools = derive { name="DescTools"; version="0.99.9"; sha256="19zz8jnhs87klzh6c6kxaq34kacfb80zrm54qywkj9627gv4ngn6"; depends=[boot mvtnorm]; }; +Deriv = derive { name="Deriv"; version="3.0"; sha256="025410mhhk085z2in30s765imgzs9rwp8ki1kgdfvyi2bcp6y2v3"; depends=[]; }; +DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; }; DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; }; DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; }; DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; }; -DiagrammeR = derive { name="DiagrammeR"; version="0.4"; sha256="0lzfhg9pxcv3qrm71sgbmra69b1yjjl6xvf82xsnd7d0k9sk3yn3"; depends=[htmlwidgets rstudioapi]; }; +DiagrammeR = derive { name="DiagrammeR"; version="0.5"; sha256="1h8j4yahn7w7lf0fsv3rb4zlm3806106n7x23m673cmczqyq7m32"; depends=[htmlwidgets rstudioapi V8]; }; DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; }; DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; }; DiceKriging = derive { name="DiceKriging"; version="1.5.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; }; -DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; }; +DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging rgenoud MASS lhs mnormt]; }; DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; }; Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahyq54l9zm7g1yzmk2biz4xqq3qpxw0py4xazq719slk8"; depends=[Formula rgl maxLik]; }; @@ -455,7 +465,7 @@ DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3j DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihrsp8lhy84p5hlyw3ckpklv0pgcqv4h39a6cpglbvd"; depends=[numDeriv]; }; DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; -DynNom = derive { name="DynNom"; version="1.0"; sha256="1lccwg3yvv2i5xhqaws0ja7xbi66g728s7p2s037r6i3dahi86w4"; depends=[ggplot2 stargazer shiny compare]; }; +DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[ggplot2 stargazer shiny compare]; }; DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; }; EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; }; @@ -465,7 +475,7 @@ EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; }; EFDR = derive { name="EFDR"; version="0.1.0"; sha256="086vk3nff3mcpmh1js2b8wqzpjzdjvlh34fsk3l6sl066gfz49j7"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; }; EGRET = derive { name="EGRET"; version="2.1.1"; sha256="140hijnwrksi658fn9bfsgrvfkpsix7zhwl4zf4flayrkmbs5i5f"; depends=[dataRetrieval survival fields lubridate]; }; -EIAdata = derive { name="EIAdata"; version="0.0.2"; sha256="1zh2nvr11l0ip7q84pzmn36q5d5zrgh0h8zwy7bnsxv5am6z27p2"; depends=[XML plyr xts zoo]; }; +EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[XML plyr xts zoo]; }; EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; }; @@ -474,7 +484,7 @@ EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgv EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; }; EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; }; EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; -EMDomics = derive { name="EMDomics"; version="0.99.0"; sha256="0z72dgdlib9w21qhipasni5vymjf7zzq9bnvncz2fs6lpf87rf23"; depends=[emdist matrixStats ggplot2]; }; +EMDomics = derive { name="EMDomics"; version="0.99.1"; sha256="1rmdhdsqal7crhkv4z62gzrn8jf7d1aryf051kyszy7ncldp5njn"; depends=[emdist matrixStats ggplot2]; }; EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; }; EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; }; EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; }; @@ -504,7 +514,7 @@ EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8i EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; }; Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; }; Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos stringi]; }; -EcoGenetics = derive { name="EcoGenetics"; version="1.0"; sha256="1b8w3ksnvny17gxwigvdifpar6c2m2gh9v73g926can8if09dz4n"; depends=[adegenet ggplot2 gstat gstudio hierfstat party raster rgdal rkt sp spdep vegan]; }; +EcoGenetics = derive { name="EcoGenetics"; version="1.1.0"; sha256="1a7dsjvkxaa37nfha07fgfas9zygsj9hrsllgf4b67rkqihrzz87"; depends=[adegenet ggplot2 gstudio hierfstat party raster rgdal rkt sp vegan]; }; EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; }; EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; }; @@ -521,8 +531,9 @@ EnsembleCV = derive { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q EnsemblePCReg = derive { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; }; EnsemblePenReg = derive { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; }; EntropyEstimation = derive { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; }; +EntropyExplorer = derive { name="EntropyExplorer"; version="1.0"; sha256="0daj7g209nk8lsalk51kf8kkr6lbnnlzf7xd2mmv1axm7y5rppl2"; depends=[]; }; EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; }; -EnvStats = derive { name="EnvStats"; version="1.0.3"; sha256="03wcqv4v14wkrrfi68qinaza3fbspw2a1pv1rm5nshcp8hw38qga"; depends=[]; }; +EnvStats = derive { name="EnvStats"; version="2.0.0"; sha256="1yjm1lm9hsq5gw6j8wqxxgc72p7c6prr5fx8vk9v6bb2hgf2bm8i"; depends=[MASS]; }; EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; }; Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; }; EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; }; @@ -544,16 +555,15 @@ ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084s ExomeDepth = derive { name="ExomeDepth"; version="1.1.4"; sha256="0a4y6y1zi1jn1g14f3wsl2pfbmp58afwkvrk7x7s1wp16vwgq0xb"; depends=[aod VGAM]; }; ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; -ExtDist = derive { name="ExtDist"; version="0.3.7"; sha256="0vcckw94j02qcy298p26f2v9jrw3a0j62r4xb0cg11cj5aysqw3q"; depends=[numDeriv optimx VGAM SuppDists truncdist]; }; -ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.4.2"; sha256="0gkrip4gv7xmar323p95696r3zpmv6ick6fl33x0jc2ldzi0wrbj"; depends=[Formula]; }; +ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.5"; sha256="1fsrp2dm1bdg5p0qsi2wa8qxrlq065jlazsxzixpjsni910mrb2k"; depends=[Formula]; }; FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; }; FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt crossval]; }; FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; }; FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; }; FAOSTAT = derive { name="FAOSTAT"; version="1.9"; sha256="0gff60vlv35m5sjmz7glbdrd6ijy6n32a9xd26z2ix839qgywvqj"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; }; -FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; }; +FAdist = derive { name="FAdist"; version="2.1"; sha256="1y66ymg0k6kmyq4bclwwlqkp8brkq925ajpp0jqqn39f749c2kji"; depends=[]; }; FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; }; -FAmle = derive { name="FAmle"; version="1.3.2"; sha256="15xp2sdzz4ipp4h89xjws47vn7iwrkgqgcwbj5957hz038gdkam1"; depends=[mvtnorm]; }; +FAmle = derive { name="FAmle"; version="1.3.3"; sha256="125m2hvl603avg9h9x5gfb7l9clpg7p0ir8fdypxyjiqggdr8hxa"; depends=[mvtnorm]; }; FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; }; FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; @@ -562,10 +572,10 @@ FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7m FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[Rcpp numDeriv randtoolbox Rcpp]; }; FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic Rcpp RcppArmadillo]; }; FDboost = derive { name="FDboost"; version="0.0-8"; sha256="1xvyndbfd0df6ld7r6f6ajr7i6aql26n9j5ncn6rw5gm0f64s1lq"; depends=[mboost Matrix mgcv zoo MASS]; }; -FFD = derive { name="FFD"; version="1.0-2"; sha256="0s6j4rq7ryypq63cq1cfa7n993bwx9pxp6pscdhyh79rhk28xxda"; depends=[tkrplot R2HTML]; }; +FFD = derive { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[tkrplot R2HTML]; }; FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; -FGSG = derive { name="FGSG"; version="1.0"; sha256="01v0jbj09r1c4anbs3xa8y8by9ffwbbc36vsh0bv62blrisp7a03"; depends=[]; }; +FGSG = derive { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; }; FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; @@ -584,7 +594,7 @@ FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qp FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; }; FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; }; FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; -FRESA_CAD = derive { name="FRESA.CAD"; version="1.0"; sha256="1i7l2rq3p2qwd186ippnxbis8dj2va6n67q61bakd3rflm0k5mn9"; depends=[Hmisc pROC stringr miscTools survival]; }; +FRESA_CAD = derive { name="FRESA.CAD"; version="2.0.2"; sha256="1clnv18d6f747725ayksas3c2hng1bkb4zss44avfqh9q1y0z1iy"; depends=[Rcpp stringr miscTools Hmisc pROC Rcpp RcppArmadillo]; }; FSelector = derive { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[randomForest RWeka digest entropy]; }; FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; }; FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; }; @@ -592,8 +602,9 @@ FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsy FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; }; FactoMineR = derive { name="FactoMineR"; version="1.29"; sha256="08pyp8z9xhy9f1mrcgdm13xqrca63xhpyarkq5fg7hv0ncs68s1h"; depends=[MASS ellipse lattice cluster scatterplot3d leaps flashClust]; }; +Factoshiny = derive { name="Factoshiny"; version="1.0"; sha256="0r8xnnmf2c0nhddgzwsfb86ajpirkr1788phhcjdap1w9k67nsy9"; depends=[FactoMineR shiny]; }; Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; }; -Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; }; +Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; }; FastHCS = derive { name="FastHCS"; version="0.0.4"; sha256="11ddp1xy1cmnfbsvabyw0y2wdj4z1brqykji75y7wwchf71m2bps"; depends=[matrixStats rrcov Rcpp RcppEigen]; }; FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[pdist assertthat]; }; @@ -601,28 +612,28 @@ FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4k FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; }; FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; }; -FeaLect = derive { name="FeaLect"; version="1.7"; sha256="1v4psr2j74ciyi7jxphx70hjrd47l5krwvp26ml8qsd51q1i37l8"; depends=[lars rms]; }; +FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; }; FeatureHashing = derive { name="FeatureHashing"; version="0.8"; sha256="05300709d4k5fxyajvdjhwy7br558g81agfrp9pqa2y0v0qx2zkw"; depends=[Rcpp Matrix digest Rcpp digest BH]; }; FedData = derive { name="FedData"; version="1.0"; sha256="1rg35w0450fsy41i3q1j5zdxsik6r47zryba6878pzc429lrx2sn"; depends=[sp raster rgdal igraph Hmisc]; }; FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; }; -FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; }; +FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[rgl RColorBrewer]; }; FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; }; +FinCovRegularization = derive { name="FinCovRegularization"; version="1.0.0"; sha256="0da7asm4mvbd4wvqll5gdvckb10ccfx7gy141xbxyaixdhgi6zl4"; depends=[quadprog]; }; FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; }; FinancialInstrument = derive { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod zoo xts TTR]; }; FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; -FindIt = derive { name="FindIt"; version="0.4"; sha256="1srqxg9y2yzv7nfspriziyxxp3j6j143g2z9dg6rcf643k8pqqa3"; depends=[glmnet lars Matrix]; }; +FindIt = derive { name="FindIt"; version="0.5"; sha256="0bj4al4b7na3w5y783nqyd2wc1pmwfmgf2p4q6n7vqbzqghy0a3q"; depends=[glmnet lars Matrix]; }; FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph RcppArmadillo Rcpp RcppArmadillo]; }; FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; }; FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[lattice leaps ltsa bestglm lattice leaps ltsa]; }; FitARMA = derive { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; }; -FlexParamCurve = derive { name="FlexParamCurve"; version="1.4-3"; sha256="1056lxs9c2bbh2i2gv1bv2sy8gq6k6p0jpl1d3axqd1xk5pipm2x"; depends=[nlme]; }; FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; }; Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals sampling mvtnorm]; }; -ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; }; +ForeCA = derive { name="ForeCA"; version="0.2.0"; sha256="06p8rcaswl85658w2insfi3qw3ygqdp13zccxn6c2dgj5qxkydpd"; depends=[ifultools MASS sapa]; }; FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; Formula = derive { name="Formula"; version="1.2-0"; sha256="1rf4jkx7546aqwv5dsssi956r6mvr6m90wrx0d5dvy2d0ykhcnw9"; depends=[]; }; ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; @@ -631,17 +642,17 @@ FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v9 FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; Frames2 = derive { name="Frames2"; version="0.1.0"; sha256="06rmpp2ckdy42zi65f0xg9x8hgfh8hdx9an53nq3xgpz3vhaxavg"; depends=[sampling]; }; FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; }; -FunChisq = derive { name="FunChisq"; version="2.0.0"; sha256="0yvac9nnsqdkyyqkd7yk43n66frx1y5394d4ddaxy7vqw4l4maxd"; depends=[Rcpp BH Rcpp RcppClassic]; }; +FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[Rcpp BH Rcpp RcppClassic]; }; FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; }; FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; }; Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp Rcpp RcppEigen]; }; FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; }; FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; -FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.3-5"; sha256="0saqmx9vryjd8sgja54vzq3a4czg39j36zmlrnz2v612q8lcy1v2"; depends=[]; }; -FuzzyStatProb = derive { name="FuzzyStatProb"; version="1.0"; sha256="0dkxix2blb403a72a9n13hyx31rknfxfq0cbkvvk7dvgis2w6k14"; depends=[MultinomialCI FuzzyNumbers DEoptim]; }; +FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; +FuzzyStatProb = derive { name="FuzzyStatProb"; version="2.0"; sha256="06s45w18airrrs5ppy325idv4yi6nf69nrs18gha55kb2xvjq3km"; depends=[MultinomialCI FuzzyNumbers DEoptim]; }; FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; }; G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; }; -G2Sd = derive { name="G2Sd"; version="2.1.2"; sha256="16rivywmax264vvhfk1liid4g87k4b07y0imv4nz01rscxc7lv9h"; depends=[shiny xlsx rJava xlsxjars]; }; +G2Sd = derive { name="G2Sd"; version="2.1.3"; sha256="02j30mfrzi4q3a387i0cr4khj2hzf7jrlyj06qc8bwlhz0f4l35m"; depends=[shiny xlsx rJava xlsxjars reshape2 ggplot2]; }; GA = derive { name="GA"; version="2.2"; sha256="1pk80jwzvpmi61df0y331qvl8jkdizblg93s7gaspkbzy50wyfkp"; depends=[foreach iterators]; }; GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; }; GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; }; @@ -650,6 +661,8 @@ GAIPE = derive { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifz GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; +GAR = derive { name="GAR"; version="1.0"; sha256="1278rdln23pl5ay87nb6w15ywdh6ls8hx8k0nb48ab4ysjqf6r04"; depends=[httr jsonlite]; }; +GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7psw744fpkf190as99fssd9n9k0xbvwif10agm278l"; depends=[GA psych]; }; GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; }; GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; }; @@ -657,7 +670,7 @@ GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fiz GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; }; GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; -GENLIB = derive { name="GENLIB"; version="1.0.2"; sha256="0zqzx5rx8x87j0x5628r29lga0smh79h26jbgczd3l7kx9dh18rr"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; +GENLIB = derive { name="GENLIB"; version="1.0.3"; sha256="0c1x9kjff1071d0jkzjhj9j6syb442r0a4d929daq6j9jcbly4q6"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; }; GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; }; GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; }; @@ -671,7 +684,7 @@ GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7 GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; }; GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools sp RColorBrewer MASS rgeos]; }; GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; }; -GLDreg = derive { name="GLDreg"; version="1.0.1"; sha256="1lbv5h8bnb3mi66as2vq1xyzh7z7vm1ils2jf24gn0xnprl02nvq"; depends=[GLDEX MASS quantreg]; }; +GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; }; GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; }; GMCM = derive { name="GMCM"; version="1.1.1"; sha256="181in94mdc6fka0l4a6vc84n295pgsv18yf5mgf59qfmz8vjxi4n"; depends=[Rcpp Rcpp RcppArmadillo]; }; GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; }; @@ -701,17 +714,19 @@ GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; }; GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp Rcpp BH]; }; GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; }; -GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; }; +GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; }; GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; }; GWmodel = derive { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; }; GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; GaDiFPT = derive { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; +GameTheory = derive { name="GameTheory"; version="1.0"; sha256="07v2qhnhczid814isnz4ywf624sds6jxxzayl8mzlnjv5qnk59z8"; depends=[lpSolveAPI combinat gtools ineq kappalab]; }; Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[MASS GenABEL_data]; }; GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; }; GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; +GenForImp = derive { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive { name="GenOrd"; version="1.2.0"; sha256="1aypz879r2fc8zd7lnd1d2ic3zgx9gpz4gxmfqyhb5gfkg50xhlg"; depends=[mvtnorm Matrix MASS]; }; GenSA = derive { name="GenSA"; version="1.1.4"; sha256="0ph3n0hv7p8i03by42hl0f2b1kmhpvyvd7rfgay2wl9lknfsq0vv"; depends=[]; }; @@ -730,20 +745,20 @@ GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd8 GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; }; GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; }; GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; -GetoptLong = derive { name="GetoptLong"; version="0.0.9"; sha256="0gmhjd19vqd1jc9bj09715j33c5axrza2nw3w5kqgkh42qw4rsmh"; depends=[rjson GlobalOptions]; }; +GetoptLong = derive { name="GetoptLong"; version="0.1.0"; sha256="1r86bffsj6s8d71wngspqvfv0gyrrpihf225b4v3c69c05n36qm1"; depends=[rjson GlobalOptions]; }; GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; }; GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; }; GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; }; -Gmisc = derive { name="Gmisc"; version="1.0"; sha256="0i92f9v9h4d7vxzzgafwhy8bwf52djqb3mxsaqqz2in68fdywdqq"; depends=[htmlTable lattice sp Hmisc forestplot]; }; +Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[Rcpp htmlTable lattice Hmisc forestplot abind knitr magrittr Rcpp]; }; GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; }; GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; }; GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; }; GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; }; GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; -Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-4"; sha256="00qnvi5f5mywknir67rbn36hz8s1x71y1jkkj4nrp60d15vh6hk7"; depends=[sp rgeos]; }; +Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[sp rgeos]; }; GriegSmith = derive { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; }; GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; }; @@ -776,7 +791,7 @@ HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp2 HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; }; HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; }; HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; }; -HSAUR3 = derive { name="HSAUR3"; version="1.0-3"; sha256="0v7nvgybfkwzii1019p8yxnbny5y1y1nrqaa81xagi8a1f1klrzl"; depends=[]; }; +HSAUR3 = derive { name="HSAUR3"; version="1.0-4"; sha256="1m2nqvm0ma5rmwwn27nzzyjzq8c0awsrrjjrnyaj50bcnmg0x0k6"; depends=[]; }; HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[lattice coda MASS MCMCpack]; }; HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; }; HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; }; @@ -792,8 +807,8 @@ Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbc HapEstXXR = derive { name="HapEstXXR"; version="0.1-7"; sha256="1jarb0465yymb08r8dr0mn6qlwbf0y0c4ipvxvcfwlvqalbp2kd6"; depends=[survival]; }; Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; }; HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; -HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.4"; sha256="0098n5m3svcc3z5cvmqygazlvm1dzd4zfbpj1q9zqs5wr3407wcv"; depends=[mice]; }; -HiClimR = derive { name="HiClimR"; version="1.1.5"; sha256="1kzlp2plprrsqidfikiri0bvj67m3lfy3ansrx1vi9b5ji6lf9n8"; depends=[]; }; +HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; }; +HiClimR = derive { name="HiClimR"; version="1.1.6"; sha256="0x63vh8sk5a37dal5s6j8pkxxym8f8f0cjjinriys5pi8iq6yfmr"; depends=[]; }; HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive { name="HiDimDA"; version="0.2-2"; sha256="0y45c7yi20ixr7d8zmjsbxsc9kvvwpdw49qncpz5l5wmdmzhy8mm"; depends=[]; }; HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; }; @@ -801,11 +816,12 @@ HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; }; HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryzry1rvqcfpkjm9vibc6lv864fvcjmr2z8ianiqrrn6p"; depends=[]; }; HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; }; +HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[FactoMineR class ggplot2 histogram]; }; HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; }; HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; }; HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[RColorBrewer plyr jpeg png rgl xtable tkrgl]; }; Hmisc = derive { name="Hmisc"; version="3.15-0"; sha256="0i2k64yji4c3sicfa89af220hz48hz74dqjfqdjs0417nzs5sn8q"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign]; }; -Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1n6rarygdfqi7rjdqxi5j3xn1pzakvyfp5q9h9173vypxbmrk5p7"; depends=[TimeWarp]; }; +Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; }; HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; }; HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; }; Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; }; @@ -860,24 +876,25 @@ IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99 InterVA4 = derive { name="InterVA4"; version="1.5"; sha256="0w2klq9dara941d4xz85qrq8dcp7vpc6rrz2k9ry01rsnpdzzybh"; depends=[]; }; Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; +Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; }; Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; }; InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.1-4"; sha256="01yjkqj1k7haa75avcqhkxjm6569c2ds8fydz3spcmx37l2xafdp"; depends=[glmnet mboost]; }; InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; }; -IsingSampler = derive { name="IsingSampler"; version="0.1.1"; sha256="068fy16fw2ja25mllyw4z3bn17pxdq17zg75zwlwmljds6psa1gk"; depends=[Rcpp plyr Rcpp]; }; +IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; }; Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; }; IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[Iso xtable ff]; }; IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; }; JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; }; -JAGUAR = derive { name="JAGUAR"; version="1.1"; sha256="0iy91hx4rcsx84kazkmq0jnl6gqnc1cmbkb957y0v2zr9adpqs4y"; depends=[Rcpp plyr lme4 doParallel Rcpp]; }; +JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[Rcpp plyr lme4 doParallel Rcpp]; }; JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqacp6k0y182lsvfl1ri54aq1hg4ypb51b8ibb"; depends=[foreach gplots colorspace plotrix]; }; JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; }; JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; }; -JMbayes = derive { name="JMbayes"; version="0.6-1"; sha256="1zshy4v7jj3r1vcp9yrw1jj5abmc8wkglsxdb5v6rpmk4xwhvvcq"; depends=[MASS nlme survival]; }; +JMbayes = derive { name="JMbayes"; version="0.7-0"; sha256="03cm3h2f4m96bhpgk53c4g5mpypc3b6s63srlyrx8ndwgx0aqzf3"; depends=[MASS nlme survival]; }; JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; }; JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; @@ -894,6 +911,7 @@ KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kaj KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[e1071 plsgenomics class]; }; +KOGMWU = derive { name="KOGMWU"; version="1.0"; sha256="0nk7vbppimrf01wnxsg2wjpagjrzs6gh3a6jlqy9bdfh0j4fm0kn"; depends=[pheatmap]; }; KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; }; KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; }; KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; }; @@ -924,13 +942,15 @@ LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh0 LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; }; LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; }; LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; +LLSR = derive { name="LLSR"; version="0.0.1.9015"; sha256="1dmk7km1qbc9m90qh8dp95g44jxqhvama9svzyh7vqxpww2hs9sb"; depends=[rootSolve]; }; LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; }; -LMest = derive { name="LMest"; version="2.0"; sha256="0fv38rb9hwlbay632hhb58vga48sq89chm5qn61l6mf3wfkx2rcg"; depends=[MASS MultiLCIRT]; }; +LMest = derive { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csydx55by4zd9h13lnaibdxr4xn5q"; depends=[MASS MultiLCIRT]; }; LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; }; LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; }; LPS = derive { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-4"; sha256="13hbwg05p48i2gg9i379msb78k35m6kqj8l29cmrpqm1gcdyh3sg"; depends=[RColorBrewer]; }; +LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; }; LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; }; LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; }; @@ -951,7 +971,7 @@ Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14d LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; }; LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; -LeafArea = derive { name="LeafArea"; version="0.0.5"; sha256="1fjb4mcp09xfsgv5ppza4hnhswb5z0qrjmhhpi4sfxlsl3nb4his"; depends=[]; }; +LeafArea = derive { name="LeafArea"; version="0.0.6"; sha256="0n5znjxs1ixnlzx248jkhjpglzvb3wzxaqng9vi02smwlwaszvwn"; depends=[]; }; LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; }; LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; }; @@ -976,13 +996,13 @@ MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; }; MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; }; MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; }; -MAMS = derive { name="MAMS"; version="0.3"; sha256="17d75phlxi9267dwpzmnzpk01l69xvcdqjjabj0ai7j2l6llp2n9"; depends=[mvtnorm]; }; +MAMS = derive { name="MAMS"; version="0.4"; sha256="0v4sa8cyjdkg7lrznl7jv8xqm6qf67jf946fd6ymbd0wpd7gxrgp"; depends=[mvtnorm]; }; MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; }; MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv446pdw4gw5qzxp85hgvm8bvg"; depends=[forecast]; }; MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; }; MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; }; -MASS = derive { name="MASS"; version="7.3-37"; sha256="0icxsmihsk7xkf2f97asjmrwri04ykr5dq0ap343ngpxddvwjaaf"; depends=[]; }; +MASS = derive { name="MASS"; version="7.3-40"; sha256="05mmbhswp5dqjd2c6v9w1z1710sm46d53j3prq8maj6bc9qr634y"; depends=[]; }; MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; }; MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; }; MATA = derive { name="MATA"; version="0.2"; sha256="0jmsgis1jkyqywa4i5rq5inb72hsgc9s4xwmaqyfdnfa6lw44sfx"; depends=[]; }; @@ -1001,6 +1021,7 @@ MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrm MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; }; MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; }; MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; }; +MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; }; MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.5"; sha256="19dznc7iyifkc3lap9nlsq7n8c0h4xbqrxqb6nj1aqa0nlfi0aqw"; depends=[MCMCglmm ggplot2 coda]; }; MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; @@ -1022,11 +1043,10 @@ MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949r MFDA = derive { name="MFDA"; version="1.1-4"; sha256="0zf21al8ivmsxlf1i7kc01w0jx3s6650a034cdynz7axnxx28ncx"; depends=[gss mvtnorm]; }; MFHD = derive { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[fda_usc deldir depth depthTools matrixStats]; }; MGL = derive { name="MGL"; version="1.1"; sha256="17xkrq0wzq1gfa6k1lgf34l4ibwjk6j9rnig3l403zpykmf2ffs6"; depends=[]; }; -MGLM = derive { name="MGLM"; version="0.0.6"; sha256="00kz2l7xn9df8n0035i2rkgj6rlb99y9z68935q8px70njs8rl87"; depends=[ggplot2 plyr reshape2]; }; MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; }; MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; -MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; }; +MIICD = derive { name="MIICD"; version="2.0"; sha256="0q13vlm8xq99y3gixdjxcab65sjw3gjv596rq9zl768p90dgr6cm"; depends=[survival riskRegression MASS]; }; MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; @@ -1055,6 +1075,7 @@ MPV = derive { name="MPV"; version="1.35"; sha256="0mfg05w7zx5my7g60yvbk2fiakrds MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; }; MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; }; +MRIaggr = derive { name="MRIaggr"; version="1.0"; sha256="17p3syy1n00vanisc0r8l8g5v7f3xdbvqbg9p6zsxirdpm9mq075"; depends=[Rcpp RANN spam Matrix ROCR fields mritc oro_dicom oro_nifti Rcpp RcppArmadillo]; }; MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; }; MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; }; MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; }; @@ -1072,7 +1093,7 @@ MTurkR = derive { name="MTurkR"; version="0.6"; sha256="0kmi1x9xsqwi7llgwmkmnkn2 MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; }; MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; }; MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; -MVN = derive { name="MVN"; version="3.8"; sha256="0n33bp8iqj4dmm4p5vgj32dcaqxqrscv4wy9471hh3wwq938cnag"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; }; +MVN = derive { name="MVN"; version="3.9"; sha256="1l6bib1gl5nj7p1dk6mbmflp9p5sgm405q3l53pqmq09jm55flh6"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; }; MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; }; MVar_pt = derive { name="MVar.pt"; version="1.0"; sha256="0wzc2r5psla8khyrkd7p8y23cxyn5bsy8vxglh2p3mpayfzi8k2a"; depends=[]; }; MXM = derive { name="MXM"; version="0.3"; sha256="14kw4shc0jp6jrs8afimy13jssah0agwa3p5ay2py1zfid43k63y"; depends=[gRbase VGAM MASS pcalg survival]; }; @@ -1091,7 +1112,7 @@ Matrix = derive { name="Matrix"; version="1.1-5"; sha256="0kqbabpzin7j33cjx6na3q MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; }; MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; }; -MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.1.2"; sha256="0s6nwc7y4zhl72ynmrna7g65rhx9y7jrwcdhwlg30nhvr55ibrgx"; depends=[dplyr rgdal rvest sp stringr]; }; +MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.2"; sha256="0cwqcxkcily3wdg756s9i9brcrhp8pz4q9gkmqfsi6i0l4rkk7fi"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; }; McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; }; @@ -1111,12 +1132,12 @@ MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1r MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; }; Metatron = derive { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 mpt Matrix]; }; Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; }; -MethComp = derive { name="MethComp"; version="1.22"; sha256="0wp2v8z5y9nl3jalcl2a42z2fpkwkzkvl407farws0yih0hj8b8l"; depends=[nlme]; }; +MethComp = derive { name="MethComp"; version="1.22.1"; sha256="0p4ikf3mgd2syk9rsp6v1kd4vhg3h43krw8mhl3771shrh9bnivb"; depends=[nlme]; }; Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; }; MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; }; MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; -MicSim = derive { name="MicSim"; version="1.0.6"; sha256="01w9x3ld8b64m3d9qjbja6gbmgnsj2bna9l7lisa17add0i11744"; depends=[chron snowfall rlecuyer]; }; +MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron snowfall rlecuyer]; }; MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; }; MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; }; @@ -1125,7 +1146,7 @@ Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0 MissMech = derive { name="MissMech"; version="1.0.1"; sha256="0xcxzgjv9p9w8rdq07vanfrw0b49acdikr8brm78hshy0dsnas32"; depends=[]; }; MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; }; MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; }; -MixGHD = derive { name="MixGHD"; version="1.3"; sha256="1fqy0ismqzg6g4x1m82kabywfg0jnmh397py0jra2ck3gr0wizsf"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; }; +MixGHD = derive { name="MixGHD"; version="1.4"; sha256="0c7d9yf4hl7s8a1alzxjs12kcq98s9wna277vw20rnxa60b6dsqm"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; }; MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; }; MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; }; MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; }; @@ -1135,15 +1156,15 @@ Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla56 ModelGood = derive { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; }; Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; }; -MonetDB_R = derive { name="MonetDB.R"; version="0.9.5"; sha256="0j5b2i1yyk4d6mqm2i3fijmmgp1fzi37rilxcikbc517mzsk4f7p"; depends=[DBI digest]; }; +MonetDB_R = derive { name="MonetDB.R"; version="0.9.6"; sha256="0mi7sxiqdih3lh0ki70cmr1qp62cqr2s88s0jjqcbigxsc1n7gg6"; depends=[DBI digest]; }; MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; }; Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; }; MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; +MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[svcm lattice]; }; MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot plyr gsubfn coda xtable lattice texreg]; }; Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp Rcpp RcppArmadillo]; }; -MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; }; MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; -MuMIn = derive { name="MuMIn"; version="1.12.1"; sha256="1l9grnhsw0bw6hh1s4wk9f5ljsy7caa8iagq55n8yzciik4cif9l"; depends=[]; }; +MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05qjmzv80bkp3ib45x7i05s2mqy1yxn"; depends=[]; }; MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; }; MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; @@ -1157,18 +1178,17 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; -NAM = derive { name="NAM"; version="1.0.2.2"; sha256="1p2c95fiv1mb5ja3l6d8scnvlbmiwwgbln24z7nqwpmskc5d6dbd"; depends=[Rcpp Matrix missForest Rcpp]; }; -NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; depends=[plyr NanoStringNorm]; }; +NAM = derive { name="NAM"; version="1.1"; sha256="1iiwbfwdjsv8mdgqn7819x36675mz345djf1dbyni0h46dpc1q4w"; depends=[Rcpp Matrix missForest Rcpp]; }; +NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; }; NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; }; -NCBI2R = derive { name="NCBI2R"; version="1.4.7"; sha256="1hjjnkwv5dxisa6amd9bb9l4g4c4525ykg1vnjr31csg5vmzvyfx"; depends=[]; }; NCmisc = derive { name="NCmisc"; version="1.1.3"; sha256="051qbqsvqb5wivba8msdhswfg0cxyxnyp601zgb1zvzcnbrffimg"; depends=[proftools]; }; NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; }; NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; }; NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; }; NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit msm MCMCpack MASS Rcpp Rcpp]; }; -NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; }; +NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; }; NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; }; NLP = derive { name="NLP"; version="0.1-6"; sha256="19ynrfzj70swlk6z1r8bh23dzdk2qk8z0bk3xn39vpv0wplyc9i3"; depends=[]; }; @@ -1178,8 +1198,8 @@ NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMOF = derive { name="NMOF"; version="0.34-1"; sha256="0agh22p4rr3dfq1wipm2435hvb932wf9vp0r5992g3wbfnphs29g"; depends=[]; }; NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; +NORRRM = derive { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; }; NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; -NPBayesImpute = derive { name="NPBayesImpute"; version="0.4"; sha256="0r2b878xs2vjvskhz63cyizaa7qfw06sq120m8xnm5ra4r55c0fc"; depends=[Rcpp Rcpp]; }; NPCD = derive { name="NPCD"; version="1.0-7"; sha256="11h460h1q50qixr2hk4wd4v6wgwblp3cqvksbzqkdcinzzp8z6zh"; depends=[BB R_oo R_methodsS3]; }; NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; }; NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; }; @@ -1188,12 +1208,12 @@ NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby01 NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPS = derive { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; -NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; }; NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; }; -NSM3 = derive { name="NSM3"; version="1.1"; sha256="0xyx06pc9690akdm02597pgcchn29gvc4kzcgyc3ihsjj71xryi2"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; }; +NSM3 = derive { name="NSM3"; version="1.3"; sha256="0vmv7r499ig2fq2gwx78jdrflk5i55jy3vgjh87ygwlyhwj9cm8p"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; }; +NSUM = derive { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; }; -NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.17"; sha256="02jvrrz4cmr7l35s7xh0mmwmr5l5lga1vnph2rij2lb8124ardf5"; depends=[gdata]; }; -NbClust = derive { name="NbClust"; version="2.0.3"; sha256="1wphzfb63j85na2l8plc02wmkpvzwi8wp8q8i04jf1n265fa378l"; depends=[]; }; +NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.19"; sha256="0nrhsg32f6381snsxivcnznl752y9jmdscrcn1j8xylwmwc0r4hj"; depends=[gdata]; }; +NbClust = derive { name="NbClust"; version="2.0.4"; sha256="01r76gfg1lyajkh5x18pcqzp8iw0g3kfq5q8liv351l9wgykj34g"; depends=[]; }; NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; }; NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; }; @@ -1202,13 +1222,13 @@ NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwva NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; }; NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.1"; sha256="1gxlv595jxbvpis1vp1bxkspwhqk32f0d0lhkzah8d5ijjzdqihf"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; }; -Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; }; +Newdistns = derive { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; }; NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; }; NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; }; NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[mirt gmodels MASS]; }; NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; }; -NormPsy = derive { name="NormPsy"; version="1.0.2"; sha256="0vkk282kiqvfx2qvan8yifpngrx3slyjqr2dwqr5h5k5snb6b0vq"; depends=[lcmm]; }; +NormPsy = derive { name="NormPsy"; version="1.0.3"; sha256="0lp6b7hh36ipmsv395xk671f7sczlfz5f9x0h88b2q6zvgbk081v"; depends=[lcmm]; }; NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; }; NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; }; Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; @@ -1228,9 +1248,9 @@ ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; }; ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; }; ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; -OUwie = derive { name="OUwie"; version="1.43"; sha256="1ixyws6q9p8kms3smzj8rkmsry2y4s9al4vhxpqfmbgypigq7n9k"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; }; +OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; }; Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; -OceanView = derive { name="OceanView"; version="1.0.2"; sha256="188hviv2dqvc1d7aki3a80naiy31lq27d8cc755mq4qdqq833l4d"; depends=[plot3D plot3Drgl rgl shape]; }; +OceanView = derive { name="OceanView"; version="1.0.3"; sha256="0k281r358xg599n3h4avwbhnhgcfdawf36p8k3sxwv29292npkzv"; depends=[plot3D plot3Drgl rgl shape]; }; Ohmage = derive { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; }; OjaNP = derive { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; }; OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; @@ -1280,7 +1300,7 @@ PCIT = derive { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; }; PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; }; PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; }; -PDQutils = derive { name="PDQutils"; version="0.1.0"; sha256="0s6k58l2rrgymg3l4b8s9rvnqlrhcm2pvsrr3gc2x2f846g7pxny"; depends=[orthopolynom moments]; }; +PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; }; PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; }; PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; @@ -1309,17 +1329,17 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m PMCMR = derive { name="PMCMR"; version="1.0"; sha256="07k98zp4s65vx7ybj75b0i1jhlnvfspwjqh10nxdn0zmixw9nywj"; depends=[]; }; PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; }; PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; -PRISMA = derive { name="PRISMA"; version="0.2-2"; sha256="0r4dhnp0f6q43iklmwjim20hy9wjijkh8q4gljx8sph47njc0xqd"; depends=[Matrix gplots ggplot2]; }; +PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; }; PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; }; PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; -PRROC = derive { name="PRROC"; version="1.0"; sha256="0md8mbbld0y0p2y9crz3np5pj5b7z3a4j7ixz2jn9gld28bydgk0"; depends=[]; }; -PReMiuM = derive { name="PReMiuM"; version="3.0.32"; sha256="03hs56vhl2xxxy2mza6cp0zivr1p596x5jj4y8f63jy0mygk62x8"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; }; -PResiduals = derive { name="PResiduals"; version="0.2-0"; sha256="0bjn600wq8h11spi20q3gdv9ajrvagjyw6a8pfmm3pvangasq2nl"; depends=[Formula rms sandwich actuar]; }; +PRROC = derive { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; }; +PReMiuM = derive { name="PReMiuM"; version="3.1.0"; sha256="0k8fffsbbdknmv1vshb72mdh7qfdqkrrh41s0ld64ziwnmp3gz23"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; }; +PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[MASS Formula rms sandwich actuar]; }; PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; }; PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; -PSCBS = derive { name="PSCBS"; version="0.43.0"; sha256="1pv61ha8c2hx91hik9n6fz2gxdhijgcsdjhznaml5v1d5ba3vzjj"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; }; +PSCBS = derive { name="PSCBS"; version="0.44.0"; sha256="1bpvqn2p8pw57dpwk1mr51rsiqirk5sywrycqwbazvjr7hkiqa3d"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; }; PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; }; -PST = derive { name="PST"; version="0.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; }; +PST = derive { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[TraMineR RColorBrewer]; }; PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm264x32371rbgbzmyzx89ap2c0cq"; depends=[tensor]; }; PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; }; PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; }; @@ -1339,7 +1359,7 @@ PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf7 PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; }; PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; }; Peptides = derive { name="Peptides"; version="1.0.3"; sha256="06q4sdm3yy5rjkfr6yqkmgjsr1bhrbpghyjqkzqh416wc4lnp073"; depends=[]; }; -PerFit = derive { name="PerFit"; version="1.2"; sha256="1m0s51k497ks4y5253sw1aq5cdkhfkr70mz31xk01c50v11mb268"; depends=[ltm irtoys]; }; +PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[ltm mirt fda Hmisc irtoys MASS Matrix]; }; PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; }; PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; }; PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; @@ -1352,15 +1372,17 @@ PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1a PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; }; PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; }; PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; +PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; }; PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; -PoisBinOrd = derive { name="PoisBinOrd"; version="1.0"; sha256="0jzn0knw61hrazl9xrbqis4j6kj4ipd077vkv6fadpcwxhhi2p2m"; depends=[corpcor GenOrd Matrix mvtnorm]; }; +PoisBinNonNor = derive { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; }; +PoisBinOrd = derive { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; }; PoisNonNor = derive { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; }; PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; }; PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; }; Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; }; -PopED = derive { name="PopED"; version="0.1.2"; sha256="1rwmpbs3zhkhhfg19n23i3821i2vdn1w4fqqvyqsfjdmnasxsg91"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; }; +PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; }; PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; }; PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iyfdm7ql4gn98wcj1v99llcpaaba78ca7dm83n"; depends=[ff]; }; @@ -1409,14 +1431,14 @@ QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8 QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; }; Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; }; R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; }; -R_devices = derive { name="R.devices"; version="2.12.0"; sha256="0as90warygvcsa5cvicjykn7jz2d5cdw68ghqi9cj5lzqq982dkn"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; -R_filesets = derive { name="R.filesets"; version="2.6.0"; sha256="0n99mxdajb6rk7cvgy4gihaifiw31llngrhx22mfn3zs7wbdk9d1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; -R_huge = derive { name="R.huge"; version="0.8.0"; sha256="00iiz1q6a5ywsidiwy6lnxjw0ig75ri914dqr7cbfccdf66fb840"; depends=[R_methodsS3 R_oo R_utils]; }; -R_matlab = derive { name="R.matlab"; version="3.1.1"; sha256="15j1mshzv1lpjlsdcjg45khdvl0w8mqwd387i1lc0zv1r29m6mn9"; depends=[R_methodsS3 R_oo R_utils]; }; -R_methodsS3 = derive { name="R.methodsS3"; version="1.6.1"; sha256="1c3f64bvnpxfb3k2g7z3a6qms36z0n2hflw5w5952c82jx10cl0x"; depends=[]; }; -R_oo = derive { name="R.oo"; version="1.18.0"; sha256="0difa5258i59vb538xp9p1jkzzrbmm8l35gqhpchfxk5dhn2cq9a"; depends=[R_methodsS3]; }; -R_rsp = derive { name="R.rsp"; version="0.19.0"; sha256="0qh9nd6zpiw4c86qlwys8g7rqvay20m1yfp2zrvah5bz51hixbd1"; depends=[R_methodsS3 R_oo R_utils R_cache]; }; -R_utils = derive { name="R.utils"; version="1.34.0"; sha256="1brpj67px14d1y5ax3j49sbf7dnnj1rcbhli5ph44y65snrmdaih"; depends=[R_oo R_methodsS3]; }; +R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; +R_filesets = derive { name="R.filesets"; version="2.7.0"; sha256="12aghswi40qr6n6rzyv2bpy1wlp61ij7h1yblbhlmdk3p4rd0bs1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; +R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; +R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; }; +R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; }; +R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; }; +R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; }; +R_utils = derive { name="R.utils"; version="2.0.0"; sha256="1ldrz6nj45mnggk1zsx8j479kzfi2pjp402zid5yrnqmh50q61sb"; depends=[R_oo R_methodsS3]; }; R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; }; R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; }; R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; }; @@ -1424,12 +1446,13 @@ R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz6 R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; }; +R2MLwiN = derive { name="R2MLwiN"; version="0.8-0"; sha256="1fjns3v6prjkd4iwdcj846sj5ji1bg4b7axxx18wlsvrin83gd9k"; depends=[lattice coda Matrix foreign rbugs digest]; }; R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-2.2"; sha256="0hnp46linvpnzifhyb3r13xmwvdc3psabs53xl6qxxm4snrl4bnd"; depends=[coda boot]; }; R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; }; -R2SWF = derive { name="R2SWF"; version="0.8-2"; sha256="1lyhzz2gpa3l7ljkdxfdx5s0g87jvgz2h9awgapkjsm6gxy922n2"; depends=[sysfonts]; }; +R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; }; R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; }; R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnwsa121g93rrr7q9dq0xxvkl3lsbn6f2s"; depends=[]; }; -R2jags = derive { name="R2jags"; version="0.05-01"; sha256="0lswadb5n2x7afz5b634cc1xkj60hykhibqq488sgcm80r1xx278"; depends=[rjags abind coda R2WinBUGS]; }; +R2jags = derive { name="R2jags"; version="0.05-03"; sha256="02r68g005cmcc7dg1a52awdyak2sg2pszpl6ckw4bw19sk9nnd48"; depends=[rjags abind coda R2WinBUGS]; }; R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; }; R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; }; R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; }; @@ -1467,13 +1490,14 @@ RDS = derive { name="RDS"; version="0.7"; sha256="0xlz1pkgznk6x3298f6b40l9h26y0a RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; }; RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; -RDota = derive { name="RDota"; version="1.1"; sha256="157psqwg27y7sq75lcp0grn98f6zriljfaysfxsbqmlhlihhl6rb"; depends=[]; }; +RDota = derive { name="RDota"; version="1.2"; sha256="1r56s4ii37szmdwgbnlw2g9576kjvyc79nvnfrsgr5mys62pbrzs"; depends=[XML]; }; REBayes = derive { name="REBayes"; version="0.50"; sha256="0p4kv709r0577xq3mdw2vwla1gsjm8b9mnbsbfwm8fx3n3wfrx0p"; depends=[Rmosek Matrix SparseM]; }; RECA = derive { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; }; REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fzwmsqvwpr74phcapkckczyznlfql4qdh1"; depends=[httr plyr stringr]; }; REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; }; REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; +RESS = derive { name="RESS"; version="1.0"; sha256="0p6zfvakq4c02qp26l8zqcmi95na408rv6j6ibaxbcyf5vq9rhcs"; depends=[]; }; REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; }; RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; @@ -1482,7 +1506,7 @@ RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0z RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF randomForest ggplot2 UsingR WilcoxCV ROCR]; }; RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; }; RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; -RGA = derive { name="RGA"; version="0.2"; sha256="0swldzk7q8drjs8ca7ibbkrrgi4mbwf6hvc1jdq4aswqay783vl4"; depends=[httr httpuv RCurl jsonlite shiny]; }; +RGA = derive { name="RGA"; version="0.2.1"; sha256="14fyd65n75m4xjdp019xdp3sa6h6j3ip6yr42b4nn1cxgkjplbnm"; depends=[httr httpuv RCurl jsonlite shiny]; }; RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; }; RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; }; RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[copula RGENERATE blockmatrix Matrix stringr RMAWGEN]; }; @@ -1499,17 +1523,17 @@ RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; }; RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; }; -RISmed = derive { name="RISmed"; version="2.1.4"; sha256="1gsy55g3mw5qkam1nswy851dw8gqf4miqzczm75np8chmlczy3b2"; depends=[]; }; +RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; }; RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; }; RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j7irs205rn5lpknlmc8as3v1ziigi4d51"; depends=[rJava]; }; RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; depends=[Rcpp Rcpp]; }; RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; }; RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; }; -RJSDMX = derive { name="RJSDMX"; version="1.2"; sha256="0b4w2qva19av76gjwbdccf6gwfc2fia31pvbhgv1a48p272kxzni"; depends=[rJava zoo]; }; +RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; }; RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; }; -RKEA = derive { name="RKEA"; version="0.0-4"; sha256="0qkjnyy4b6vzdiapadx9hmw3h4gfgmbi4g5078rr6kq5kmwqlwgh"; depends=[rJava tm]; }; +RKEA = derive { name="RKEA"; version="0.0-5"; sha256="0ni5vdv5pjyl1kshqlp0vh7jfpn098949nwczz2ylk3qqs2hj0vm"; depends=[rJava tm]; }; RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; }; RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; RMAWGEN = derive { name="RMAWGEN"; version="1.3.0"; sha256="19p8bxcfk802pdn6990ya0bd9ghbvg8vmk3z01x1v76w09j4bv38"; depends=[chron date vars]; }; @@ -1520,23 +1544,24 @@ RMOAjars = derive { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76 RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; }; RMTstat = derive { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; -RMark = derive { name="RMark"; version="2.1.9"; sha256="1z7hh9fwaaiwa2s27vrc3yckqc0vhimazqj71601ibsqs3pljzh8"; depends=[snowfall matrixcalc msm coda]; }; +RMark = derive { name="RMark"; version="2.1.12"; sha256="0b8yzng9c74yxl1a1nkc4knf2a9114mjkis19b1pdnclyxcnx45z"; depends=[snowfall matrixcalc msm coda]; }; RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; }; RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; -RMySQL = derive { name="RMySQL"; version="0.10.1"; sha256="0aqs2zjhzn4arpbshhssn7y0m2w0ghq91iapbwylab6mp97mxch8"; depends=[DBI]; }; +RMySQL = derive { name="RMySQL"; version="0.10.2"; sha256="1yzlldgnncbd8aqkhphnwb8bk164ds4ql3hq1h2qdlicf6x806kz"; depends=[DBI]; }; RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; }; RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; }; RNeXML = derive { name="RNeXML"; version="2.0.1"; sha256="10p9njlrpkwgnyjkcz7w579dwi0nwdmksyl2gpbq106fzqvh0s47"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; }; RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; }; -RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; }; +RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[reportr oro_nifti]; }; ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[RCurl digest]; }; ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; }; ROCR = derive { name="ROCR"; version="1.0-5"; sha256="0xxhr31l1k9gs99yw1plnp4m5c33mp4dy3sdfhf33i57gi3yww0a"; depends=[gplots]; }; +ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; }; ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; }; ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; -RODBC = derive { name="RODBC"; version="1.3-10"; sha256="0rvizr285g0hcsyjbvc2038f0mmw2cg6iwvgb3igkb5z92059iqc"; depends=[]; }; +RODBC = derive { name="RODBC"; version="1.3-11"; sha256="1j6qv7w4klgwzdx9jf6h4l1x1idn3rka70ql37pbnzga1h5dr9yy"; depends=[]; }; RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; }; RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; }; @@ -1544,7 +1569,7 @@ ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3 ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; }; ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; }; ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; -RObsDat = derive { name="RObsDat"; version="14.12"; sha256="1b8yfp8n1ky1vmr2w2ghfpha9n7gc6x6v1kaf9llrhb6spx2w18i"; depends=[zoo spacetime xts DBI vwr e1071 sp]; }; +RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[zoo spacetime xts DBI vwr e1071 sp]; }; ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; }; ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx RandVar evd]; }; ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[ROptEstOld RandVar distr distrEx]; }; @@ -1561,7 +1586,7 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; }; RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp Rcpp]; }; RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; }; -RRreg = derive { name="RRreg"; version="0.2.0"; sha256="0pni738yc236p8aafzjha5589i8bll3b075k0fync2mkc1v4czln"; depends=[doParallel foreach]; }; +RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; }; RSA = derive { name="RSA"; version="0.9.6"; sha256="1hi3spj0nbl08zszkqp1xxcq2qw3j4zkihrhhn20gacgsqi7k19w"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; }; RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; }; @@ -1584,7 +1609,7 @@ RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqr RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RJSONIO RCurl]; }; RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; RSurveillance = derive { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epitools epiR]; }; -RSurvey = derive { name="RSurvey"; version="0.8-2"; sha256="1fksjbzny0wl0k2sj3bxflzim7i8r5dfwz9ih4ssk5xaxfmjz2f5"; depends=[sp rgeos MBA]; }; +RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[sp rgeos MBA]; }; RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; }; @@ -1593,7 +1618,8 @@ RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax5 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; }; RUnit = derive { name="RUnit"; version="0.4.28"; sha256="0p631cg014m7linml2770g260ml0jj74d5w82ddl1p2zs5yq57hx"; depends=[]; }; -RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-41"; sha256="039263c10wlj4xyb696mcidndm1vkxwrghramvvgyivd7ybk3flw"; depends=[ade4 boot car lme4 MASS mixOmics statmod]; }; +RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-45-2"; sha256="1c2hmkc34qgi942i4pnw61lk0z6kd4j9424zqqscm77zscfmrmcw"; depends=[ade4 boot cramer car lme4 MASS mixOmics multcompView nnet pspearman statmod vegan]; }; +RVFam = derive { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme survival lme4 kinship2 MASS Matrix]; }; RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; }; RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp Rcpp]; }; RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; }; @@ -1619,21 +1645,20 @@ RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l2 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; }; RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; }; -Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; }; +Rarity = derive { name="Rarity"; version="1.3-1"; sha256="0l2sz254s5jydv5f15ilrnna2mih06ipsy9lbdi2si3j221vq9k3"; depends=[]; }; RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; }; RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybkahn3p51m6jnkydwgrchp53pby8ljxy"; depends=[plyr RCurl gdata data_table stringr]; }; Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; }; Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; }; Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; -Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v9wlh2wyp086r2vi6bia9j8sxhi0c"; depends=[proto plyr reshape ggplot2 digest]; }; Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; }; -Rcmdr = derive { name="Rcmdr"; version="2.1-6"; sha256="0mxn0z8nllanhh8q1mnjc0y5kwxzw879k8s6mqz5azm282qk68mj"; depends=[RcmdrMisc car tcltk2 abind]; }; +Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[RcmdrMisc car tcltk2 abind]; }; RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; }; RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[Rcmdr BCA flexclust car RcmdrMisc nnet foreign rpart rpart_plot]; }; RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; }; -RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-1"; sha256="0fn12acbjh0n402hn9whhhyij3jlwmvlawyfi9myimnb4wyaqgwb"; depends=[R2HTML abind ez nortest reshape Rcmdr]; }; +RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[R2HTML abind ez nortest reshape Rcmdr RcmdrMisc]; }; RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[Rcmdr epiR abind]; }; RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.27"; sha256="00yk41f8d7z602xb3hpkk0zr2r17d9ap6sx78ni8wl7rkvmn0c7r"; depends=[Rcmdr]; }; RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[Rcmdr EcoVirtual]; }; @@ -1643,9 +1668,9 @@ RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256=" RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[Rcmdr MAd metafor]; }; RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; }; -RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0"; sha256="1646xy5q40r9liaqvlwmh9fscm2ggfdfb713gpxqzrv4kwgaddji"; depends=[mixlm MASS pls xtable Rcmdr]; }; +RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[mixlm MASS pls xtable Rcmdr]; }; RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[Rcmdr runjags rmeta igraph coda rjags]; }; -RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-17"; sha256="0asqvl99x03irnidjs72m6x4x3v8xlaikhfk0zk85v0l21lgy4iv"; depends=[Rcmdr pROC ROCR ResourceSelection]; }; +RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[Rcmdr ROCR pROC ResourceSelection]; }; RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[SCVA SCRT SCMA Rcmdr]; }; RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[SLC Rcmdr]; }; RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; }; @@ -1668,24 +1693,25 @@ RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9j RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[survival date Rcmdr]; }; RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; }; -Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; }; +Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; }; Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; -Rcpp = derive { name="Rcpp"; version="0.11.4"; sha256="0ar50r6cbvbd0crc47cm34lnrmzfzzv5fmhd2qa60br55rpxbhf6"; depends=[]; }; +Rcpp = derive { name="Rcpp"; version="0.11.5"; sha256="0vmdprnf2i0hvy4pz5v0zdvwgyfv1kgmiwdgjjxppz5p84n59xs9"; depends=[]; }; Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; +RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; }; RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.5"; sha256="1acgwwcgb7qqvwg3j0qk7jvk3nb76zw0lqn8bswywvgawalw49ah"; depends=[Rcpp Rcpp BH]; }; -RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.600.4.0"; sha256="0qd20bs0h5kvk0433hhslm4qzddchv8vnaynvnzicjjwq3adgi2g"; depends=[Rcpp Rcpp]; }; +RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.650.1.1"; sha256="1i11nnkbzhk0sckj29fza32g45jkkjh11yx4q78byhawpr8s30jq"; depends=[Rcpp Rcpp]; }; RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; }; RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; }; RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; }; RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic Rcpp RcppClassic]; }; RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; }; -RcppEigen = derive { name="RcppEigen"; version="0.3.2.3.0"; sha256="16n5zkjnf1vipicx7fsr278p99agdbxgg3gjz9xq205frm9cx25a"; depends=[Matrix Rcpp Rcpp]; }; +RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp Rcpp]; }; RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; }; RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; }; RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; }; -RcppParallel = derive { name="RcppParallel"; version="4.3.3"; sha256="1xsp44jfynvz6flfajgbf82aykdhz242brmwxw9w67ngx96x0dxv"; depends=[]; }; +RcppParallel = derive { name="RcppParallel"; version="4.3.6"; sha256="007jbx16kixnk4b3081iplwa3qjdaqr4jbikhw0fsfdg2ws1ps2s"; depends=[]; }; RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; }; RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; }; RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; @@ -1716,7 +1742,7 @@ RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhgh Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; }; ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp Rcpp]; }; RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; -ReporteRs = derive { name="ReporteRs"; version="0.7.2"; sha256="0lcxyj0dgm5l4pjsx9whbszzsn3zk7s4jjqbkrgb5b6rvxw1s29s"; depends=[ReporteRsjars rJava]; }; +ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m2653xfcl4d6zs010hzcjxr6sk26dhxj11alqgr"; depends=[ReporteRsjars rJava]; }; ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; }; ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; }; @@ -1747,7 +1773,7 @@ RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256 RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; }; RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[distrMod RobAStBase lattice RColorBrewer RandVar distr]; }; RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[RobLox lattice RColorBrewer distr]; }; -RobPer = derive { name="RobPer"; version="1.2"; sha256="1623cbza624r4f4v5z9f7gr7bvwy4qysrksizw5zpgj75xzq7ici"; depends=[robustbase quantreg BB rgenoud]; }; +RobPer = derive { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gqwfng6cgi123y20fd01b84jkp9gx3hi"; depends=[robustbase quantreg BB rgenoud]; }; RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; }; RobustAFT = derive { name="RobustAFT"; version="1.3"; sha256="0cxyvq75bwhjh3qzfj6ynmy8mby6yjy4r851sx80b8ls6rv4cf3z"; depends=[robustbase survival]; }; @@ -1757,7 +1783,7 @@ Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji RootsExtremaInflections = derive { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; }; Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA ftsa]; }; RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; -RoughSets = derive { name="RoughSets"; version="1.1-0"; sha256="0v6cb0xidx2rbkgb92fahrjyy974xiaizxqryzzj1z0nnqb5zadp"; depends=[]; }; +RoughSets = derive { name="RoughSets"; version="1.2-0"; sha256="04z47dsws39rg34fisr0favl0ar1vqhvzmafb5sf4d62h2r6rvdl"; depends=[Rcpp Rcpp]; }; Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; @@ -1769,9 +1795,9 @@ Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5 RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[jpeg fields RANN]; }; Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcpinsyyanfrqjdskrpk7z70fnyvwqm2"; depends=[truncnorm]; }; Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; }; -Rssa = derive { name="Rssa"; version="0.11"; sha256="06mg1fdviayvhc50p9l5imh431b7cb3f3x3pl513phwhsv0qc0lk"; depends=[svd forecast lattice]; }; +Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[svd forecast lattice]; }; Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; -Rsymphony = derive { name="Rsymphony"; version="0.1-18"; sha256="0421viap2qic53hxvjyxy3npyb4lpf8lw86zwya373w41pkpsd1v"; depends=[]; }; +Rsymphony = derive { name="Rsymphony"; version="0.1-19"; sha256="0m9xbyp4hxz9rbc8nd7q0fwzgl6126iv0sxwifamxkc9z8vr86js"; depends=[]; }; Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; }; Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; }; Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; }; @@ -1783,6 +1809,7 @@ Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5l Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; }; Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; }; +RxnSim = derive { name="RxnSim"; version="1.0"; sha256="0693kl58jipgnsdrh9rim5w6mb3b4wvxh7glzy1ahnxv648brlwz"; depends=[rJava fingerprint rcdk]; }; Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; }; Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; }; SAENET = derive { name="SAENET"; version="1.0"; sha256="0mnzv1a3xmbf4w9mgsi2kf20kyhcsadaih63wb0zvraqv5ijdd31"; depends=[autoencoder neuralnet]; }; @@ -1794,7 +1821,7 @@ SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mv SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; SASxport = derive { name="SASxport"; version="1.5.0"; sha256="0sgxpjv9ilz2zb13kkb0fqjfbamrczxpy9rwvfhh46bmx4i038iq"; depends=[chron Hmisc]; }; -SAVE = derive { name="SAVE"; version="0.9.3.9.2"; sha256="1faky3155vh54r450r4dndn5749kp09bilyq8n7n7rls0dl5k34m"; depends=[coda DiceKriging]; }; +SAVE = derive { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp Rcpp RcppArmadillo]; }; SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; }; @@ -1807,7 +1834,8 @@ SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2d SCRT = derive { name="SCRT"; version="1.1.1"; sha256="02sndf5r1y27pgkw4wd9bhz7jhzk3cv78hp3xl222phjznjf2lzi"; depends=[]; }; SCVA = derive { name="SCVA"; version="1.1.1"; sha256="1n660pml288ia4x18kjbrcx0n1cnasdxhl6pymh1nzxm4ai2hinc"; depends=[]; }; SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; -SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; }; +SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc sm tseries rpanel rgl]; }; +SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[igraph doParallel foreach iterators]; }; SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; }; @@ -1820,16 +1848,17 @@ SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kv SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; SETPath = derive { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; }; SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; -SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; depends=[spatstat]; }; +SGCS = derive { name="SGCS"; version="2.3"; sha256="1c917g03s50mp96lqhkjagsd2cq9rjbprlwf3h409dj59g6k2zx6"; depends=[spatstat]; }; SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; }; SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; }; SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; +SID = derive { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[pcalg igraph Matrix]; }; SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; -SIMMS = derive { name="SIMMS"; version="1.0.0"; sha256="1vwd06kaicmy4l1pygd58klbbbi4kp0hics0gyz7gfdc4vwpxf96"; depends=[survival MASS glmnet]; }; +SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7rngx93mlj4k1g8wzg4hmnlmic8l3k"; depends=[survival MASS glmnet]; }; SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; }; -SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; }; +SIS = derive { name="SIS"; version="0.7-5"; sha256="197zf4s4f5wm8sl9h5vxwywmml7n05fwqlxbldn6wkpxix7gx0xm"; depends=[glmnet ncvreg survival]; }; SKAT = derive { name="SKAT"; version="1.0.1"; sha256="03kc9df36kg9q1qr5l5zvfq3i5h5gz5f2m0mh054m6x76s796k1z"; depends=[]; }; SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; SLHD = derive { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; @@ -1889,7 +1918,7 @@ Sabermetrics = derive { name="Sabermetrics"; version="1.0"; sha256="1x35h1ffy6jn Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; -SamplerCompare = derive { name="SamplerCompare"; version="1.2.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; }; +SamplerCompare = derive { name="SamplerCompare"; version="1.2.6"; sha256="1n94fp6frawlbxcnvi0v6lhgs3yyc47lj1r46y3jg6zb9z3va3fa"; depends=[mvtnorm]; }; SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; }; SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; }; SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[ggplot2 foreign MASS data_table lubridate xtable]; }; @@ -1911,6 +1940,7 @@ SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9x SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; }; SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; }; +SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate rworldmap plyr sp]; }; SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[tcltk2 plotrix ape plyr phangorn calibrate ggplot2]; }; SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; }; Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; }; @@ -1923,9 +1953,9 @@ Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70 SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mvtnorm multcomp mratios]; }; SimCorMultRes = derive { name="SimCorMultRes"; version="1.3.0"; sha256="0r3d91x9srzsa0g6p3jlzplpsrprbg11kv6fsbbh47pz02fvi8mc"; depends=[evd]; }; SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; }; -SimSeq = derive { name="SimSeq"; version="1.2.0"; sha256="0jbi19bdsvyrmr2762p8skw419qx438vgnjb93xdy90lrgyx11wh"; depends=[fdrtool]; }; +SimSeq = derive { name="SimSeq"; version="1.3.0"; sha256="0xkiiwk52sv8vivd4qsvzgjbw8q0csy0d45diym2mc9aq9nhf5dq"; depends=[fdrtool]; }; SimilarityMeasures = derive { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; -Simile = derive { name="Simile"; version="1.3.2"; sha256="0k3jj5vbv7dlsn7lxf5jh2ckxxw9rh4ycrnx3c3w2c6l6fwjlnkb"; depends=[]; }; +Simile = derive { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; SimplicialCubature = derive { name="SimplicialCubature"; version="1.0"; sha256="0da2krxsd3p7v2jm4fp2ksh0ak1y0cjxj7inwkdiwmmmgjyq033f"; depends=[]; }; Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; @@ -1980,7 +2010,6 @@ StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fq Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[distr fBasics]; }; Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; }; StereoMorph = derive { name="StereoMorph"; version="1.3"; sha256="07hpz31npl2xihqb7a3cjscp0ch6hia9p42bx8y2spv1rrcn8vvw"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; }; -StochKit2R = derive { name="StochKit2R"; version="0.3"; sha256="0d74wfn7mgw71zd5cf6m81382ki2ccl64ss6361mm3837v55bh5f"; depends=[Rcpp reshape ggplot2 XML Rcpp BH]; }; Storm = derive { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; }; StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[MASS memisc Formula mnormt]; }; @@ -1993,23 +2022,26 @@ SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3 SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; }; SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; }; Surrogate = derive { name="Surrogate"; version="0.1-4"; sha256="0wvicdd7lxczxv4hdbdn8cnv5k36biix65r4byn4cpgqhkyy78k6"; depends=[MASS nlme msm lme4]; }; +SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[survival fields]; }; +SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; }; SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; }; Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; -SvyNom = derive { name="SvyNom"; version="1.0"; sha256="07cgg97s2kpq7vak9l1a57gwmp1gsm864m4b9q42s2fbiid8jg83"; depends=[]; }; +SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[survival rms Hmisc survey]; }; SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; }; SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; }; SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; }; Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; -TAM = derive { name="TAM"; version="1.4-1"; sha256="0qr1wbnlkzbbwa43v2sf1bkigdg5bd7fw5kwzgj1b28gfgakg5r0"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych lattice mvtnorm msm Rcpp RcppArmadillo]; }; +TAM = derive { name="TAM"; version="1.5-2"; sha256="0ik94ipsrcpagv234al8hm2b7122k7iaraxg7gclxiky487igf96"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice Rcpp RcppArmadillo]; }; TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; +TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; }; TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; }; TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; }; TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; }; TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; }; TDMR = derive { name="TDMR"; version="1.2"; sha256="0w056qxh7c56m3p6jlrp8fv2j2r1njxzgwzk3l1lhyxr94gff263"; depends=[testit SPOT]; }; -TDboost = derive { name="TDboost"; version="1.0"; sha256="1qiwz35i89lv95v3x5s28q0mkrvcfs1cfn4l0a5spvnyhy4kcacc"; depends=[lattice]; }; +TDboost = derive { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; }; TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[foreach zoo fields animation geoR RcppArmadillo]; }; TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; }; TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; }; @@ -2024,7 +2056,7 @@ TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; TKF = derive { name="TKF"; version="0.0.3"; sha256="0kdrza02nn4vkfpc5kwpywls24adhj3kywa5w83v4wpx8dmmh10z"; depends=[expm numDeriv]; }; TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; }; -TR8 = derive { name="TR8"; version="0.9.11"; sha256="164fd9g4vn4p51m5ygg65lkjapb9a42wkfcp4ngdqh542x313y2n"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; }; +TR8 = derive { name="TR8"; version="0.9.12"; sha256="0sry52a98ba07j78d1niaysb7cq5ms4grxbz5pncw1g13w6i2505"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; }; TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; TRD = derive { name="TRD"; version="1.0"; sha256="1xj3ns9phiz4i70ky2p1q1cr3h6iq2i3dywnap6gqaq0fqmiq2fh"; depends=[Rlab]; }; TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; @@ -2032,7 +2064,7 @@ TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; }; -TSP = derive { name="TSP"; version="1.0-10"; sha256="1bwafpbg1w8wbn4ww4zq042n5dcs9lmrhbhkpmra0v5jhjgfvi3i"; depends=[]; }; +TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; }; TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; }; TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; }; TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; @@ -2073,7 +2105,7 @@ Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mf TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; }; -TimeWarp = derive { name="TimeWarp"; version="1.0-7"; sha256="1qjr3kfdd1ym0fi4hgjqm32gigchbchxy4xyxmsyl8y7jh2jk9qj"; depends=[]; }; +TimeWarp = derive { name="TimeWarp"; version="1.0.11"; sha256="0asp6in55973kbazlwwc0b6vrgbxq5hgj6v5apzk4xnpdd53yl8g"; depends=[]; }; Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; }; TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[Hmisc gplots]; }; TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[RColorBrewer boot]; }; @@ -2092,6 +2124,8 @@ TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-5"; sha256="18azwbvs3cv3arp6zhh5bklf7n04p13jpfjh44nxv5159jry7arr"; depends=[]; }; TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; }; +UBCRM = derive { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; +UNF = derive { name="UNF"; version="2.0"; sha256="0pdk43d6cspmh1p7172fzr7082yqjk7gxq6n4a59388amwgdg0f2"; depends=[base64enc digest]; }; UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; }; USAboundaries = derive { name="USAboundaries"; version="0.1.1"; sha256="18bk37lhrlp5j0496n956881zl88inliylmgh1p2nlkv4f195yd0"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; }; UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; @@ -2106,8 +2140,8 @@ VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; }; VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; }; VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; -VGAM = derive { name="VGAM"; version="0.9-6"; sha256="1ibf27lnl28gs1dn0xndm8y0v7r6256mci82zjvc5qmbhb0hj18m"; depends=[]; }; -VGAMdata = derive { name="VGAMdata"; version="0.9-5"; sha256="0cmb0zy2sbwsn4rpc6w4885gvamyjvyp53wn9934mwdvigm63wj9"; depends=[]; }; +VGAM = derive { name="VGAM"; version="0.9-7"; sha256="0477y0flxzvw06qi5dk1ky8s19b67jvw0lzxz7pzffzdbv9mj806"; depends=[]; }; +VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; }; VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; }; @@ -2118,7 +2152,7 @@ VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgsln VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; }; VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; }; VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; -VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfiamfvdbbbv1iaaiyw3shjbg2bp8dp"; depends=[mcmc]; }; +VarSelLCM = derive { name="VarSelLCM"; version="1.0"; sha256="1i0s4kdqgfh79bk5ipd9fn6m3yl1qgn9gzn62kxx7vfiy683x0a2"; depends=[Rcpp mclust Rcpp RcppArmadillo]; }; VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; }; VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; @@ -2151,6 +2185,7 @@ WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df2 WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; }; WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0yfnjw73i6mrh0y9iyjbxmhklz2hlxv1k53pppbg"; depends=[oro_nifti mgcv fslr]; }; +WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; }; WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; }; WikipediR = derive { name="WikipediR"; version="1.1.0"; sha256="19hc1vmyv0bnf00q8vwmfr6jxrcd1h5xzb9pphy5grghbj01bcl8"; depends=[httr jsonlite]; }; WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; @@ -2158,7 +2193,7 @@ WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; }; XBRL = derive { name="XBRL"; version="0.99.15"; sha256="0fscvl7i205h0ax8g78v5n75bfqbna6cr7lg8jkicjbf4v791hhz"; depends=[Rcpp Rcpp]; }; -XLConnect = derive { name="XLConnect"; version="0.2-10"; sha256="1dfch76l4pl9zmcp3h4kwycdivzp7nl2li6g8h5kdm9qiy1v0384"; depends=[XLConnectJars rJava]; }; +XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; }; XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; }; XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; }; XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; }; @@ -2185,8 +2220,8 @@ abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfji abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; }; abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; }; -abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; }; -abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; }; +abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; +abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; }; abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; }; abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; }; accelerometry = derive { name="accelerometry"; version="2.2.4"; sha256="0jk3dirk7bbddqh5j6nw2k1wm1i3k3xnz1mcb6lb5qyf1b642miw"; depends=[Rcpp Rcpp]; }; @@ -2233,14 +2268,14 @@ aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[miscF lme4 R2jags]; }; agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[Matrix igraph]; }; agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[klaR MASS nlme cluster spdep]; }; -agridat = derive { name="agridat"; version="1.10"; sha256="007xhynxsiqk2jnn9a1q77q1b42gwaky4vjyd034m56q3kz0adhn"; depends=[lattice reshape2]; }; +agridat = derive { name="agridat"; version="1.11"; sha256="1bnkzacwp22dw5vppm4yz583h1dw5d93dlca9i3ba2y9dzsalx0d"; depends=[lattice reshape2]; }; agrmt = derive { name="agrmt"; version="1.39"; sha256="0qkl8wikvg635mr8v3n9svdicnb8sl4brrh7px1n5jy71h7cswd7"; depends=[]; }; agsemisc = derive { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[survival Matrix]; }; aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; }; akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; }; akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; -alabama = derive { name="alabama"; version="2014.12-1"; sha256="0rp9x5lijisxh57miy2l5jp7jinn200v9y3vfyriknr7903lg0if"; depends=[numDeriv]; }; +alabama = derive { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; }; algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly stringr reshape2 Rcpp Rcpp]; }; allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; @@ -2248,14 +2283,14 @@ allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpj alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; }; allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; }; allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; -alm = derive { name="alm"; version="0.3.1"; sha256="02k4jc1s7qc6l3h9s9w7714bh606593mvhsbqk5vm9ga3320m48k"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; -alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37y1ynsiv27l8b5fmm6l35sazlfbbinhzwc1"; depends=[tripack sgeostat splancs]; }; +alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; +alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 tripack sgeostat spatstat splancs]; }; alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; }; alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; }; amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; -amen = derive { name="amen"; version="0.999"; sha256="1p9ma31bzrxylcgi43nk44bq0cg4xgk9fzmxw2dpqz33x4xlrfiq"; depends=[]; }; +amen = derive { name="amen"; version="1.0"; sha256="17kaknfgi39qcg5mhkdyf6cn2l3nn9n2xzvyz1c4piy6inhmj36c"; depends=[]; }; aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[rgl car scatterplot3d colorspace fda]; }; analogue = derive { name="analogue"; version="0.16-0"; sha256="1izbqzmnw4hmirjlvwp15imzaai2kxbv2gzc58y5awwbfdrg314m"; depends=[vegan mgcv MASS brglm princurve lattice]; }; @@ -2292,12 +2327,12 @@ apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmih apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[erer gWidgets car urca copula]; }; aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; -aqp = derive { name="aqp"; version="1.7-7"; sha256="0gdaxxifcvr40j6y7db24dzla31linhh39w8830sj1k22y9sa4dp"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; }; +aqp = derive { name="aqp"; version="1.8"; sha256="12z8lsnjwjrnxj5a79can2r2h9sdmp39jfnx9kxn8zwm9klzl3jg"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; }; aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; }; archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; }; archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; archiDART = derive { name="archiDART"; version="1.0"; sha256="0fahcw3032rvz1qd2vv872k8d7845zjfm2byrk1nk5b34z25wm2b"; depends=[]; }; -archivist = derive { name="archivist"; version="1.2"; sha256="10h5b8lkwndg7pn07kbj1qz1ym19alnjr43azwr1sljxybf86pb8"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; }; +archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; }; arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; }; argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; @@ -2306,8 +2341,8 @@ argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v arm = derive { name="arm"; version="1.7-07"; sha256="19xshr5r36g9jsyxdm0dihvga89fd080hbhmyhxv1rbv4496jwqa"; depends=[MASS Matrix lme4 abind coda nlme]; }; arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.0"; sha256="0rb4qijsqzrv47i30fpcngw50a1gk10zn1r13lszxcsm5i8vjqf7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; }; -aroma_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; }; -aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; }; +aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_methodsS3 R_oo R_utils R_huge]; }; +aroma_cn = derive { name="aroma.cn"; version="1.6.0"; sha256="090qqvv6sk0508knmh2qr1lvpc2vr8s17mj6siblzc66ldp22dj7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; }; aroma_core = derive { name="aroma.core"; version="2.13.0"; sha256="1r3r0hrw8akdpjmzhnc0fg6nyd9hccvv4kfbms38qll70lac4910"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; }; arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; }; ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; }; @@ -2324,43 +2359,45 @@ aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; }; assertive = derive { name="assertive"; version="0.2-1"; sha256="0bzhwdkw3ryaclaw9lni8zw13037gx7kf6wbmjvkwsl9p0lzv7wp"; depends=[]; }; assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; +assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[nlme lattice]; }; aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; }; aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; }; astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; }; astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; }; -astrochron = derive { name="astrochron"; version="0.3.1"; sha256="0anm8k31kgvbdkzid2f9mg7ivdrihwb6g1i82jqpljbwvmkp0fmw"; depends=[baseline multitaper fields]; }; +astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[multitaper IDPmisc fields]; }; astrodatR = derive { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; astsa = derive { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; }; asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; }; atmcmc = derive { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; +atsd = derive { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[RCurl httr]; }; attribrisk = derive { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[survival boot]; }; audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; }; audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; }; audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; }; automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; }; -autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; }; +autopls = derive { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; }; awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; }; aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; }; b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; bReeze = derive { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; }; +babar = derive { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; }; babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; }; backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; }; bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; -bamboo = derive { name="bamboo"; version="0.9.5"; sha256="03aqrwgr77n2kzfnc5scv6n6d4401q9ddnzlki7d6rblilfb2w12"; depends=[rJava jvmr]; }; bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; }; bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; }; bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; -bartMachine = derive { name="bartMachine"; version="1.1.1"; sha256="1gc98s5inp5ka9ax6rykac9ij0cymp7bjwl3vxrmwmfsghvx4rc5"; depends=[rJava car randomForest missForest]; }; +bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[rJava car randomForest missForest]; }; base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; }; base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; }; -baseline = derive { name="baseline"; version="1.1-4"; sha256="1xwkbrqwcf1q6s65inzczgzbknwlqq7m84lph5rkwncjxid2h4lz"; depends=[SparseM]; }; +baseline = derive { name="baseline"; version="1.2-0"; sha256="12gjirk9jyq7lmfkp10kcli84bld9n9m6yhcj5z6y4iaq6d8hazq"; depends=[SparseM]; }; basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; }; batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; @@ -2369,14 +2406,14 @@ bayesDccGarch = derive { name="bayesDccGarch"; version="1.0"; sha256="1xgznixi0w bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; }; bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; }; bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; }; -bayesLife = derive { name="bayesLife"; version="2.1-3"; sha256="1ashgfzjjnvj8h4896y4maj3gfx9v4fginjli1wdkcgcgi1d6gkr"; depends=[bayesTFR wpp2012 hett car coda]; }; +bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR wpp2012 hett car coda]; }; bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; }; bayesPop = derive { name="bayesPop"; version="5.2-2"; sha256="1m1vvbipf903s7a5vm7pad3l8ykj74ilrkpyc4ydqzpyqg4k4npj"; depends=[bayesTFR bayesLife abind plyr wpp2012]; }; bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; }; bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; }; bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; }; -bayescount = derive { name="bayescount"; version="0.9.9-2"; sha256="1f27dkdgpylk1v0m722r0jxha9sl17zgl1s5apnd8ihgsajm7sdc"; depends=[runjags coda lattice]; }; +bayescount = derive { name="bayescount"; version="0.9.99-4"; sha256="1ylz7wwc3kdff9b7gs8k36i90bc7pa8z207mhnxn0qzjv1qwjq6r"; depends=[runjags rjags coda]; }; bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; }; bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; }; bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; @@ -2410,7 +2447,6 @@ beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8v benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; }; benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; }; -bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; }; ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; berryFunctions = derive { name="berryFunctions"; version="1.7.1"; sha256="1xpmpbls0vjyi51k7sd1v8s7lp4s1549javcg3yinmvxp9xhwfkx"; depends=[]; }; bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; }; @@ -2418,7 +2454,7 @@ betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1w betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; }; betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; }; betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; }; -betas = derive { name="betas"; version="0.1.0"; sha256="0a8z8c4i2pbnmpylggdr7bv5iw5jmcjwfqlykdj7pfjkjadb8nj4"; depends=[robust]; }; +betas = derive { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; betategarch = derive { name="betategarch"; version="3.2"; sha256="0x3l1zvdp8r7mam7fvdlh1w3dwpjwj86n0ysfk8g824p4mn2wsgv"; depends=[zoo]; }; bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; }; @@ -2430,7 +2466,7 @@ bglm = derive { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b bgmm = derive { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[mvtnorm car lattice combinat]; }; biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bibtex = derive { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; }; -biclust = derive { name="biclust"; version="1.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; }; +biclust = derive { name="biclust"; version="1.1.0"; sha256="0ffsgjg7dvr5nh238abhawz9k775szh8lxl75bqjvxgqiv07f3hc"; depends=[MASS colorspace lattice flexclust]; }; bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp Rcpp]; }; bigGP = derive { name="bigGP"; version="0.1-5"; sha256="0hlfylwinkwz2s8wgqf6qwxrrdx5a02ln13y4arfwwlqi1kw0s4q"; depends=[Rmpi]; }; bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[hglm DatABEL]; }; @@ -2444,13 +2480,13 @@ bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilw bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; }; bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; }; bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; }; -bigsplines = derive { name="bigsplines"; version="1.0-5"; sha256="0dmm7q7cznhpqy5j955q4mlwrjfiinxlh17g9xlpqjncrzbivxh6"; depends=[]; }; +bigsplines = derive { name="bigsplines"; version="1.0-6"; sha256="03gan2wrsi2hfxhn3l05qd0x04x8ymkab9aqpfbfn59m296xhd3m"; depends=[]; }; bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; }; bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; }; bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; -binda = derive { name="binda"; version="1.0.1"; sha256="1qffiz1ndjjv9ml9m07f3w8c1iqd4ldladcab7izbidj7iw41y3f"; depends=[entropy]; }; +binda = derive { name="binda"; version="1.0.2"; sha256="1hfqx79pq9bn37j8rwv11wsv6d9prph26p2hqmnxilsdxr953ib2"; depends=[entropy]; }; bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; binequality = derive { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist survival ineq]; }; bingat = derive { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; }; @@ -2460,31 +2496,33 @@ binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3y binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; }; binomialcftp = derive { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; -binr = derive { name="binr"; version="1.0"; sha256="0wgc78kx51qfn5wfzll5nz8iwanixkyb5sbqwi40fak93bvycklm"; depends=[]; }; +binr = derive { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m632665iqz0z79v963ixhd5xrjfx6drwpfp4i69pbl"; depends=[clinfun]; }; bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; -bio3d = derive { name="bio3d"; version="2.1-3"; sha256="1iip34prynbib0aasrcxr1gck2vmal8vxwyrjx7ra9pq9zcnvjyq"; depends=[]; }; +bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; }; bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; +biogas = derive { name="biogas"; version="1.0"; sha256="0c7ayhmy69k08f32i1agri349wm1addibw4xp9rjq9cmkdhazvbd"; depends=[]; }; biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[slam bit]; }; biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; }; biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; +biosignalEMG = derive { name="biosignalEMG"; version="1.0"; sha256="0rvicx851vmlc15s9jzj4vmwq2f3qwlz3j1wjb0i2lznkzwyzxnw"; depends=[]; }; biotools = derive { name="biotools"; version="2.0"; sha256="02yw5pfj9858j02yi30bvll5pp67dpkzx3y5ka5bwwz7a5g7dvx3"; depends=[rpanel tkrplot MASS boot]; }; bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; }; biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; }; birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; birk = derive { name="birk"; version="1.3.0"; sha256="02h8vh2r1ilmfgx1j3yw9jlzwshqh70nac28qzq1f5mpqll8z1sg"; depends=[]; }; bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; -bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; }; +bisoreg = derive { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap monreg R2WinBUGS coda]; }; bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; }; bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; biwavelet = derive { name="biwavelet"; version="0.17.5"; sha256="01zhpwq1a3g1pjwbjqh3p1q9jhqqngrxcs9vp4r2zrj3rn9d5x38"; depends=[fields]; }; biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; }; -bizdays = derive { name="bizdays"; version="0.2.1"; sha256="1n8dv2damcfbxs0bq7icbw74invai2799al5vipp1mr09qlwsg02"; depends=[]; }; +bizdays = derive { name="bizdays"; version="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; }; blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; }; @@ -2496,7 +2534,7 @@ blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ck blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; -blocksdesign = derive { name="blocksdesign"; version="1.4"; sha256="0ikpqrx7lwf13028drvrwni868a8gs9lw2w05hqz5a5yknks97lk"; depends=[crossdes]; }; +blocksdesign = derive { name="blocksdesign"; version="1.5"; sha256="06i8yphfp5g5bhs6s0gl0mb51vdk8idqifv18bkaqlh9qvbrd6rd"; depends=[crossdes]; }; blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; }; blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[rjson RCurl]; }; bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; @@ -2514,15 +2552,17 @@ bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcs boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; }; boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; -boot = derive { name="boot"; version="1.3-15"; sha256="0d2faa3vs31af9bc4kzfywz60jib8b7j233xb5pzpj3y2j6mdjlr"; depends=[]; }; +boot = derive { name="boot"; version="1.3-15"; sha256="0pyznvhbb8237nqab6ylmis73q0s3fgmf65fmh0rr3ryljvzp6sq"; depends=[]; }; bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; }; bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; }; bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; }; bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; +bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; }; bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; -bootstrap = derive { name="bootstrap"; version="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; }; +bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; }; +boottol = derive { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda R2jags mvtnorm fishMod MASS]; }; boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; }; boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; @@ -2543,7 +2583,7 @@ brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; }; broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; }; -broom = derive { name="broom"; version="0.3.5"; sha256="0vzj797nr3ijn4wq8ri6inibdbsp980didk5ywqw2ankzlq3m7f2"; depends=[plyr dplyr tidyr psych]; }; +broom = derive { name="broom"; version="0.3.6"; sha256="0z3np7g9yidsyj58y5mnxqzcn6n841pfmxhwbiy2d6sm5i463lmh"; depends=[plyr dplyr tidyr psych stringr]; }; bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; }; bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; }; bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; @@ -2559,27 +2599,28 @@ bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; }; c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; +cOde = derive { name="cOde"; version="0.1"; sha256="1cjp63lya2r82fgjwz8mnzs50x7hyzg87dkm006m76xs1iyv988i"; depends=[]; }; cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; }; ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; }; caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; }; cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; }; -cairoDevice = derive { name="cairoDevice"; version="2.21"; sha256="1g4glv80zj9mxi9hipkpxxcg3x0g3g7av17bhidb6h0s75v9jcvw"; depends=[]; }; +cairoDevice = derive { name="cairoDevice"; version="2.22"; sha256="0j1fsfjzaz0mz6v33v8n2dcbskpafm3mhi5v85phpk3x4s2y84al"; depends=[]; }; calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; }; -calmate = derive { name="calmate"; version="0.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; }; +calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; }; camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; }; cancerTiming = derive { name="cancerTiming"; version="2.0.0"; sha256="0p5hxzhql2rlyx334d8km676va50ql73kxsqjr15q80z7zffyq9d"; depends=[LearnBayes]; }; candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; }; cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; }; caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; -capm = derive { name="capm"; version="0.5"; sha256="1pal7v965zyl52fivdqn30w570gvhxjsnafml6jz16x4kszw5jar"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; +capm = derive { name="capm"; version="0.7.0"; sha256="00bvrc5km6k9zvlznvqc6gj806fgb3r0x0yrnmxyk21b0acl5g20"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; }; capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; -car = derive { name="car"; version="2.0-24"; sha256="1rg2asrwwwinqn0h7xqyx8qv77yq1sa13c8sbmnz8bzm9xx366as"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; +car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; }; -cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; }; -care = derive { name="care"; version="1.1.7"; sha256="0lgas00qp1cvn3cbimxlli99czvkh6b9hxahzif5fgbnfik4d47y"; depends=[corpcor]; }; +cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot pastecs lattice]; }; +care = derive { name="care"; version="1.1.8"; sha256="0r1j2q23rz54rcx528n53m3hmhvb8ndqjpmmzm6j1y6lmixpqh41"; depends=[corpcor]; }; caret = derive { name="caret"; version="6.0-41"; sha256="0dwh6j1gvyd34my88kykrpifmnj3slp8q1if5vi428hp1p151cz7"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; }; caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools pbapply ggplot2 digest plyr lattice gridExtra]; }; caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; @@ -2609,7 +2650,7 @@ cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3 cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr Rcpp RcppArmadillo]; }; cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; -cds = derive { name="cds"; version="1.0"; sha256="0gzvsw4s5pjrdbck4j985sl59pslcmliny9664srrv4iqc6i8z6i"; depends=[MASS limSolve clue colorspace copula]; }; +cds = derive { name="cds"; version="1.0.1"; sha256="1vw8ghvwsrpsq89yc4vjyfcw2wsz9dhqv1nlaqmv9b4wqm8gsb5h"; depends=[MASS limSolve clue colorspace copula]; }; cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; }; @@ -2631,8 +2672,8 @@ cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys51 changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; }; cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; }; -checkmate = derive { name="checkmate"; version="1.5.1"; sha256="014wpncs7j488wm0b0ibvz9160mbz8n383wksqp7xk1cp7kpp0qg"; depends=[]; }; -checkpoint = derive { name="checkpoint"; version="0.3.3"; sha256="1pxmaxbm6x1k3c82z2lng869jg9szxi3yn8kxni5w52whihb67xj"; depends=[knitr]; }; +checkmate = derive { name="checkmate"; version="1.5.2"; sha256="0sllckm82lxiar3mm3sl4zcf9nhp7x7hfhpz1kiawaxfq7z9436g"; depends=[]; }; +checkpoint = derive { name="checkpoint"; version="0.3.9"; sha256="1qgjma8nbg4gixzj44q4zr24kca1bnznrnksqpjjy58vxi69s61n"; depends=[]; }; cheddar = derive { name="cheddar"; version="0.1-626"; sha256="16dl267zbqnix739827mvdgchg5xzgz5q14hh8cw2fq089frjlz9"; depends=[]; }; chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; }; chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[rpart class e1071 MASS nnet pcaPP robustbase som lars pls mclust]; }; @@ -2640,21 +2681,21 @@ chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6 cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; }; childsds = derive { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; }; chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; }; -chipPCR = derive { name="chipPCR"; version="0.0.8-3"; sha256="1qslzbxirpbiqlfcvjrs7z6i4a86a04b9fgfm3ngmkv32ai0zajz"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; +chipPCR = derive { name="chipPCR"; version="0.0.8-8"; sha256="1wvk16maj5i8wla8djbrdk3bdkirq2jz115gg7cpkfyxg5ig4la9"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; chngpt = derive { name="chngpt"; version="2014.12-2"; sha256="1bg2hm5clvq1rj1mnj5fasbwmq0xayj327kwclajami4zcwjwqj5"; depends=[kyotil MASS]; }; choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; }; -choroplethr = derive { name="choroplethr"; version="2.1.1"; sha256="1d7i5lk3j37n4fs4k41jdh829n4qyx85h0sr7h3fb313an3aqhd2"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; +choroplethr = derive { name="choroplethr"; version="3.0.0"; sha256="1fj0gklqcr884l42c78crn6f7s5rk336ywlnqqm5ba7kxjs464k5"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; }; choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; }; chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[dplyr httr data_table]; }; chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; }; chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; }; cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; -circlize = derive { name="circlize"; version="0.2.2"; sha256="001zic779ydc1535fx00lmgk92hv2yn4kq5cangwhrwxj6ycfimy"; depends=[GlobalOptions]; }; +circlize = derive { name="circlize"; version="0.2.4"; sha256="0zxd8jcim03cg77zxq9dvwlki51s9jhyaycdif7q6qc598lwwjx1"; depends=[GlobalOptions shape]; }; circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; -cit = derive { name="cit"; version="1.3"; sha256="05gr9pb01l4rs79rpgcj8mds61n3kv50fgcw2bcibzs1d1za33ig"; depends=[]; }; +cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; }; citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[sandwich lmtest ggplot2]; }; @@ -2669,29 +2710,31 @@ classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14 clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; }; clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; }; clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpirza6j7cq8rcv7mli2w1pkvld70ih8i1xb1dx3y19x"; depends=[igraph plyr reshape2 Rsolnp]; }; -climdex_pcic = derive { name="climdex.pcic"; version="1.1-5"; sha256="0r6y3ylxdfkbhrx4vbzs1f7y86gdfny3dxzskc48l3qv75q5276m"; depends=[PCICt caTools Rcpp]; }; +clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[lubridate XML selectr RCurl ggplot2 scales RColorBrewer reshape2]; }; +climdex_pcic = derive { name="climdex.pcic"; version="1.1-5.1"; sha256="0sq5l5dmnwbq9y6zfrq7zp81c8bmxwkvl7y9iq6wi3qcr78ga6zy"; depends=[PCICt caTools Rcpp]; }; clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; +climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[ggplot2 gridExtra evd lme4 lubridate MuMIn reshape]; }; clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; -clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; }; +clinfun = derive { name="clinfun"; version="1.0.9"; sha256="1igj48kp8898inxp6ynz0sgrc54s6k8whzgf5d349z4dn2jvizsb"; depends=[mvtnorm]; }; clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; }; clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; }; cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; }; clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; }; clue = derive { name="clue"; version="0.3-49"; sha256="1gz9imirwlvmvzn9j0rmdrrax2girf78xfrxw6mrhal66g48bsrj"; depends=[cluster]; }; -clues = derive { name="clues"; version="0.5-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfsv6lbpjlcai7z9qp31qcih3g71vgr"; depends=[]; }; +clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; }; clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; }; cluster = derive { name="cluster"; version="2.0.1"; sha256="09l2vydyabk7x19bblxbjm68vnmifz46m5k3csb1snpbhq6qx52c"; depends=[]; }; cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive { name="clusterCrit"; version="1.2.4"; sha256="150iq5gp5czb8m7niyi294jjy3dbfpwccgak7scahd5kz2vs07c7"; depends=[]; }; -clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; }; +clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; }; clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; }; clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; }; -clusterSim = derive { name="clusterSim"; version="0.44-1"; sha256="18l643w3zps3bhldc5z9zqa5sy1c459r0hrzb26ykydnh8xbahdy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; +clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62xrdj4cr6w63gig3dyjmdq8m937g8qsmhd74lz"; depends=[sandwich lmtest mlogit]; }; +clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; }; clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; }; clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; }; -clusthaplo = derive { name="clusthaplo"; version="1.2"; sha256="17vxk61bw99h34n9a6vp40nanigfai34s237ydb56jpamsq8sf2b"; depends=[ggplot2]; }; clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; }; clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; clustvarsel = derive { name="clustvarsel"; version="2.1"; sha256="0sj9065s604sjzmlziak9xxl0xhplmp1g3d5dl9smwf2x8bb80mw"; depends=[mclust BMA foreach iterators]; }; @@ -2704,17 +2747,17 @@ cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrq cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[emulator elliptic]; }; cna = derive { name="cna"; version="1.0-2"; sha256="06q335jr4kdydk79s8f1fg67wflhcb5ngl6gk1fqb096zkmhszxf"; depends=[]; }; cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; }; -coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; }; +coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; }; cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[SparseM quantreg]; }; cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; }; cocor = derive { name="cocor"; version="1.1-0"; sha256="1qmpgs9krbyvr8803r4y0gxwz2wl5frkzyxaa9756q27bw2igyrp"; depends=[]; }; cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; }; cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; }; -coda = derive { name="coda"; version="0.16-1"; sha256="0575pbx37jn7ljgjybl2v7rry55l6s6cb3a0m9znh4blln405q4i"; depends=[lattice]; }; +coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmhqgbm525cgg67ax5mhs7il7br26f"; depends=[lattice]; }; codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; }; -codetools = derive { name="codetools"; version="0.2-10"; sha256="0giqf14kmqps181jfb78mgii1852rp4kz0k96pabm4h0yv02b49j"; depends=[]; }; +codetools = derive { name="codetools"; version="0.2-11"; sha256="1mal1xa7san28l6rssvanndsgm90qhvbskz840ybfwwix8bqnbmh"; depends=[]; }; coefficientalpha = derive { name="coefficientalpha"; version="0.3.3"; sha256="1r38jlcl3z16xc410bcgcw1ck6nnby1mqwx5sk6g0lm3jbjcka57"; depends=[rsem lavaan]; }; coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; }; coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; }; @@ -2723,8 +2766,9 @@ coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6 cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; }; coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; }; colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; +coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; -colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; }; +colorspace = derive { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; }; colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[XML RJSONIO png]; }; comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; }; @@ -2761,7 +2805,7 @@ conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9p conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; }; contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; }; -conting = derive { name="conting"; version="1.4"; sha256="0ykyyzal2pcyrh8q65d4pab8a8nal9x276q2624jb9nhbb65vz4k"; depends=[mvtnorm BMS gtools tseries coda]; }; +conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[mvtnorm BMS gtools tseries coda]; }; contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; }; convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape geiger MASS phytools cluster]; }; cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; }; @@ -2769,7 +2813,7 @@ cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; }; copCAR = derive { name="copCAR"; version="1.0"; sha256="0rq432w959p7drx73vsrdh5dhi2wy7dsjhhb4nh9wm36kkzki5ca"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; }; cope = derive { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[maps fields MASS mvtnorm]; }; -copula = derive { name="copula"; version="0.999-12"; sha256="131wr6a7qxsdsl9f5amjkzj2wwgdwlg85a1pmd0bflzfi86dvrdf"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; }; +copula = derive { name="copula"; version="0.999-13"; sha256="0yjy03wn6lsiacfh7qblspklxc9kfwd3g7bz2fx2ldkd90rwhmqp"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; }; copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; }; corHMM = derive { name="corHMM"; version="1.15"; sha256="1f1qq8fnnx68mpfj863pml4xynxsl21f9r1qqv7yfrx14daki4a0"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; }; corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; @@ -2795,16 +2839,16 @@ covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2 covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; }; covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; coxinterval = derive { name="coxinterval"; version="1.0"; sha256="0x6xnc5wf5sivwn0hd99lmb52wj5swj01r9wrky9f61nji3fjv4v"; depends=[Matrix survival timereg]; }; -coxme = derive { name="coxme"; version="2.2-3"; sha256="1s9h03crzmvi0szg5rhq0m48q9i7hdppn1k528nfca5ikw2l37h9"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; +coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; }; coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; +coxsei = derive { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; }; cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; }; -cqrReg = derive { name="cqrReg"; version="1.0"; sha256="04hx7zysymw00dnfifk30cy1r63vnj6ycq37g25lgq38qr6bbbis"; depends=[Matrix Rmosek Rcpp Rcpp RcppArmadillo]; }; cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; depends=[]; }; crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; }; cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; @@ -2824,7 +2868,7 @@ crossval = derive { name="crossval"; version="1.0.2"; sha256="1imqmrr86yr2ml9x8c crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; }; crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[Matrix tseriesChaos fields pracma]; }; crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; -crrstep = derive { name="crrstep"; version="2014-07.16"; sha256="15di36j44wxvwl7zhnz3s16lf65rnpj1bvgxf0glkkm0pw94ibrl"; depends=[cmprsk]; }; +crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; }; csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; @@ -2832,7 +2876,7 @@ cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; }; csn = derive { name="csn"; version="1.1.1"; sha256="0ns92jqbsc7hnwwkph47mi8z53mj5ygrpys75l9n4d0qmdgpw0nn"; depends=[mnormt]; }; cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; -csvread = derive { name="csvread"; version="1.1"; sha256="0bk6jjjv88d7l511a5fa1530i8pnzr3brambchl69mv9h6si14bq"; depends=[]; }; +csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; }; cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; }; ctv = derive { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; }; cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; }; @@ -2862,6 +2906,7 @@ cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15b d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; dae = derive { name="dae"; version="2.4-0"; sha256="1gf3x751if3g2p7yy8jsvpn612w36mjhkz8qkh0y0kajm0nipzkb"; depends=[ggplot2]; }; daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; }; +daff = derive { name="daff"; version="0.1.2"; sha256="17ixi2yvh6wxwnhzbg8xsjmxbakh7lyazin5a93q33160vvsiday"; depends=[V8 jsonlite]; }; dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; }; @@ -2871,7 +2916,7 @@ darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; }; data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; }; dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; -dataRetrieval = derive { name="dataRetrieval"; version="2.1.1"; sha256="0d2m8yv471kcxr855r6s9p2dadmlc8ks16iafsvhcf8a9id7p91x"; depends=[XML RCurl reshape2 lubridate plyr]; }; +dataRetrieval = derive { name="dataRetrieval"; version="2.1.2"; sha256="0869y5xfxphm5xhd7miyjq5xdjb6qhhd5b9mdbkcfs5ss0a6534x"; depends=[XML RCurl reshape2 lubridate plyr]; }; datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; depends=[Hmisc shiny stringr]; }; dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; }; datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; }; @@ -2889,7 +2934,7 @@ dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702 dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; }; dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; -dbmss = derive { name="dbmss"; version="2.1.2"; sha256="0rvmxlpy3745y4zfcf6wi6z2nb3vwd92cliyvh6k0ppgq6r7l2q0"; depends=[spatstat Rcpp cubature Rcpp]; }; +dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[spatstat Rcpp cubature Rcpp]; }; dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; }; dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[Matrix igraph dnet]; }; dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; }; @@ -2905,14 +2950,14 @@ deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmab deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; }; -decode = derive { name="decode"; version="1.0"; sha256="03r0b3igk687n8xh2p7c7ii87bj8ihny2h0qcrciql9cjwvxkala"; depends=[]; }; +decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; }; decompr = derive { name="decompr"; version="2.1.0"; sha256="0b24wb2n2g1qf5v60hrazfzy211y1f2v9mkx013msb0a89a7bi45"; depends=[]; }; decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; }; deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; }; -deldir = derive { name="deldir"; version="0.1-7"; sha256="0di37vy2na4wm5281831f5rj855lq9pjf2k61lfl1vslr5fjx96i"; depends=[]; }; +deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; }; deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; }; deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; @@ -2925,7 +2970,7 @@ dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; }; densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; }; denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; -depend_truncation = derive { name="depend.truncation"; version="2.1"; sha256="1b13mqm8pjw0r0z5h7vizz15nzhslxhcn4cb8pzadyq98mcmk4g2"; depends=[mvtnorm]; }; +depend_truncation = derive { name="depend.truncation"; version="2.2"; sha256="0frszpsnhf5ci471h6izsp0qan87li8spvpdvr47kklg3qxq0py2"; depends=[mvtnorm]; }; depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; }; depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; }; depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; }; @@ -2934,7 +2979,7 @@ descomponer = derive { name="descomponer"; version="1.1"; sha256="0yw3659lv3y187 descr = derive { name="descr"; version="1.0.4"; sha256="149p2znadm4qvz1cqk4k8w7wqqn8jsvjxabgd9qy2rfv41qgcri8"; depends=[xtable]; }; deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; }; designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; -desirability = derive { name="desirability"; version="1.6"; sha256="17g998fmps4ypiscqd2nmh38sd0q7k3r60h2zdrq3wbm1vyyzygk"; depends=[]; }; +desirability = derive { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; }; desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; }; detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; @@ -2969,7 +3014,7 @@ digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5j dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp Rcpp]; }; dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2mjzwp4hwc2psqd9kn5989y4a1jmzxp2bg"; depends=[]; }; -directPA = derive { name="directPA"; version="1.0"; sha256="16bllp7afb83y73zr5wxfkad7vxzfqwdmhcxfa5jml4hlvkhgv1r"; depends=[]; }; +directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[rgl calibrate]; }; directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; }; dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; @@ -2978,10 +3023,11 @@ discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph discreteRV = derive { name="discreteRV"; version="1.1.4"; sha256="1bxr8rjqjx58bkkp96zk3hdssp43kcdzfjif95kda25by7926s3z"; depends=[plyr MASS]; }; discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; -diseasemapping = derive { name="diseasemapping"; version="1.1.5"; sha256="1v1pbsi15dizclmpqqjiwkwfv55ai4hky71rza4nfmyffjznwdz8"; depends=[sp]; }; +diseasemapping = derive { name="diseasemapping"; version="1.1.7"; sha256="1sxvvs7sprjqzd8h51xk6i7jw8081bxzqxllqqhlz105g8czqpwi"; depends=[sp]; }; diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; }; -dismo = derive { name="dismo"; version="1.0-5"; sha256="1zzzj4r96a35ghngszym1dg1wbr8mvinn7cvmqwnnjn3c2zq4w0g"; depends=[raster sp]; }; +dismo = derive { name="dismo"; version="1.0-12"; sha256="1zm3z9z2ramsp85x96rrnmj5zabm8r7f0wfxrxg2sgddwwqvxpsv"; depends=[raster sp]; }; disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; }; +disparityfilter = derive { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; }; displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; }; @@ -3011,6 +3057,7 @@ dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; }; dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; }; +dmm = derive { name="dmm"; version="1.5-1"; sha256="0rblwhlr0gms7zlxgfc6wajf9mphzk2xlg9dk1agd5pdnffljxb9"; depends=[MASS Matrix nadiv robustbase pls]; }; dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; }; dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; }; @@ -3029,13 +3076,14 @@ dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiaz dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[magrittr falsy]; }; downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; }; dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[sem igraph]; }; -dpcR = derive { name="dpcR"; version="0.1.3.2"; sha256="04njbh1jjhj869wi5c3nr6kffn166libi9wcycf26d7hann8frwz"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; }; +dpcR = derive { name="dpcR"; version="0.1.3.3"; sha256="1j2c3b6727598lmz29vl5f4jkf5v1621g3cli588k10frlq55nip"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; }; dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pybif6p86k87gxqr2m2fgjsxzf9nb"; depends=[gmp digest lattice png stringi stringr XML]; }; +dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; }; dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; }; dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; }; -drat = derive { name="drat"; version="0.0.1"; sha256="1vj67q8l6mjkzrdyi325jjdpr0gr1i6sns8sdk4g964kx372f7ih"; depends=[]; }; +drat = derive { name="drat"; version="0.0.2"; sha256="0rsjkwg3dzyv8fi4p889rsq7k51zw8afaldmf7blssz8q7m3i3lv"; depends=[]; }; drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; }; drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; }; @@ -3056,11 +3104,11 @@ dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; }; dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; dummy = derive { name="dummy"; version="0.1.0"; sha256="004w6ymfah608c4rqjnzjy2kyxmcq6gxbh0zhqd82ljv7cah52my"; depends=[]; }; -dunn_test = derive { name="dunn.test"; version="1.2.2"; sha256="0n7z2nimkpbh7d745yrcq2swrkpccncb5vhprm2isbkwig763a6a"; depends=[]; }; +dunn_test = derive { name="dunn.test"; version="1.2.3"; sha256="1p9bmjq3rj674mss1ml2m94nzfrqpg95cb2l6vfrcldc5zja0z7l"; depends=[]; }; dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; }; -dygraphs = derive { name="dygraphs"; version="0.4.1"; sha256="0d3idvmv79qmgsh55lgznxxcdw1bqgwzj481nvcsspssymysfgqq"; depends=[magrittr htmlwidgets zoo xts]; }; +dygraphs = derive { name="dygraphs"; version="0.4.2"; sha256="0wv9mmylfsi3q1hi5wdhnynmcclw3sl7pscpp49ddaz3psg686kz"; depends=[magrittr htmlwidgets zoo xts]; }; dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; }; dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; @@ -3075,7 +3123,7 @@ dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1m e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; }; eHOF = derive { name="eHOF"; version="1.5.7"; sha256="05xvhnq0c8ddpq4x7mncspwy2lh54pl76yz6y38ibw5p8c0gazbs"; depends=[mgcv lattice]; }; eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[MASS Matrix lattice]; }; -eVenn = derive { name="eVenn"; version="2.1.6"; sha256="1kxxaj2ia1v5p0d0yi3vq7rkiajsdsg97k3yg0iqb9v4vbj8mc1y"; depends=[]; }; +eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; }; eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; }; earth = derive { name="earth"; version="4.2.0"; sha256="11fkjl8bvzsalrwc0v6vmk2xkzd1np7z2frygckpy5kyr9zs9l5l"; depends=[plotmo plotrix]; }; @@ -3087,13 +3135,14 @@ ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; }; ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; }; ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; +eco = derive { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; }; ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; }; -ecoengine = derive { name="ecoengine"; version="1.6"; sha256="1dbg9y8hz7z385ml102y3akfffphg0llnyqg5iqblqann7nrzpsn"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; }; +ecoengine = derive { name="ecoengine"; version="1.9"; sha256="0a04zhq1qla55dg8k895slh4sz3h55qgd173q2vm9p9f2gi51w9i"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; }; ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[rootSolve shape diagram deSolve]; }; ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; }; ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c04fmnjfsri7rjanrfki8hngdwpqcx3dkbsg76ii6"; depends=[]; }; ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; }; -ecospat = derive { name="ecospat"; version="1.0"; sha256="1pnyiy89smr0cnw1z5cv83b7dybzs5h2kfyxis2k3rlx26rzczfv"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; }; +ecospat = derive { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; }; ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; }; ecp = derive { name="ecp"; version="1.6.2"; sha256="0j416ns93m7vrb7dnyr4prqm213cg19hbgffvscnb67y3qwj6lic"; depends=[Rcpp Rcpp]; }; edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; @@ -3107,7 +3156,7 @@ eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8 eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; }; effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; }; effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; }; -ega = derive { name="ega"; version="1.0.0"; sha256="1825lwr9bii16nbaj1ryh82gwg2p1r5dhn41cp3l728cfpz5gvlz"; depends=[ggplot2]; }; +ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; }; egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; }; eggCounts = derive { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; }; egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; @@ -3127,7 +3176,7 @@ ellipse = derive { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpx elliptic = derive { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii4z35nws2gc00xkk0dncll0sf5nshcj8fl5"; depends=[MASS]; }; elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; -embryogrowth = derive { name="embryogrowth"; version="5.1"; sha256="1irdx1zkp1k4hqi9c9hrckiy647nld2n9mgw9kx8gp771963n5rq"; depends=[deSolve phenology Hmisc]; }; +emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; }; emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; }; emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; }; emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; @@ -3148,7 +3197,7 @@ english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3v enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; }; enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; }; enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; -ensembleBMA = derive { name="ensembleBMA"; version="5.1"; sha256="12xssw8vwbiv296khig0dhbz30swglqi1m9m3j97gzpc4fi8s4lv"; depends=[chron]; }; +ensembleBMA = derive { name="ensembleBMA"; version="5.1.1"; sha256="1apzfapzycpjhdn4f2cj77rifc9xrxshq35b1j53rb6qqns7ydyz"; depends=[chron]; }; ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kqx3k4a454x8jy0q5v6n1m5lpyqf0py7"; depends=[]; }; entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; }; @@ -3185,6 +3234,7 @@ etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbns etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; depends=[mapdata rgl fields maps]; }; etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; }; eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; }; +eurostat = derive { name="eurostat"; version="1.0.15"; sha256="01g8lc32i441cylwda5jf872gp1w1d6yx4zi2irybb9xmhha5zi2"; depends=[plyr tidyr]; }; evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; }; evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; }; evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; @@ -3199,9 +3249,9 @@ evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1s evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; }; exCon = derive { name="exCon"; version="0.1-3"; sha256="0z09nwv721ld3dbi7c14rd2pjz96kj9pniljmwy9r41fhz36i4yf"; depends=[jsonlite]; }; -exact2x2 = derive { name="exact2x2"; version="1.4.0"; sha256="1yzigyyvzs3aq3sl3birs9bzir1l8b30qfbhfg5aw80w6a5p0hb1"; depends=[exactci ssanv]; }; +exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; }; exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; -exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; }; +exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; }; exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; }; exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; exams = derive { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; }; @@ -3257,10 +3307,11 @@ factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; }; factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; }; fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47jhqlzxx0sxwhkibglpzskg84z"; depends=[BBmisc]; }; +faisalconjoint = derive { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; }; falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; }; falsy = derive { name="falsy"; version="1.0"; sha256="16j6j7kf5xlqg6m2sfdfgpcjf9grrcfh9ij0282hnirgl7a4cvjd"; depends=[]; }; fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; }; -fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; }; +fanc = derive { name="fanc"; version="1.22"; sha256="10j6nggwg76qaycmwi7n6nd7y660c46af82bni2g4jj3fhgkl7ks"; depends=[Matrix]; }; fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; }; fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; }; faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; }; @@ -3278,6 +3329,7 @@ fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbq fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; }; fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; }; fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; }; +fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; }; fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; }; @@ -3287,12 +3339,12 @@ fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; }; fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; }; fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; }; -fdakma = derive { name="fdakma"; version="1.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; }; +fdakma = derive { name="fdakma"; version="1.2"; sha256="17nbaal3m2rz423fq34fia8pb75dzdzsj5d8w6g2iwckqbapszn0"; depends=[]; }; fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; }; fdatest = derive { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[MCMCpack]; }; fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; }; -fdrtool = derive { name="fdrtool"; version="1.2.13"; sha256="0308w4cycapddmv7cg6i65j6wbdckdgnl4n63v06bi4j9dcznksj"; depends=[]; }; +fdrtool = derive { name="fdrtool"; version="1.2.14"; sha256="0q4mxm3vxhvxxbkgl9vxs3q93icipg9hz7qcr4vas8cks1hmzbdw"; depends=[]; }; fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; fdth = derive { name="fdth"; version="1.1-8"; sha256="195219rndjcccd3b1gn3xc9iky8f3w5ig8x9822d4a2xajr78jnv"; depends=[]; }; feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks rgl misc3d]; }; @@ -3303,11 +3355,12 @@ ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2 ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; }; ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; }; fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; }; -fftwtools = derive { name="fftwtools"; version="0.9-6"; sha256="00m4yapdkwfi4vrpg0yhakq2chma46mmbwhd9a15y61w97yzz7vb"; depends=[]; }; +fftwtools = derive { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; }; fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; +fgpt = derive { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; -fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg5cbq8x35i82wrw3gsy27kslyadkd"; depends=[spam maps]; }; +fields = derive { name="fields"; version="8.2-1"; sha256="1zsi3ngp50f61nn93lh1v895as4lp63znf7bzn2q3hsl6ncaylbc"; depends=[spam maps]; }; fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; }; filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; }; filehashSQLite = derive { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[filehash DBI RSQLite filehash DBI]; }; @@ -3325,7 +3378,7 @@ fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; fitbitScraper = derive { name="fitbitScraper"; version="0.1.1"; sha256="1qmrf4lvvqhjsvnslhycy4wg7irsv7l8hr8g94l9p867cz42h58r"; depends=[httr stringr RJSONIO]; }; -fitdistrplus = derive { name="fitdistrplus"; version="1.0-3"; sha256="11v2qiiyfqrlkmc8y48nfzm6s98xabq3ipgkrzb3n8ylwqakdwdq"; depends=[survival]; }; +fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; }; flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; }; flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; }; flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; @@ -3334,7 +3387,7 @@ flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; }; flexsurv = derive { name="flexsurv"; version="0.5"; sha256="0a0mhnz9xayb0pjx4glq09yiz8jplynkq8aniw9saxdik8zd1srg"; depends=[survival muhaz mvtnorm deSolve]; }; flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; }; -flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; }; +flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; }; flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; @@ -3348,11 +3401,11 @@ fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; }; foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; }; -forecast = derive { name="forecast"; version="5.8"; sha256="1f8qfh9z02fhgarhfjp7j25fvsirly08ln8l91a3cg1y2vzi18sv"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; -foreign = derive { name="foreign"; version="0.8-62"; sha256="0niwi5fvj82l2arsqbpiwhidn3wfxjvciav0il8r118p7ivghvr9"; depends=[]; }; +forecast = derive { name="forecast"; version="5.9"; sha256="0x77jdr0qsb3mn9gwzm6gbbhnnn9yhsd1b1hsldj9lpf5ykzf4qc"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; +foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; }; forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; }; forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; -forestplot = derive { name="forestplot"; version="1.0"; sha256="1sv50zqsszkldwq87c2am4547lqqm8fp29ql1z0bdqi6j6mzjkc6"; depends=[]; }; +forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; }; formatR = derive { name="formatR"; version="1.0"; sha256="18wv05ijdymipnyxy5h34y3nbx42ifk79qiapfgx5fjjzpspq6q5"; depends=[]; }; formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; }; fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; @@ -3368,7 +3421,7 @@ fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j2 fractaldim = derive { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; }; frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; -frailtypack = derive { name="frailtypack"; version="2.7.2"; sha256="07vhpz757argz9k15lxnn2iad1gybnnjgw6n9pp7sghh5bynx5j1"; depends=[survival boot MASS survC1]; }; +frailtypack = derive { name="frailtypack"; version="2.7.5"; sha256="1wjb8l6aj1lsmbgczfag8a96r0z235yj315kr7dpkqkninn2bqwk"; depends=[survival boot MASS survC1]; }; frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; }; frbs = derive { name="frbs"; version="3.0-0"; sha256="0v2l8s5jla8jsl9izqfpxhcd1dnrxsa0czlhq1wmx5k06jvbvpdw"; depends=[]; }; freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; }; @@ -3376,30 +3429,30 @@ freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkm freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[ggplot2 GGally FNN mvtnorm]; }; freqweights = derive { name="freqweights"; version="1.0.1"; sha256="13wy8nzs888yn7ld96qq3p7k3xjn6s38qdlfb3nqmh52daqcnn7m"; depends=[plyr dplyr data_table biglm fastcluster FactoMineR]; }; -frm = derive { name="frm"; version="1.2"; sha256="128ya5gx27hywkhf9mivscxsk8rgf07c0y65fh15hp1c8m6dx0nz"; depends=[]; }; -frmhet = derive { name="frmhet"; version="1.0"; sha256="065lmmphz140r5gzspqkn6ch1mrlcwqb7rq7xb6sh0r9cizmqia3"; depends=[]; }; +frm = derive { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; +frmhet = derive { name="frmhet"; version="1.1.2"; sha256="1a6q5qz22b4sx5l1jz50x1q3bz8sj91dj2cahq28h6ss5b8vfn0y"; depends=[]; }; frmpd = derive { name="frmpd"; version="1.0.1"; sha256="104frdraawj8g76589kz4csbgzkvs4rgdhgwmb77srhqp5nc8v96"; depends=[]; }; frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; }; frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; -fscaret = derive { name="fscaret"; version="0.9"; sha256="082k67fd666hjcarsxmhn8hbscv5l8l0n84kv5asqjjshgz0nzwz"; depends=[caret gsubfn hmeasure]; }; +fscaret = derive { name="fscaret"; version="0.9.3"; sha256="0jfksc0m2jjgik2zbrmhjb8ngr5s58nxqrx68wd59vpnxixn0fv4"; depends=[caret gsubfn hmeasure]; }; fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; }; fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; }; fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; }; -ftsa = derive { name="ftsa"; version="4.1"; sha256="02m4w7yb26gcg9226h118jj75pwcc6r23p96c1kbsg5fccrfw8ff"; depends=[forecast rainbow colorspace MASS pcaPP]; }; +ftsa = derive { name="ftsa"; version="4.2"; sha256="0yph80a51lphv7kqrpcm01rga8pq3ngfimzada7lghycac9ab4rf"; depends=[forecast rainbow colorspace MASS pcaPP R2jags]; }; fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp Rcpp]; }; fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; -funFEM = derive { name="funFEM"; version="1.0"; sha256="1jvax3ch21391f34gdd4yp8cbnrhl3sj9hny7slj2v0iq9iiz2wj"; depends=[MASS fda elasticnet]; }; +funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[MASS fda elasticnet]; }; funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive { name="funtimes"; version="1.0"; sha256="0jdl09x0fvfz08xyg1yfyhn0lgg8ycqbli4ag9js0yva8pwab7lh"; depends=[Jmisc]; }; futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; -futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; }; +futile_logger = derive { name="futile.logger"; version="1.4"; sha256="1sn28kmphjxxq1bqyjbsv75bnh71pwngcfar5l18jr8x9ymjq4zk"; depends=[lambda_r futile_options]; }; futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; }; futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; @@ -3439,7 +3492,7 @@ gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnsk gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; }; gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; }; -games = derive { name="games"; version="1.1-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; }; +games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[maxLik Formula MASS stringr]; }; gamlr = derive { name="gamlr"; version="1.12-1"; sha256="17vfb3kac5y3xfw8s1m8czm5bq5z6x6lc43f2szj5lv84mf2r6y7"; depends=[Matrix]; }; gamlss = derive { name="gamlss"; version="4.3-4"; sha256="0qbxcfvhy8blswzv8194x9f08p25vhknnm3h4hhz9lp5gh536fbk"; depends=[gamlss_data gamlss_dist nlme MASS survival]; }; gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss_dist gamlss mgcv nnet rpart]; }; @@ -3457,12 +3510,13 @@ gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmb gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; depends=[]; }; gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; }; +gapminder = derive { name="gapminder"; version="0.1.0"; sha256="06hi4m9i86nkdyz7w9wa4qkpbsl2178qskzzy8168wlzayx820ad"; depends=[]; }; gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp Rcpp RcppArmadillo]; }; gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; }; gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; -gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; }; +gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[survival lattice]; }; gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; }; gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; }; gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; @@ -3473,7 +3527,7 @@ gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8la gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; }; gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; }; gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; }; -gdistance = derive { name="gdistance"; version="1.1-6"; sha256="1cla8gc6ffx0cd25w8v8wi3w306wld4kj6bcar0q6d7hd018kpir"; depends=[raster igraph Matrix sp]; }; +gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; }; gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; }; geeM = derive { name="geeM"; version="0.7.2"; sha256="0qxamrkmiy70g9kkncrwgh3gx8dq5ixfwbcl8k4dgf5i5051giw9"; depends=[Matrix]; }; geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; }; @@ -3481,15 +3535,15 @@ geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; }; geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; }; gelnet = derive { name="gelnet"; version="1.0"; sha256="06cyd5g5yxmyqiqjvp02f2k2ha50sk8qjqmmwcfxhaxysk9vbaag"; depends=[]; }; -gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; }; +gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; }; gemtc = derive { name="gemtc"; version="0.6-1"; sha256="1da5z1gvad5rgc5cm3w69x58qjqfg7x65z71h91g89f5nvwxkl2c"; depends=[coda igraph meta XML]; }; gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; genMOSS = derive { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; }; -genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; }; +genalg = derive { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; }; genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; }; -gendata = derive { name="gendata"; version="1.0"; sha256="1hyyf9kpf8f0xxwwvirxlz6nw6wf2wqq5vvjnyikq5dwa7a3ngmw"; depends=[]; }; +gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; }; genderizeR = derive { name="genderizeR"; version="1.0.0"; sha256="1a4zjbg8v7ig6hglbkvxbsp4q9hyy3zr751vmcsv529ikgiikkji"; depends=[jsonlite stringr tm data_table magrittr RCurl]; }; geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; @@ -3501,11 +3555,11 @@ genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5g genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[plspm quantreg mice diagram]; }; genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; }; gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; -geoBayes = derive { name="geoBayes"; version="0.1.3"; sha256="0i5yxdgcbikq9b69f9z7080mcrff7phzij25q9jsd63rlld1nz77"; depends=[coda sp]; }; +geoBayes = derive { name="geoBayes"; version="0.2.150308"; sha256="0n1i3l0qk5yy3h7hdjd03wd197qrv76n4vq3pv8av4n2k4m7dk2v"; depends=[coda sp]; }; geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; }; geoR = derive { name="geoR"; version="1.7-4.1"; sha256="19mafynvnpabwm5i6m4ax6d9rrh3fgyg9sslb552v6ry9nfq31h0"; depends=[sp MASS splancs RandomFields]; }; geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; }; -geocodeHERE = derive { name="geocodeHERE"; version="0.1.1"; sha256="1j7xw3ca9clyxcq0banj8cw03f7ryj6pidn5hrff2xvfz215qz7h"; depends=[httr]; }; +geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; }; geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; }; geomorph = derive { name="geomorph"; version="2.1.3"; sha256="1jym15xlpbgc6lfd8dzl6ixc9mn79m1a9a8jiw1yjw9kgkvp8w6p"; depends=[rgl jpeg ape geiger phytools]; }; @@ -3516,34 +3570,34 @@ geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrl geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; }; geosphere = derive { name="geosphere"; version="1.3-11"; sha256="0gsbzbx7x4ly7dfh8ld3fa795ysf4sl8a1jg3jc12nrrx85cwl74"; depends=[sp]; }; geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; }; -geostatsp = derive { name="geostatsp"; version="1.1.9"; sha256="1m6cihsm6k9l3kdp8chvsz5cqllbmk0mx08n8wp6zkaa02kl9izn"; depends=[Matrix raster sp abind numDeriv pracma]; }; +geostatsp = derive { name="geostatsp"; version="1.2.1"; sha256="0p93b8mmjsqg7qg1c6v7c5ism8jqf7w21rydck7agh4i64q47s7y"; depends=[Matrix raster sp abind numDeriv pracma]; }; geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; -geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; }; +geotopbricks = derive { name="geotopbricks"; version="1.3.6"; sha256="1c4v590r27lsz2ld2dsi9dv7fsbfklyqgsjvcrbk4di18nc1hygp"; depends=[raster stringr zoo rgdal]; }; geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; }; getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; }; gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; }; gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; }; gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; }; -ggHorizon = derive { name="ggHorizon"; version="0.1"; sha256="0k617qnfqdl9w2hdwppkrgl51krnwpdf0gahzvivcwzynbmywc37"; depends=[ggplot2 plyr RColorBrewer proto]; }; ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; ggRandomForests = derive { name="ggRandomForests"; version="1.1.3"; sha256="0yz25imvlpblrw2v9b5s39na9diljh2g93mmcv9gljad40iy34va"; depends=[randomForestSRC ggplot2 survival dplyr reshape2]; }; ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; }; +ggenealogy = derive { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; }; gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; -ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; }; +ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj jpeg geosphere digest]; }; ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr tidyr ggplot2]; }; ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; }; -ggplot2 = derive { name="ggplot2"; version="1.0.0"; sha256="138rxp8zr0x945ajmhg35x35xs0ci743iqhffqy90c7hcn0gpvz6"; depends=[plyr digest gtable reshape2 scales proto MASS]; }; +ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[plyr digest gtable reshape2 scales proto MASS]; }; ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; }; ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; }; -ggtern = derive { name="ggtern"; version="1.0.3.2"; sha256="05nh8610l5lw41wkidl2m78nqyfbc7faiawpc442lin3qxrj64bq"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; }; -ggthemes = derive { name="ggthemes"; version="2.1.0"; sha256="1gcl0mw3yq4yskwq1yjjx4bs9hv47s9apxgpjlciaih0b5zw2461"; depends=[ggplot2 colorspace proto scales]; }; -ggvis = derive { name="ggvis"; version="0.4"; sha256="09q7ccg5lsj0qqixpiq4xccpqckr7g4ws7ysr5mac3sgl8hm9r87"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; }; +ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; }; +ggvis = derive { name="ggvis"; version="0.4.1"; sha256="1sl6ygglgsg7xhzzkxaap8pzb2zmfw0y481w7r7s1nyg7pdgr0r2"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; }; ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; }; giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gimme = derive { name="gimme"; version="0.1-1"; sha256="1snzlwq6d86ygpn778m3inlfqpymp0l05pdlrdkm8ip4wgir0hvs"; depends=[lavaan qgraph]; }; gistr = derive { name="gistr"; version="0.1.0"; sha256="1izas53whxa4n8gdkifv1a9c8f3fpi21vs81kn2dk51xmhs8qhh2"; depends=[jsonlite httr magrittr knitr]; }; +git2r = derive { name="git2r"; version="0.7"; sha256="02b4p7knrywr1sqijg85mxnm5y4mlp5z3rgylia8vdz473z6prr9"; depends=[]; }; gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; }; glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; }; glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; @@ -3557,8 +3611,9 @@ gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2i glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; }; glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; +glmgraph = derive { name="glmgraph"; version="1.0.0"; sha256="1q3j2djw0v5187agnrfabhgwm6yh0i05yzxdaba3kgbcsdrdr8mn"; depends=[Rcpp Rcpp RcppArmadillo]; }; glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; -glmm = derive { name="glmm"; version="1.0.1"; sha256="1xsfxrc2lc3p0c2lwrrrw5y3yfxmmfjyqi3zwsad5l6bg08d6b6i"; depends=[trust mvtnorm Matrix]; }; +glmm = derive { name="glmm"; version="1.0.2"; sha256="0qlsqg1sp4p4qy95k52dc7c58lfmlxh0vk0jdpqzpi4rrh7ngpan"; depends=[trust mvtnorm Matrix]; }; glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; }; glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; }; @@ -3578,7 +3633,8 @@ glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[httr base64enc magrittr jsonlite mime]; }; gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; }; -gmm = derive { name="gmm"; version="1.5-1"; sha256="14rm73h0kg7kb3dsd08mxbcp41y6a730nmpfnpndh4lsgkk6d5jb"; depends=[sandwich]; }; +gmm = derive { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; }; +gmnl = derive { name="gmnl"; version="1.0"; sha256="1nvk6x5412bfqdg54051hnisbnfm3d4yv9l2568jcz49pa8lay4d"; depends=[maxLik Formula plotrix msm mlogit truncnorm]; }; gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; }; gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; @@ -3608,6 +3664,7 @@ grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9j gramEvol = derive { name="gramEvol"; version="2.0-2"; sha256="1xrn5gkr9rxw53i5l2sqcgai9q0w4kyrychf0nq17cvcynw1y1lx"; depends=[]; }; granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; }; +graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[Rcpp Matrix glasso glmnet mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; }; graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; }; greport = derive { name="greport"; version="0.5-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; }; @@ -3635,22 +3692,24 @@ gsarima = derive { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxx gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; }; gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc mvtnorm MCMCpack]; }; gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[mgcv mvtnorm boot numDeriv]; }; +gsheet = derive { name="gsheet"; version="0.1.0"; sha256="02mclvkq9lpp57ii8k3wj8cqjii9zsg4nl4i7zsa8b88r2bjmf9r"; depends=[dplyr rvest stringr]; }; gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; }; gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; gss = derive { name="gss"; version="2.1-4"; sha256="0vmyz3q7b2chzmvrwx6bk2yj5kmaxym6lznyrddxgf7xzjipvlii"; depends=[]; }; gsscopu = derive { name="gsscopu"; version="0.9-2"; sha256="0hg2ry9rhnn51g368fg1zxswx826y3m0yn2wjb2g5rw4a4zn1frr"; depends=[gss]; }; -gstat = derive { name="gstat"; version="1.0-21"; sha256="0zxai0r9hmmdy7xvf5f6hzlyw9rmy90ddkfckdapsw88pr10ww1n"; depends=[lattice sp zoo spacetime FNN]; }; +gstat = derive { name="gstat"; version="1.0-22"; sha256="1jbjl2irg0a2jdxwk7nr3c33jf3dzbcydpxxjmld23zzx94qy1iv"; depends=[lattice sp zoo spacetime FNN]; }; gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; }; gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; }; gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; }; gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; -gte = derive { name="gte"; version="1.2-1"; sha256="0h6c5n9wz8b4b5pmqfbc8ivqpg2jh4k6x94wns1l33kiah70pmjd"; depends=[survival]; }; +gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; }; +gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts quadprog lassoshooting]; }; gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; }; -gvcm_cat = derive { name="gvcm.cat"; version="1.7"; sha256="0wgras21wzx1magcayz9nra8licrbx8aglmc272wrw3nqiagh0fi"; depends=[Matrix MASS]; }; +gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[Matrix MASS mgcv]; }; gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; @@ -3665,6 +3724,7 @@ harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hlia hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; }; hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[]; }; +haven = derive { name="haven"; version="0.1.1"; sha256="0lc6zsl688ms76qjb3lsbid968byq3084513q6g9a1caa3qmvhz0"; depends=[Rcpp Rcpp BH]; }; hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp Rcpp RcppArmadillo]; }; hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; }; hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; @@ -3689,9 +3749,9 @@ heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3izym4k8ljakwqpgq94wfhrdxp0q393zb8rq"; depends=[maptools RCurl rjson sp]; }; heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; -hergm = derive { name="hergm"; version="2.1-1"; sha256="0d2y4zkd5xv1r4ynkwwaj4kj54m5avlrnk60m3xsfbwcbbblf2fx"; depends=[ergm latentnet network sna]; }; +hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; }; heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; }; -hermite = derive { name="hermite"; version="1.0.1"; sha256="0y49dj905y9x4pjrx6iki3mk5kkppbd1c6dk0yvvh7sisapnphjx"; depends=[]; }; +hermite = derive { name="hermite"; version="1.0.2"; sha256="0hmh3vpla3xjr4gasv9jsq4ldpchzip8hqbz31c2a77kkhbmrg22"; depends=[maxLik]; }; het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; }; hexView = derive { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; }; @@ -3705,17 +3765,20 @@ hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4a hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive { name="hiddenf"; version="1.1"; sha256="04pl3glvg3m1xzvxnc5lwjz839zrpc8zhnsxcswvvaqpgzip5f1p"; depends=[]; }; hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; +hierDiversity = derive { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; }; hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[truncnorm mvtnorm Matrix coda xtable mc2d ggplot2 rgeos]; }; hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; }; highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; }; -highTtest = derive { name="highTtest"; version="1.0"; sha256="0iyr47nid147m9m8bsjjxc9kvjv68rgay4naxldwisyscqp8jl0m"; depends=[colorfulVennPlot]; }; +highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; }; highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; }; highr = derive { name="highr"; version="0.4"; sha256="18qfh6v5h29g6y2fkgd4qnkl1ijzzjh369gvn9pzcgaapm6s2wpf"; depends=[]; }; hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; }; +hisse = derive { name="hisse"; version="1.0"; sha256="0vbwc006ypn9jcaw86dcvmg2hyjwb88h45zx8kjr5w506818phjp"; depends=[ape deSolve GenSA subplex]; }; +histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; }; histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; }; historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; hitandrun = derive { name="hitandrun"; version="0.5"; sha256="1f7h963hqyhir3c26dyi0gvv5pf0a7x8sw2km3wh4ncwx2barfzq"; depends=[rcdd]; }; @@ -3730,6 +3793,7 @@ holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalz homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[rgl ape scatterplot3d]; }; homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; }; homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; }; +hornpa = derive { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; hot_deck = derive { name="hot.deck"; version="1.0"; sha256="11dxj676y55p4n0c27l7f3ns8kk308f6b6lhwfpjqfz0wgysnfq9"; depends=[mice]; }; hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; }; howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; @@ -3740,11 +3804,11 @@ hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; }; -htmlTable = derive { name="htmlTable"; version="1.1"; sha256="18nw20y3v5rqq3kfybm2clr8vmr43i5girfjzcrngbmy3qxiq64j"; depends=[stringr knitr magrittr Hmisc]; }; -htmltab = derive { name="htmltab"; version="0.5.0"; sha256="1c5bcx00wgh2xvghg91jyv7086y5ya0bil4igfsqjqsn0lfcjxpg"; depends=[XML]; }; +htmlTable = derive { name="htmlTable"; version="1.2"; sha256="06hbc3wvymksr83cxy9rjkfw860sfg513ylipgdnxzr5h986hfad"; depends=[stringr knitr magrittr]; }; htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; }; htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; }; hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; +httk = derive { name="httk"; version="1.1"; sha256="198zxzap9m8c6rlzqjfrg6b9pvgbksk2myq5cw7j37j63lfnblki"; depends=[deSolve msm]; }; httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp Rcpp]; }; httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime RCurl R6 stringr]; }; @@ -3762,16 +3826,16 @@ hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36s hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; }; hydrogeo = derive { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; }; hydrostats = derive { name="hydrostats"; version="0.2.3"; sha256="1hd4jcdkdl546kqvx9swnqn7gjvd7ppz034cqflpckhn68rc62g7"; depends=[]; }; -hyperSpec = derive { name="hyperSpec"; version="0.98-20140523"; sha256="1ypmq5xgcjqrq9i8f08csjqffv9qfpfkvrbawlf1ds7i49h6jq28"; depends=[lattice mvtnorm]; }; +hyperSpec = derive { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[lattice ggplot2 mvtnorm latticeExtra svUnit]; }; hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; }; hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; }; hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; }; -hypervolume = derive { name="hypervolume"; version="1.1.2"; sha256="1d4c5lfvr32w5mdrll6kg7frykhc8wfg3i5v3a93s0df02yprc4s"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; +hypervolume = derive { name="hypervolume"; version="1.2.2"; sha256="1nc5hybw5aa5pdrf9j1jv6d69q1im7whz0d05rmyskcayy2x3pyi"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypred = derive { name="hypred"; version="0.5"; sha256="07jxpzh53qmv1vs2yhgnvxwcwkwpp6a12861i4a5n6pvwivw220d"; depends=[]; }; hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; }; hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; }; -iBATCGH = derive { name="iBATCGH"; version="1.1"; sha256="0nl5l17pm92ns40qzkmayc48a6i4j8w0562sp5jxyi95y4vb4aiy"; depends=[Rcpp msm Rcpp RcppArmadillo]; }; +iBATCGH = derive { name="iBATCGH"; version="1.2"; sha256="0py83q8fcrh0kjysvljx22b7s2gsccq19rzvwf3alq8vl59sm48i"; depends=[Rcpp msm Rcpp RcppArmadillo]; }; iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; }; iC10 = derive { name="iC10"; version="1.1.2"; sha256="1ncxdjw9ary0bs3fvnvyqp356gi4wa177sllkizq71fzn75a03x3"; depends=[pamr iC10TrainingData]; }; iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; }; @@ -3788,7 +3852,7 @@ ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxa ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; }; ibelief = derive { name="ibelief"; version="1.0"; sha256="1mcmq1zpj1f6alhnsznb27iknp7dzdsd25di8a64hw5c3cnx3xay"; depends=[]; }; -ibmdbR = derive { name="ibmdbR"; version="1.34.3"; sha256="0b0v61sf033fmhp2vn6g5vgy3irsqlpqgiz8j0h068p4fr2q660v"; depends=[RODBC MASS]; }; +ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[RODBC MASS]; }; ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; }; ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; }; ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; @@ -3797,7 +3861,7 @@ icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha2 icamix = derive { name="icamix"; version="1.0.1"; sha256="06jaznzgixglbrrmvmp3cnghdldv30h5nfjghvdymia27m7ssdrr"; depends=[Rcpp Rcpp RcppArmadillo]; }; icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; }; -icd9 = derive { name="icd9"; version="1.0"; sha256="1imayxcg58dg56wakwn7qcqm5r9xw0idzvh942rl0ir9xgz7dp7m"; depends=[Rcpp checkmate Rcpp]; }; +icd9 = derive { name="icd9"; version="1.1"; sha256="10swy0zhzip412icc9nf324za3czcjfpby6d9ha480504073fakm"; depends=[Rcpp checkmate Rcpp]; }; icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; }; idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; @@ -3809,14 +3873,15 @@ ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgj igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; }; igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; depends=[]; }; igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; +ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[zoo lubridate climdex_pcic PCICt]; }; ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[demography rainbow forecast date survival]; }; imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; }; +import = derive { name="import"; version="1.0.1"; sha256="14frkzjll9jj7cxlsvvcrrzpicx25mn90zz4rbm568ai5k9gsa5g"; depends=[]; }; imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[tmvtnorm norm]; }; imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; }; -imputeYn = derive { name="imputeYn"; version="1.2"; sha256="08i3bwzmd4cn3cbwbrcjh3b75m7xms9m3dpmym99g08282cmljwx"; depends=[quadprog emplik mvtnorm survival]; }; in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; }; inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[RRF arules gbm xtable]; }; inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp Rcpp]; }; @@ -3825,11 +3890,12 @@ indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7 indicspecies = derive { name="indicspecies"; version="1.7.4"; sha256="1b9fgdsprh89siqps30v2yz0hsvfxffz2ynp1z74dmvx52iih4vs"; depends=[permute sp rgeos]; }; ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; +inferference = derive { name="inferference"; version="0.4.61"; sha256="02rsirwh4arqkgxpw3vnd0m2k055ir2074mlz27gbzmwz0ycpfzk"; depends=[numDeriv lme4 Formula]; }; inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; }; influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lme4 Matrix lattice]; }; influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; }; infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; -informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; }; +informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; infra = derive { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; @@ -3843,7 +3909,6 @@ intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfb intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[sp gstat automap mvtnorm MASS evd]; }; intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; }; intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; }; -integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; }; interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; }; interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[network igraph]; }; @@ -3860,12 +3925,12 @@ io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmn ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[]; }; iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; }; ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; -ipdw = derive { name="ipdw"; version="0.2-1"; sha256="18qvw635dy9ddz16nn0j4s0n97nbyw7yb4a8v1m0f5v9prggj7py"; depends=[gdistance raster]; }; +ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance sp raster]; }; ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; }; iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; }; -ipred = derive { name="ipred"; version="0.9-3"; sha256="07mw1mdlczlpy232n2sacwncdjcsn6mv7rrzk9xvl2g85pn3bhjl"; depends=[rpart MASS survival nnet class prodlim]; }; +ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[rpart MASS survival nnet class prodlim]; }; ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; }; -iqLearn = derive { name="iqLearn"; version="1.2"; sha256="160nl63bxr9ira7v89ags9fm7zd5v09h1820i8bq5wxxfcyjarja"; depends=[]; }; +iqLearn = derive { name="iqLearn"; version="1.3"; sha256="05f2spnzyqzbbgwz9llf4x5r6fsz5gxa1ckykv6wxg4sirdqccm1"; depends=[]; }; irace = derive { name="irace"; version="1.06"; sha256="10dizzjds1aszvyh0fn6ahqvgn2x6sg3lwb7rca8zhgphrjg92bl"; depends=[]; }; irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; }; irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; }; @@ -3874,7 +3939,7 @@ irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; isa2 = derive { name="isa2"; version="0.3.3"; sha256="0czviglmbb7hmhghrg4hla4xhbjr98a5ivqkbq70rnfmqzffcxcz"; depends=[]; }; isdals = derive { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; -isingLenzMC = derive { name="isingLenzMC"; version="0.2.1"; sha256="1g1rz8p9vw2jnx6qw9mb614fpkv5bd7cndwcz0mva33y5shhnibl"; depends=[]; }; +isingLenzMC = derive { name="isingLenzMC"; version="0.2.3"; sha256="1rkry39yhxvq3ypnnxgdv15kd5w0l5w56ywmkcsgkwlxdfrvlyn2"; depends=[]; }; ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfgwsj6c2wnx2sm3ncxzlqml0ih6jn"; depends=[mgcv]; }; isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; }; isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[vegan cluster]; }; @@ -3890,6 +3955,7 @@ itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; }; its = derive { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; }; +itsadug = derive { name="itsadug"; version="0.8"; sha256="1lphbw1d1x1bs625rnr9jl3zyaqr8rka8d0v2v3cf3crywc3lzhn"; depends=[mgcv]; }; itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; }; ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; }; ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; @@ -3900,21 +3966,21 @@ ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[RCurl jsonlite]; }; jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; }; -jackknifeKME = derive { name="jackknifeKME"; version="1.1"; sha256="1bzwgyyc2zcm27qahbbf5iqx24q0ddwlzwg7h4h866rlwzb4xf1b"; depends=[imputeYn]; }; jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; }; jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip5qxpd13sx79f85wb0ji5i4fjax26ky"; depends=[lattice rjags coda]; }; +james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; }; jiebaR = derive { name="jiebaR"; version="0.4"; sha256="0vm41z2kc5zvvqmamwfqacc1ndpa0npk515zn7v4bd6gv6dw2lgn"; depends=[jiebaRD Rcpp Rcpp]; }; jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; +jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; }; +joint_Cox = derive { name="joint.Cox"; version="1.0"; sha256="1460i8ydwd0ix3slm9bn8jca5b1vs0w2wwx1md4npbmf5ly5x42l"; depends=[]; }; jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwislf7smw9fknlgb99sf5p3w9ca0"; depends=[]; }; jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; -js = derive { name="js"; version="0.1"; sha256="0jmfb4dmm0g1g14a9mwiqz3mcb8h46lbp781bjr0knfpzh5b20nc"; depends=[V8]; }; +js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; }; jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; }; -jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; }; -jvmr = derive { name="jvmr"; version="2.11.2.1"; sha256="0h76b1596zil2m6fbhp38gchxwif942sldbfc6sgbn3ig9mz8zw5"; depends=[rJava]; }; -jwutil = derive { name="jwutil"; version="1.0.2"; sha256="01c2mjg719bqjzca1a0ac6q0af2jc95jb292smvrq4bx1bd5nwpi"; depends=[]; }; +jtrans = derive { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; }; kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; }; @@ -3927,6 +3993,7 @@ kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53 kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; }; kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; }; kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; }; +kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lwvc46k9hmbhylng66wc7a5j6k8psz"; depends=[knitr]; }; kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; }; kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; }; kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; }; @@ -3959,14 +4026,14 @@ kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxg kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; }; kpodclustr = derive { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; kriging = derive { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; -krm = derive { name="krm"; version="2014.12-1"; sha256="0lf506q6975vihkd75wwndqaa86ci4d4k4ijjzpvv31xw2kkbwb6"; depends=[kyotil]; }; -ks = derive { name="ks"; version="1.9.3"; sha256="077sx9kms8nkgg6c4bg24n0j6a7bf253bp26hybyilbagp7k6pin"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; +krm = derive { name="krm"; version="2015.3-4"; sha256="0zm2d3naprvv10ac28k4h2r6f1ygi8wic0gwbm6mvgwpb530gga1"; depends=[kyotil]; }; +ks = derive { name="ks"; version="1.9.4"; sha256="0gi93d981y2i5q80wxh7f4dwwh7sjw6iy63y7571nzf01yw00gbx"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; kselection = derive { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; }; ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; }; ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; }; kulife = derive { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; -kyotil = derive { name="kyotil"; version="2014.10-5"; sha256="1gfgrqqg1r8xydlyvrarj7mngy64ppfm6bszqkmy2rbfrj1n29hl"; depends=[]; }; +kyotil = derive { name="kyotil"; version="2015.2-27"; sha256="0xx54b332bfg0b69m80d2qafcy7bwc5b7paq3x02rkh6xllsnq4y"; depends=[]; }; kza = derive { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; }; kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; @@ -3981,8 +4048,9 @@ labstatR = derive { name="labstatR"; version="1.0.7"; sha256="1p6xav9cb7yx3n8rkh laeken = derive { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; }; laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lakemorpho = derive { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[maptools rgdal raster rgeos sp geosphere]; }; -lambda_r = derive { name="lambda.r"; version="1.1.6"; sha256="03f3945f9kqj7in1mxk23ai56x68rdyd10c3ki4nqqysshyjr4d4"; depends=[]; }; -lambda_tools = derive { name="lambda.tools"; version="1.0.3"; sha256="1vd1ms8yzy01wvg4baj2ypyiyy27ck3na9awlmvhdvxc1s459sr7"; depends=[lambda_r]; }; +laketemps = derive { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; +lambda_r = derive { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; }; +lambda_tools = derive { name="lambda.tools"; version="1.0.6"; sha256="13yxrgsam47adv08zl01harjq37pccfsar105b6ccf2qv3lrkdk7"; depends=[lambda_r]; }; landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; }; languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; @@ -3994,7 +4062,7 @@ lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47r lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; }; latentnet = derive { name="latentnet"; version="2.6.0"; sha256="0aw184r1w28d4lmznnx4hp8kwws0r13fmbx1wlsbg3zagmwwjn8d"; depends=[statnet_common network ergm sna mvtnorm abind coda]; }; -lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; }; +lattice = derive { name="lattice"; version="0.20-30"; sha256="10985l95p7mx403kz3pc8j5iqfsb1zz7w6hsw53xwd436ykf132j"; depends=[]; }; latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; }; latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; }; lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7fb0hynnlfh1w870xz8imgf20yp"; depends=[numDeriv]; }; @@ -4008,10 +4076,11 @@ lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4w lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; }; lba = derive { name="lba"; version="1.0"; sha256="108kfffwpvl6rjcmmxswprxxqcv1sj7w9mmca4pwaiprad7p7x59"; depends=[MASS alabama plotrix ca]; }; lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp Rcpp]; }; +lbfgsb3 = derive { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; }; lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[igraph MASS ggm]; }; lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; -lcmm = derive { name="lcmm"; version="1.6.6"; sha256="1n3m1r34rvdjjpj4854iwy74vlhwiaj30q48rk9jph98q4hz3vgx"; depends=[survival]; }; +lcmm = derive { name="lcmm"; version="1.7.2"; sha256="1sg5vx3nx8ik5z2c2pi3p9h5b5k0z7m1jc404jkv3gr17nilcp4i"; depends=[survival]; }; lctools = derive { name="lctools"; version="0.1-3"; sha256="1wn9qymbcq9q99xnjbk3qswrfljvfqqhihvgr0brbpq3pbbxh55x"; depends=[reshape weights]; }; lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rzhs6217793nfri6y6mq23vs8z"; depends=[]; }; ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; }; @@ -4024,21 +4093,21 @@ leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j6 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; }; leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; -lessR = derive { name="lessR"; version="3.1.1"; sha256="0cx5bvwfkrfy5im7x718ixf45aw22561b9w0vv0qp97y7xyjqja5"; depends=[car leaps MBESS foreign gdata triangle]; }; +lessR = derive { name="lessR"; version="3.3"; sha256="0hzvf85x81p5lcszrpf897azh4fgpij2zyk0z5icma67aifdf5bf"; depends=[car leaps MBESS foreign gdata triangle]; }; lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; -lfe = derive { name="lfe"; version="2.0-1570"; sha256="0j3xbch6xk8zm4wbhs9lr60893r0dsqfvlvd8l13bqa3sq9xfhp6"; depends=[Matrix Formula xtable]; }; +lfe = derive { name="lfe"; version="2.1-1640"; sha256="1l0y64rk58x40nrz7xl17cc672hf4q7yz77r2f5blgmxjg769pj5"; depends=[Matrix Formula xtable]; }; lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; }; lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; }; lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; }; -lgcp = derive { name="lgcp"; version="1.3-8"; sha256="1ijv7k8y489zjsrms2laqr60r1ggx5v8d5kb16c6h6nkh8zrnw40"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; +lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0jw78zl9qrmkn314vaqyn3b4608"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; lifecontingencies = derive { name="lifecontingencies"; version="1.1.5"; sha256="0v4rdq4ajd12ri1agn9i57nigxpgvg67clpskks761b7n1b6l77v"; depends=[markovchain]; }; -likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; -likelihood = derive { name="likelihood"; version="1.6"; sha256="11p7k6wpr7ypas414qir0hracy0960j8g3nwlhjbmynwmfzpkq1r"; depends=[nlme]; }; +likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; +likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; }; limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[quadprog lpSolve MASS]; }; limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; @@ -4063,13 +4132,14 @@ lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lg lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; }; lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; }; lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[numDeriv statmod lmeNBBayes]; }; -lmeNBBayes = derive { name="lmeNBBayes"; version="1.3"; sha256="0zvbliryh821hxxzr2d5irbjp50vkhdmrkzgphv9jnzqh7rr3hvm"; depends=[]; }; +lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; }; lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; }; lmerTest = derive { name="lmerTest"; version="2.0-20"; sha256="1x3h78lnj7j002lzx0yxg36vl98z5xmk913k3h2wssxfva9ljp0w"; depends=[Matrix lme4 plyr numDeriv MASS Hmisc gplots]; }; lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; +lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[nlme MASS]; }; lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; }; lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; }; lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; @@ -4087,6 +4157,7 @@ localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; }; locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; }; locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; }; +lodGWAS = derive { name="lodGWAS"; version="1.0-3"; sha256="1fb70p2mvp742557ns44ilb9m85aqq59p5x6vdrmb22hczsjj6q4"; depends=[survival rms]; }; loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; }; log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; }; logbin = derive { name="logbin"; version="1.0"; sha256="17vabb348kczn839mhwshn20qgrdnpd0ll81hb8bcsricm6dqhna"; depends=[glm2]; }; @@ -4105,7 +4176,7 @@ logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp9 lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; }; lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; }; -longitudinal = derive { name="longitudinal"; version="1.1.10"; sha256="1mnviq4v040kbcsca04gzfx2lfz2ipv3nbmqgkbp9v45w96qymq9"; depends=[corpcor]; }; +longitudinal = derive { name="longitudinal"; version="1.1.11"; sha256="0rzi177v9k6gy1wv06vf81r1q0ml81ssf83v0z8rpmx5j91d71ac"; depends=[corpcor]; }; longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; }; longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; }; @@ -4123,13 +4194,13 @@ lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxx lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; }; lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; }; -lsbclust = derive { name="lsbclust"; version="1.0.1"; sha256="13vp6jz4py8ljp6sa1swpcw2j7lg7qfj3xk1qbi0kbw0krswg959"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; }; +lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb937nw8s7ky25njc3fnl4hdpc8rj7m44hwf"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; }; lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; }; lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; -lsmeans = derive { name="lsmeans"; version="2.15"; sha256="14fl0nfqypbnqqdl7q0gvjn9880j6wkdk48jbf0xq953l11qw4sh"; depends=[estimability multcomp plyr Matrix mvtnorm]; }; +lsmeans = derive { name="lsmeans"; version="2.16"; sha256="1cmxg4cxf7snmpnargdwvgr061acpbish934pcdmnhslr1k2sj9j"; depends=[estimability multcomp plyr Matrix mvtnorm]; }; lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; -lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; depends=[]; }; +lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; @@ -4155,7 +4226,7 @@ maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcq maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; }; maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[rpart C50]; }; mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[mvtnorm ellipse mvmeta]; }; -mads = derive { name="mads"; version="0.1.1"; sha256="070948j1r1dpymg2smgciz87nzpkv5fwvfsfppf0jrgfncivav1l"; depends=[mrds]; }; +mads = derive { name="mads"; version="0.1.2"; sha256="1hbanfa1wnfvfs0g8dcf5z4439v0pp3rqhxahiis03jlfxzgd841"; depends=[mrds]; }; madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; }; magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; magicaxis = derive { name="magicaxis"; version="1.9.3"; sha256="0dxlqpxw82v9cxfp475ppd02ywvlg96b1cfj02fjvs04xfprhar0"; depends=[MASS plotrix sm]; }; @@ -4167,9 +4238,11 @@ makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spg mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive { name="managelocalrepo"; version="0.1.4"; sha256="060r9wkrn2v6wij926l7qlxlw8k2zbgrmwf2awf1x6llfs4vaiby"; depends=[stringr assertthat]; }; manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; -mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; }; +mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; }; +mapStats = derive { name="mapStats"; version="2.3"; sha256="0kws795f8s6rgbwyzjz90vzlh2ipp0c0mwdbsry5aasg4qj97ns0"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; }; mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; }; -mapmisc = derive { name="mapmisc"; version="1.1.1"; sha256="0q30y243dava7zq2gz2dn5kbxc5m55cylhyzcwchrv2ax677x8yz"; depends=[sp raster]; }; +mapfit = derive { name="mapfit"; version="0.9.6"; sha256="1mfw4ihshf3lc3xfdyh2rawaqly7kynncda4j35si080ygk23aj5"; depends=[Matrix]; }; +mapmisc = derive { name="mapmisc"; version="1.1.3"; sha256="10i99rd6ds1dr0b741sin43kkj6v7d4mky653kcz3mqq5904wnns"; depends=[sp raster]; }; mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; }; maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; }; @@ -4180,8 +4253,8 @@ mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0 marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; }; marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; }; -marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr Rcpp]; }; -markovchain = derive { name="markovchain"; version="0.1.0"; sha256="1x299ila4s5bg9a2a87j4d8bpfajgxad5x9l3hjlghciki69080x"; depends=[igraph Matrix matlab expm]; }; +marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[lme4 R2admb truncnorm coda ggplot2 Matrix numDeriv Rcpp plyr optimx expm Rcpp]; }; +markovchain = derive { name="markovchain"; version="0.1.1"; sha256="1y4f4xf8557jq20yd8n2sl4sjhx2pkdjyr6fqikrfh1m4cydrz73"; depends=[igraph Matrix matlab expm]; }; marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; }; marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; }; @@ -4196,8 +4269,8 @@ matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30c maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hflpg0sjnn8mlzas7082y8xpxw3cknpdz"; depends=[miscTools sandwich]; }; maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; }; maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; }; -maxstat = derive { name="maxstat"; version="0.7-21"; sha256="0c83ykazj7np35sln8i87z29hg6dx1vsayfirc2pj533dzhhh9a8"; depends=[exactRankTests mvtnorm]; }; -mbbefd = derive { name="mbbefd"; version="0.6"; sha256="0lmidvganblkd1lxq4fy1rapzzdn89w3277nblw6nxjp33yx4nzm"; depends=[Rcpp Rcpp]; }; +maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; }; +mbbefd = derive { name="mbbefd"; version="0.6.1"; sha256="18vi4cans7h7lykfablrzvpvzd1zvfp2ycjf47gwjvg54ri1nnml"; depends=[Rcpp Rcpp]; }; mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; }; mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; @@ -4215,7 +4288,7 @@ mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52c mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; }; mclust = derive { name="mclust"; version="4.4"; sha256="1xwk5w3nzwmwavn1ni53bnhf3klvy65c05819j1aqa6dna1j1jkq"; depends=[]; }; mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; }; -mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; }; +mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda sfsmisc colorspace denstrip]; }; mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; }; mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; }; @@ -4231,7 +4304,7 @@ meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhk medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; }; medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[multcomp boot Matrix sandwich]; }; -mediation = derive { name="mediation"; version="4.4.3"; sha256="1m3q7zw1wsl6nnfjigbp3yg8mjnqxzawbgdrj7diclz8s6f07b4x"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; }; +mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; }; medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[plyr reshape2 hash]; }; mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; }; mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; }; @@ -4239,7 +4312,7 @@ megaptera = derive { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc meifly = derive { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[plyr leaps MASS]; }; mem = derive { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[sm boot]; }; memgene = derive { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 raster gdistance vegan]; }; -memisc = derive { name="memisc"; version="0.96-10"; sha256="1w62kgnjw57l0l645f02r0583l4pysx8dms16j6kba5hj4g427b2"; depends=[lattice MASS]; }; +memisc = derive { name="memisc"; version="0.97"; sha256="069siqkw7ll9n1crsl3yjhybwz0w52576q504cylpvlxx3jm9hfs"; depends=[lattice MASS]; }; memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; }; memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; }; merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; }; @@ -4247,7 +4320,7 @@ metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6i meta = derive { name="meta"; version="4.1-0"; sha256="0zf2917ljzpbc8izprzx7a78wc37q2k23lzdk8rmm5chml16mb3f"; depends=[]; }; metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; }; metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; }; -metaMix = derive { name="metaMix"; version="0.1"; sha256="15vw8cwsy56fhq0q9w99799bnkj2ji2ns0ljfkg1p7wwhfrj689f"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; +metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; }; metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; }; metacom = derive { name="metacom"; version="1.4.2"; sha256="1vb8qyilwvqb6b5sxqlmbw25r12q8f5h0mqbh3mbcmr0zarb35ql"; depends=[devtools vegan lattice]; }; @@ -4264,17 +4337,15 @@ meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkg meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; mets = derive { name="mets"; version="1.1.0"; sha256="0nfyfmhcd4sy2j1nymgw4yz0b5a36s2dqx42kzwbzgvp1m11z225"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; }; mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; -mfblock = derive { name="mfblock"; version="1.0"; sha256="06raii52gb7fzh23ahvkrcwvbx3mg02ww3qa340igkqys6jf3yih"; depends=[skewt boot nloptr]; }; mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; }; mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; }; -mgcv = derive { name="mgcv"; version="1.8-4"; sha256="18hd5b4p2k941f4lg18a73671hqdf2gh4z4vw08lkab10zpl59sa"; depends=[nlme Matrix]; }; +mgcv = derive { name="mgcv"; version="1.8-5"; sha256="133w7x0bys5dhsavfzh3h6gwgji0bbg2s22lgrrzigzgx65m9bfw"; depends=[nlme Matrix]; }; mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; }; mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; }; mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; }; mht = derive { name="mht"; version="3.0.11"; sha256="1d1ca3jp5q9xmnlnjsqi247vz6gm25bb8x5lzwd6z0n87lv26n1k"; depends=[glmnet]; }; mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; }; mi = derive { name="mi"; version="0.09-19"; sha256="1r3b6mm3pr95lb52m2vynmg0l2wy80hznjq2rff1qwplbq1pl04n"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; }; -miP = derive { name="miP"; version="1.1"; sha256="17y2badm76iwidjp45flm9ln098lk9r5m6lgx3skzcq3hp075967"; depends=[VIM mi mice Amelia lattice vcd]; }; miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; }; micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; @@ -4282,12 +4353,12 @@ micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwp micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; }; micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; }; mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart Rcpp]; }; -miceadds = derive { name="miceadds"; version="1.0"; sha256="15kz3n7gx40il4sagnp5qc7c31dk1phdb932289lc0xknrb8k00a"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp inline car foreign Rcpp RcppArmadillo]; }; +miceadds = derive { name="miceadds"; version="1.1-1"; sha256="1hzx9gf73kgpaa1l0889ybc8qsi703sc4z8wd8jfayhi57rigikb"; depends=[MASS mice mvtnorm pan Rcpp sirt TAM lme4 MBESS pls mitools bayesm inline car foreign Rcpp RcppArmadillo]; }; microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; }; micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[maptools RColorBrewer rgdal sp ggplot2]; }; micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; }; micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; }; -midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; }; +midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[sandwich optimx MASS numDeriv Matrix forecast]; }; migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; }; migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; }; @@ -4323,15 +4394,15 @@ mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; }; mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; }; -mixexp = derive { name="mixexp"; version="1.1.9"; sha256="1qr6gad3fjwxjngjb7iqhspkkwzj1c77v140ap2vdrcygsd6ncd1"; depends=[gdata lattice daewr]; }; -mixlm = derive { name="mixlm"; version="1.0.8.1"; sha256="0ygfi6sw3yl4fpx27kvb8hqspj4ndylm9135avvcjqj9b5jlvb68"; depends=[multcomp pls pracma leaps lme4 car]; }; +mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[gdata lattice daewr]; }; +mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[multcomp pls pracma leaps lme4 car]; }; mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; }; mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; }; mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; }; mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; }; mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; }; -mixture = derive { name="mixture"; version="1.3"; sha256="0shjr6ia148lrhx2y61zl4bq2mf70z0pgrp3q6c01k52wg7wgp77"; depends=[]; }; +mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; }; mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; }; mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; }; mkin = derive { name="mkin"; version="0.9-34"; sha256="0g0r30hs5ja2x1mwj336x8y3p0b33asfql076w2krmw38xkpla44"; depends=[minpack_lm rootSolve FME deSolve]; }; @@ -4351,6 +4422,7 @@ mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ix mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; }; mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; }; +mma = derive { name="mma"; version="1.0-0"; sha256="1xc138v2n0kyfjz9payps9wqamfmglvrs58ggf96wa6jp16gfcff"; depends=[gbm]; }; mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; }; mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; }; @@ -4361,10 +4433,11 @@ mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4k mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; }; mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; }; +mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink5n1mri8n7aj50xkfspmwsmpg"; depends=[]; }; mnlogit = derive { name="mnlogit"; version="1.2.0"; sha256="0ymkm3xwm97v5f9lg2ir4czdfb47hibgrkirc2iw66fh24iah84m"; depends=[mlogit lmtest Formula]; }; mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive { name="mnormt"; version="1.5-1"; sha256="1msxbdlg4wb45lsg0m4hqf41qglnmbqw55815v8qvyfjkwrgns8b"; depends=[]; }; -mobForest = derive { name="mobForest"; version="1.2"; sha256="198air7fplgiw86vs7m4dn4kai0gpnnmv14bykbw3lnaxk4fk8fd"; depends=[party lattice modeltools]; }; +modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; }; modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; }; @@ -4374,12 +4447,13 @@ modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xka moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut]; }; mokken = derive { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; }; mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[mvtnorm ncvreg actuar mgcv survival]; }; +momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; }; moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; }; monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; }; monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; }; -monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; }; +monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; }; moonBook = derive { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; }; moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; @@ -4391,7 +4465,7 @@ moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1g mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; }; mousetrack = derive { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; }; -move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; }; +move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a59yn152jfnwh6sw48sg8cc9wp24k3"; depends=[geosphere sp raster rgdal]; }; mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[svd Rcpp Rcpp RcppArmadillo]; }; mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; }; mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; @@ -4404,16 +4478,15 @@ mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; }; mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; }; -mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx15cra079k07rgdxqnixg2c8"; depends=[]; }; mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[optimx mgcv Rsolnp]; }; mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; }; msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; }; -msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; }; +msSurv = derive { name="msSurv"; version="1.2-1"; sha256="1c6db2mymaflxys736vh0gdapwlnr2ld0nkj4wbcb7saw377g7v9"; depends=[class lattice]; }; msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; msarc = derive { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[gplots XLConnect wordcloud RColorBrewer]; }; -msda = derive { name="msda"; version="1.0.1"; sha256="0bd9am0dyrs9x8xj6rccgqcx15ddag1fakjzpyw43n3zi0h24fa6"; depends=[Matrix MASS]; }; +msda = derive { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[Matrix MASS]; }; mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; msgl = derive { name="msgl"; version="2.0.125.1"; sha256="1k2n8yn9j5sknw95saq2zgl3jfanyp3c2xyj49wqgawhwsw81jdh"; depends=[Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH sglOptim]; }; msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; @@ -4428,18 +4501,18 @@ mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; -multcomp = derive { name="multcomp"; version="1.3-8"; sha256="0bywqyv9fvl08bggz36x24p9qqbwzvqmcik901x5yi99062xg7dl"; depends=[mvtnorm survival TH_data sandwich]; }; +multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[mvtnorm survival TH_data sandwich codetools]; }; multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; -multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; depends=[gnm VGAM]; }; +multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; }; multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; }; -multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; }; +multiPIM = derive { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; }; multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; }; multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; }; -multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; }; -multigroup = derive { name="multigroup"; version="0.4.3"; sha256="153pg27dz61igagn1yq4xl7m7vjb5vfc9ps1xhgzvmbvmnbcr004"; depends=[MASS]; }; +multicool = derive { name="multicool"; version="0.1-5"; sha256="01a429hyizqjg3dglnm0b3gl1lclp1az40cr3wr9qcx12jn30fbz"; depends=[Rcpp Rcpp]; }; +multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; }; multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; }; multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; @@ -4451,7 +4524,7 @@ multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8 multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; }; multispatialCCM = derive { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; }; -multitaper = derive { name="multitaper"; version="1.0-10"; sha256="07basffympz859srjbgk524h081mibz6czrpiv06g44idwyi1bz3"; depends=[]; }; +multitaper = derive { name="multitaper"; version="1.0-11"; sha256="1s0lmjzpyd7zmc2p1ywv5fm7qkq357p70b76gw9wjlms6d81j1n4"; depends=[]; }; multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; }; multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; @@ -4460,9 +4533,9 @@ munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; }; musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; -mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; }; +mutoss = derive { name="mutoss"; version="0.1-9"; sha256="170a9ibz6p9w7jkvv03003glrzk6z8jy1z9r4j7481qvrlyrgp6w"; depends=[mvtnorm plotrix multcomp]; }; mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; }; -mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; }; +mvMORPH = derive { name="mvMORPH"; version="1.0.3"; sha256="14z5bjkljna81hqp06d2jmincspflcb65z4gs5wklgzz3nz0sidm"; depends=[phytools ape corpcor subplex spam]; }; mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; }; mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; @@ -4487,7 +4560,7 @@ mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld7 mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; mvtnorm = derive { name="mvtnorm"; version="1.0-2"; sha256="0v4a05i92g70vf8xkh6as7566zgjcnpzr1ghhyszqk1f0maw9gxc"; depends=[]; }; mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; -mwa = derive { name="mwa"; version="0.4"; sha256="0ig8p34d1v7jzdjp7yy5f6jv6najlnj5xk198fy6dcwmzgm4pjl5"; depends=[cem rJava MASS]; }; +mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem rJava MASS]; }; mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny Rcpp]; }; mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; myTAI = derive { name="myTAI"; version="0.0.2"; sha256="1qnnlf8c8qkcvl5sh9qd19drlfmjhmy3grxhlnlbz7v11zcbvah8"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; }; @@ -4496,7 +4569,7 @@ mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j6 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; mztwinreg = derive { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[rms mclogit]; }; nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; }; -nCal = derive { name="nCal"; version="14.11-8"; sha256="0cgn56alv4qrb0dv7g3v3nx0y4bqgxyxrkbml7rqfz95s3rvm2dh"; depends=[drc gdata gWidgets kyotil]; }; +nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; }; nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d7kkaw1bkdkj3q11g3xq84hx9"; depends=[ape coda deSolve]; }; @@ -4511,6 +4584,7 @@ nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256 nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; }; naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; }; nbpMatching = derive { name="nbpMatching"; version="1.4.4"; sha256="0dnj97aj2x81yppw3rayxxaf2bb68l5x5f2852l5xmvpxb73w478"; depends=[Hmisc MASS]; }; +ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra scales gtable PerformanceAnalytics lattice knitr xtable reshape2]; }; ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; }; ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; @@ -4518,25 +4592,25 @@ ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; }; ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; }; ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; -ncvreg = derive { name="ncvreg"; version="3.2-0"; sha256="0j53aj71lxz3pxh6a4vlgw0f9zk4gjh4xf5c7qsm5cp8nfpkplm5"; depends=[]; }; +ncvreg = derive { name="ncvreg"; version="3.3-0"; sha256="0kwqfk9sp01x1k708qqr99cd8gkhr0jqjkfz1l7g0b6w6wm0yavb"; depends=[]; }; ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS Rcpp]; }; ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; }; neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; }; neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; }; -nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; }; +nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; }; nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; }; netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; -netassoc = derive { name="netassoc"; version="0.4.1"; sha256="1rwswa70n6j3s779cq3ddg8kgj17bx5iqya1rrspqd7rjj95k1bk"; depends=[igraph]; }; +netassoc = derive { name="netassoc"; version="0.4.3"; sha256="153zgnmk9qjcxhfdy9g1fkgjx0vpyv55gmj4spk664igvw6kicf3"; depends=[igraph]; }; netgen = derive { name="netgen"; version="1.0"; sha256="01j5s80k658wcp8ml2kyf10dvajp4crrxcad65rs03grak1q5mkv"; depends=[BBmisc mvtnorm lhs ggplot2 lpSolve checkmate]; }; -netgsa = derive { name="netgsa"; version="1.0"; sha256="1f70wpwj0gdc4k9cm7glz5jfd1xdij9bxkaqd8lpjxmarap00w6x"; depends=[cvTools corpcor glasso glmnet igraph]; }; +netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[cvTools corpcor glasso glmnet igraph]; }; netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[meta magic]; }; nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; }; nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[rootSolve dtw WGCNA Matrix minerva combinat igraph]; }; netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[igraph]; }; network = derive { name="network"; version="1.11.3"; sha256="1sp55dzf2g5znybppd1w3bmkxfx8vqh98pws438r5wwln2pjdcs2"; depends=[]; }; -networkD3 = derive { name="networkD3"; version="0.1.1"; sha256="1xslcq3a7m8l9d0jdxf4mylwyhxpxm6rnacnfmdzxsafb7bc78nk"; depends=[htmlwidgets plyr rjson]; }; +networkD3 = derive { name="networkD3"; version="0.1.2.1"; sha256="0xc3qbcb0xvdfvx2vb68rzif72x3zna32wrhz9lg9s7dfkz4xmfm"; depends=[htmlwidgets plyr rjson]; }; networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common network]; }; networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; }; networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; @@ -4555,8 +4629,8 @@ nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh5 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; }; nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; }; -nleqslv = derive { name="nleqslv"; version="2.5"; sha256="1p9m9ryp58xca9arl798cmslfjvxb3w5hdg3bs62yham1q951a48"; depends=[]; }; -nlme = derive { name="nlme"; version="3.1-119"; sha256="0p8f45d857k8zpapp15diqnhkwlrkg01akm9iwzyqqwc58kjd4a8"; depends=[lattice]; }; +nleqslv = derive { name="nleqslv"; version="2.6"; sha256="100nncpi2sx7flcxrl16csv7yprwan20ih1gydz6as5cg3k3lx9i"; depends=[]; }; +nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; }; nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; }; nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; nlmrt = derive { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; }; @@ -4564,16 +4638,17 @@ nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrb nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; -nlsem = derive { name="nlsem"; version="0.2"; sha256="0hq4ffkbrp6v6y5hr26hm2g110vjx3xy01y5kznigza0v9wcpzqq"; depends=[gaussquad mvtnorm nlme]; }; +nlsem = derive { name="nlsem"; version="0.3"; sha256="1lpp6f6nby1rzxv7hrqnm4qbwj406g9ls9jmidb8rqgy177sk4w6"; depends=[gaussquad mvtnorm nlme]; }; nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; -nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; depends=[]; }; +nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdkz2n54ylp0rnrs76rb6xmi3pf9xlbmnplr2"; depends=[]; }; nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; }; nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; }; nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; }; nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; }; +nnlasso = derive { name="nnlasso"; version="0.1"; sha256="0pqpkq8vb18qm8rj16wx3z6fb7mgkb8ddw00c701d5mi9gqhaf5c"; depends=[]; }; nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; }; -nodiv = derive { name="nodiv"; version="1.0.1"; sha256="07qx08s7nn7priwm5x5k3ycacfa4ibd20c759x9qhzqaigjmrh42"; depends=[picante raster ape sp vegan]; }; +nodiv = derive { name="nodiv"; version="1.0.2"; sha256="0a8p5q1r68gmwv73557xgwxp9xwh8yw287yr71lplc1dx8fxjjny"; depends=[picante raster ape sp vegan]; }; noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; }; @@ -4588,21 +4663,21 @@ norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf normalp = derive { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; }; normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; -nortest = derive { name="nortest"; version="1.0-2"; sha256="010i9cxjaq6jjdnw8fggvinakrxi3pv4098r9i4jh62vlfwqbjpb"; depends=[]; }; +nortest = derive { name="nortest"; version="1.0-3"; sha256="0kih1r703hjw2vha2hx13vm3fvbyra7v229khgv3hxxfppb7jis8"; depends=[]; }; nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; noweb = derive { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; }; -npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz57qn6ybj4i239caflm9vkrfxsg6yx2d"; depends=[boot cubature]; }; +npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; }; nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; -nparcomp = derive { name="nparcomp"; version="2.5"; sha256="0s865cqy29m5wiwndbmw3sl6m86f3zjbjr41924zd4alxkhm1wbi"; depends=[multcomp mvtnorm]; }; +nparcomp = derive { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; }; npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; }; npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; }; npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; }; npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; }; -npmv = derive { name="npmv"; version="2.1"; sha256="0ivd3wm1fmmaq8i2h0kdd11z9k1czb61ms8fj0xb5xmfy0g1rphy"; depends=[Formula ggplot2]; }; +npmv = derive { name="npmv"; version="2.2"; sha256="1aqlx1y3bxbqp13q0vajwffj8srb6s04d5r2h08m9fk5hhp9l3jf"; depends=[Formula]; }; nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; npsm = derive { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[Rfit plyr]; }; npsp = derive { name="npsp"; version="0.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; }; @@ -4615,13 +4690,13 @@ nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; }; numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; }; numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; }; -numbers = derive { name="numbers"; version="0.5-2"; sha256="0papfbpar9imkh0ahr809zaxgsi3ch7flypxyap4r2x1clgrx0p1"; depends=[gmp]; }; +numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; }; nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; }; nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; }; -oaxaca = derive { name="oaxaca"; version="0.1"; sha256="1nhdxivmxacywxl7bjxfbs5p6lsvk55l5d5c4mvbpq3bw125a29c"; depends=[Formula ggplot2 reshape2]; }; +oaxaca = derive { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; }; objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals objectSignals]; }; objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; obliclus = derive { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; }; @@ -4645,14 +4720,14 @@ onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp Rcpp RcppArmadillo]; }; onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; }; opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; }; -openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1hbw9gfc95b379if23wc0jv6lgf6ilb10gpwfs8nm3jc3by2zsx4"; depends=[NLP openNLPdata rJava]; }; +openNLP = derive { name="openNLP"; version="0.2-4"; sha256="11zgqi8ydv6pqjs1sbi9gsh2fxg6jyaba16h5kbi15rc75fcvw47"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; }; openair = derive { name="openair"; version="1.1-5"; sha256="1i0vif16n4y3m64q3ryrkh725b5j6b7b1g58hwz5hxzj4m2fls7l"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; }; opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; }; openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; }; opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; }; -openxlsx = derive { name="openxlsx"; version="2.2.1"; sha256="0wcvyl5gzkh28v2y40ckzp4prp9ygby01pm66rp902xhjqz0vnw1"; depends=[Rcpp Rcpp]; }; +openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; }; operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; }; ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; @@ -4671,7 +4746,7 @@ optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c3 optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme Rcpp]; }; ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; -orca = derive { name="orca"; version="1.0"; sha256="0cqz1zmlzwdprhbxs4arjv2gx868dx47xg8jmjvzk7g2xc9prj62"; depends=[]; }; +orca = derive { name="orca"; version="1.1"; sha256="138qqjklwd3g4dfg9j2438kzpsdc7sf8qdl8ha4kd276n71vkfrh"; depends=[]; }; orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; }; orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; }; ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; }; @@ -4681,7 +4756,7 @@ orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1 orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; }; ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[ucminf MASS Matrix]; }; ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; }; -ore = derive { name="ore"; version="1.0.6"; sha256="14ks8ypjlmdiysaayyz1syb8vrcfp2v79wfx191fz05ckgww4dyy"; depends=[]; }; +ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; }; orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; }; orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; @@ -4694,7 +4769,7 @@ orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; }; ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; }; -outbreaker = derive { name="outbreaker"; version="1.1-4"; sha256="1vvgkvrijrzabj50w36pgqd90krnp18grml5m3gvhnnm0y1ghry5"; depends=[ape igraph adegenet]; }; +outbreaker = derive { name="outbreaker"; version="1.1-5"; sha256="1k39pzqbjah4dwwjyaccb13c1aww8i4kdfjanxc4hzkl8av7s8db"; depends=[ape igraph adegenet]; }; outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; overlap = derive { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; }; oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; }; @@ -4702,6 +4777,7 @@ p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kj p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; pBrackets = derive { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; +pRF = derive { name="pRF"; version="1.0"; sha256="17m86l29ys4n6z4ndibwy7yz9shyp7nf9hjnbgbvmc0ycf1may6i"; depends=[dplyr ggplot2 permute randomForest reshape2 magrittr]; }; pROC = derive { name="pROC"; version="1.7.3"; sha256="1xbz50phi2ygrgvcv36vnbc2icga8abjiha2ap35bwffg5d2zmvi"; depends=[plyr Rcpp Rcpp]; }; pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; }; pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; @@ -4713,7 +4789,7 @@ packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3 packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; }; packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; }; packrat = derive { name="packrat"; version="0.4.3"; sha256="0sfv7vl9afvv2rpqk39hbrvhq6z54ilqjrff4j3parsfqvg7gaqf"; depends=[]; }; -pacman = derive { name="pacman"; version="0.2.0"; sha256="04kqa34qz1bvx3rbq50f0djmmxgm40cip28fb7mj4icm1l9z2x8m"; depends=[devtools]; }; +pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; }; paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; @@ -4734,7 +4810,6 @@ pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3 pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; }; panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; }; -papeR = derive { name="papeR"; version="0.5-0"; sha256="1j366644scrsq2sjl9vip0ids97y9m6c8fyx16qlismrfcfbapyz"; depends=[car gmodels]; }; parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; parallelMap = derive { name="parallelMap"; version="1.2"; sha256="1rd4q644xml29nj4mybgh8cr0h4wsadsf2wlyzppx5hg5yi27ff2"; depends=[BBmisc checkmate]; }; parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; @@ -4742,19 +4817,19 @@ paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vm paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; parboost = derive { name="parboost"; version="0.1.3"; sha256="1ziqbbcxvhc3v0vjpf9y6jhk3rqbgn9cilwcfxlxjbw73jhvvclg"; depends=[mboost party iterators plyr caret glmnet doParallel]; }; parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; }; -parfm = derive { name="parfm"; version="2.5.6"; sha256="1zas6isgirha379f246zg84ddv0jl2n4795brshd98hkayl4c1fi"; depends=[survival eha msm]; }; parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; }; parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; }; parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; parsedate = derive { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; }; +partDSA = derive { name="partDSA"; version="0.9.10"; sha256="1j6ihgyjiy8dnr89xkqvl1dkmdswvknffq7zc15civy0h781azv6"; depends=[survival]; }; partialAR = derive { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[Rcpp zoo ggplot2 MASS tseries data_table FKF urca plot3D Rcpp]; }; partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; }; partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; -party = derive { name="party"; version="1.0-19"; sha256="1k5416xz7r1m34gd80d69p1b08j7ncmyxv83kgn7isnj97r2dybh"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; }; -partykit = derive { name="partykit"; version="0.8-4"; sha256="18xpffvf5a44gkfqdjapw2l5c9xrr7z3dkmhd7fl69gz27mnqmwy"; depends=[survival]; }; +party = derive { name="party"; version="1.0-20"; sha256="10d4hyzc8icgb51k4dkc1bwprky7sg35vpa9s3jcl9ifw6na0bgm"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; }; +partykit = derive { name="partykit"; version="1.0-0"; sha256="1kd7hrcivvl638l7frgjz8qp8nz52h0yz5kypgqfma84jqfvd6ca"; depends=[survival]; }; parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; }; pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; @@ -4786,9 +4861,9 @@ pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707 pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; }; pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; }; pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; }; -pcalg = derive { name="pcalg"; version="2.0-3"; sha256="1vfrqm8hjdprsdqpik6a4zhv4yxyqyqa3dr2226qkm5ijblrcmwx"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp Rcpp RcppArmadillo BH]; }; +pcalg = derive { name="pcalg"; version="2.0-10"; sha256="1ph5n3hlxni039phvhr9r2nj62c4mw9zmf0857sqzv434hizdfzi"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc Rcpp RcppArmadillo BH]; }; pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; -pcnetmeta = derive { name="pcnetmeta"; version="1.2"; sha256="18ha74i6azgkb8wzjgs8c55fi386a1z9n5bm1llb8mk089h2gx8j"; depends=[R2jags network runjags]; }; +pcnetmeta = derive { name="pcnetmeta"; version="2.0"; sha256="0ayk9dvll321ndpbzqhvswhd7gbngmdhvzak5mn74w76wz9d4ylv"; depends=[rjags coda]; }; pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; }; pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; pdR = derive { name="pdR"; version="1.2"; sha256="0dgw6i623a6w18q54b46fnbp38941hqdvjpcnxrbqwvcgk024pr6"; depends=[]; }; @@ -4806,7 +4881,7 @@ pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvi pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; }; pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedometrics = derive { name="pedometrics"; version="0.4-1"; sha256="0pzkkjp126g64q6avlk7bqrhcl6y5zz8vmfrq68k4yck34c1gn16"; depends=[car fields gstat lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; }; -pegas = derive { name="pegas"; version="0.6"; sha256="142hcc5h52sil1wp3m315y07wa6aqvx8igf2pywdz56ydwk2rwpk"; depends=[ape adegenet]; }; +pegas = derive { name="pegas"; version="0.7"; sha256="1vhlg40jz938h63isi5c8cjfqrwnh5miyl5kg2hbybw9awlp6gjj"; depends=[ape adegenet]; }; penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; }; penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp Rcpp]; }; penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; }; @@ -4839,17 +4914,16 @@ phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q7 phangorn = derive { name="phangorn"; version="1.99-12"; sha256="0yp2ih3f15xx1vd4vk1hdg3gl7l1a9y2j88cd6b6z2x1d6waj1yv"; depends=[ape quadprog igraph Matrix fastmatch nnls]; }; phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; -pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; }; -phenability = derive { name="phenability"; version="1.0"; sha256="19vxknc0v8vz5cd748fhsndsrpggzlsiims9j7p2s6jlankkgsz9"; depends=[calibrate]; }; +pheatmap = derive { name="pheatmap"; version="1.0.2"; sha256="0nmq5w2jcljbd81v428xl4mvqzrm4vxxlwyhkimi4hj8a9rqw743"; depends=[RColorBrewer scales gtable]; }; +phenability = derive { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; }; phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; }; pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; }; pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; }; -phenology = derive { name="phenology"; version="4.0.4"; sha256="1h40dr3347nisf61nnrfi23a6951zxnf5ibmnb5k80fwkhmw81f0"; depends=[fields zoo coda shiny]; }; phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; }; phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; }; phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; }; -phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; }; +phonR = derive { name="phonR"; version="1.0-1"; sha256="11m6qm3ya90n886mig4inxm057afl2gx4iz5fbwqsncibdmqgx92"; depends=[splancs deldir plotrix]; }; phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; }; phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; }; phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; @@ -4858,6 +4932,7 @@ phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m5 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; }; phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp Rcpp]; }; phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; +phylocurve = derive { name="phylocurve"; version="1.0.0"; sha256="13gfavzkkicqcmdxfh9779a81kjgffskchqm0ygqkwhy9afnsxwr"; depends=[ape geiger phytools abind phylolm]; }; phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951scqzv4zza0r3fcs0hh4gpbr8z49b6d98"; depends=[ape]; }; phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; }; @@ -4870,6 +4945,7 @@ pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; }; picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[lattice igraph MASS Matrix]; }; pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; }; +pipe_design = derive { name="pipe.design"; version="0.1"; sha256="0hy3n15b4a2319xn2gix9vca3qryy7hjsxlh0z8k96l24ql0r62z"; depends=[ggplot2 gtools]; }; pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; }; pitchRx = derive { name="pitchRx"; version="1.6"; sha256="16x152xz7vs4bwi4xh05sbj38xgqzk8g95vfm0vm5mf94qnnaa6c"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; }; pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; @@ -4879,7 +4955,7 @@ pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xb plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[dielectric Rcpp statmod cubature reshape2 plyr Rcpp RcppArmadillo]; }; -planor = derive { name="planor"; version="0.2-0"; sha256="0mvlkrggwgrc9fmp935kihj2v7gfnghw7smpkbb3pbrrv9zhjlgi"; depends=[conf_design]; }; +planor = derive { name="planor"; version="0.2-3"; sha256="1j550zqm3h4kz7jz4fkgp0z92skwpyxz0lnr7pfif4pya1mxd6f9"; depends=[conf_design]; }; playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; }; plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[sfsmisc abind]; }; plgp = derive { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; @@ -4893,7 +4969,7 @@ plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3h plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[sp spacetime rgdal maptools lattice raster]; }; plotKML = derive { name="plotKML"; version="0.5-0"; sha256="0sx48z27a34bc8gw7m66w52q36llbm2wm15l6kvd6zzlyzvj8cda"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; -plotROC = derive { name="plotROC"; version="1.3"; sha256="1scb2mkz1b74kmai6fhliva9ghhrl1036kk6v3ll5xk16ffjpgg3"; depends=[ggplot2 gridSVG shiny]; }; +plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; }; plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; }; plotmo = derive { name="plotmo"; version="2.2.1"; sha256="1kgsw7xfqmzsyybhj21a42ynci1y7gm8gas1jqsbgh0vydfbzzh5"; depends=[]; }; plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; }; @@ -4905,7 +4981,7 @@ plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; }; plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="1yif4h556xjadlfp31nm6aqhd3md983sppwmbh7mg95dffxnd3im"; depends=[MASS]; }; -plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; }; +plspm = derive { name="plspm"; version="0.4.2"; sha256="0q7mx5ydw61z1qcs0flpwpnnrcwsfsh3razc8jnd4z1xn96i3x85"; depends=[amap diagram tester turner]; }; plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; @@ -4925,14 +5001,15 @@ poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqii pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; }; poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; +pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointdensityP = derive { name="pointdensityP"; version="0.1"; sha256="1wa10sp0pxcjyicifz638f89b7ynsy7718qbh2p2gn66lbvjpkhr"; depends=[]; }; poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp Rcpp]; }; poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; }; -pollstR = derive { name="pollstR"; version="1.1.1"; sha256="1wl5nli8y7mxwr5j1cp0z1a9ny4d1anh5pyc8vi1jbnvqdnin1v6"; depends=[httr plyr jsonlite]; }; +pollstR = derive { name="pollstR"; version="1.2.0"; sha256="1a1qjblxylzpwb1qpy2yyk39022isp8aajds5glspxndapmd4akb"; depends=[httr plyr jsonlite]; }; polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; }; -polyCub = derive { name="polyCub"; version="0.5-1"; sha256="13l0gnzj5gs4iikcaj13nsb8ndbb7asx8ycllli61az12rc2p6yf"; depends=[sp spatstat]; }; +polyCub = derive { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; }; polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; }; polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; }; polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; @@ -4960,16 +5037,15 @@ portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5ink portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; }; -poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; }; +poweRlaw = derive { name="poweRlaw"; version="0.30.1"; sha256="078yrr4fsg0isl45j887y62jzhvdv4krd3drg420wx5a0mqj7np1"; depends=[VGAM]; }; powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; }; powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sha256="0xwyqlblhdnnv6pd2jpmz11s95zg7ylh1wa2q03zj8df330jcl70"; depends=[mvtnorm pwr]; }; -powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; depends=[]; }; +powerMediation = derive { name="powerMediation"; version="0.2.3"; sha256="0i4qyjcmw2zvpdgq520kjzf38hddsrjwf0vlg4ylv1kaav7jzgsr"; depends=[]; }; powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; }; powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; -powerr = derive { name="powerr"; version="0.1-3"; sha256="0scarwipq8095hvj7ij849l10q2g7g5z66ws7r72apdvxs5nvxnj"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; }; -ppiPre = derive { name="ppiPre"; version="1.6"; sha256="0ck1xxaip614sxi8liqfhznzpq2i6f491v9kijawak5xm39bn9vv"; depends=[igraph e1071]; }; +ppiPre = derive { name="ppiPre"; version="1.7"; sha256="12my8xqb3zbiji6z6ip079gh8rkfi700pbbj1acrnrcflxz2wqzx"; depends=[igraph e1071]; }; ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; @@ -4978,14 +5054,16 @@ prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqy prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; }; pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx27ysi4pfagkxdfzg270lxwbymcii6pp"; depends=[]; }; pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; +prais = derive { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; }; praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; prc = derive { name="prc"; version="2014.11-4"; sha256="0r4c0s80fdzc9ifbfy8aaqi7164blqgiv3vbzp9x70c4dfl3lwxx"; depends=[kyotil nlme]; }; +precintcon = derive { name="precintcon"; version="2.1"; sha256="0cadia7d2pzhnfw00m4k6qgnajv61hj879pafqnnfs6synbp3px6"; depends=[ggplot2 scales]; }; predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; }; predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[lme4 nlme ggplot2 lattice pbkrtest plyr]; }; predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; }; presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; }; -preseqR = derive { name="preseqR"; version="1.0.1"; sha256="0plwhgs6fgvra2w5xcjrr260fra0nl2cpsn5r1z701q7b8nbm257"; depends=[]; }; +preseqR = derive { name="preseqR"; version="1.1"; sha256="10xmybkhyn88p7aa3wa753lykzlcm4md3ai03nlx6wisnqh6dd55"; depends=[]; }; prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; }; prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; }; @@ -4998,6 +5076,7 @@ princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6a prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; }; probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; }; +probemod = derive { name="probemod"; version="0.1"; sha256="1i7hsnnwi20afhfzwmqyh1p7la71sqk49pb0wma80850psdzycdn"; depends=[]; }; probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; }; profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; @@ -5016,14 +5095,14 @@ proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbz protiq = derive { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[mvtnorm]; }; proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; }; protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; -protoclust = derive { name="protoclust"; version="1.4"; sha256="00rqwh2zhdaf1m3gb1skczpck9svfgjyayx6f71i9fbqilmhqaz1"; depends=[]; }; +protoclust = derive { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; }; protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; }; proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpkpg4p30m9acddbn49fbss9kcpl5b5i"; depends=[]; }; pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; }; psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; }; psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes SuppDists mvtnorm]; }; pscl = derive { name="pscl"; version="1.4.8"; sha256="1isgj3gsazpl2l69162n0xrgbsrsybwg18rz58amdq0h023c5dbz"; depends=[MASS lattice]; }; -psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; }; +psd = derive { name="psd"; version="1.0-0"; sha256="17mp995yrw3pspavvf2s0fsqqdx7nbxw9k4hqph42052bpy3a54s"; depends=[Rcpp RColorBrewer signal zoo Rcpp RcppArmadillo]; }; pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; }; pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; }; psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; }; @@ -5043,17 +5122,19 @@ pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl ptinpoly = derive { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; }; pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3.1"; sha256="1q1y3sshv5c56qgbbrrlnb1nhg052n8g2vrx32vhg304rqircxkm"; depends=[RCurl XML boot R2HTML]; }; +pullword = derive { name="pullword"; version="0.1"; sha256="1mxv63q2nfnhxcn8m17d40w792l1i7diykg6h0i42pj0rsa4ww36"; depends=[RCurl]; }; pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; }; pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; }; pvar = derive { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp Rcpp]; }; pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzpl22q2b0nr466ljgm6jcdyjbkzgx237"; depends=[Matrix]; }; pvclust = derive { name="pvclust"; version="1.3-2"; sha256="0w9cxr0bc591icbyn8239f76ypb2nwv9fa5b1ix05wh55d1h0rgc"; depends=[]; }; +pvrank = derive { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3ihqnbrd067v85l9rvf0pxyycqyhx"; depends=[Rmpfr]; }; pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[XML nnet httr]; }; -pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; }; +pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2lpg67gwfwfjf8kpk97qvkalj"; depends=[]; }; pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; }; pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; }; -pxweb = derive { name="pxweb"; version="0.5.3"; sha256="0slqxn1yqss77c078adlmp4q4a08vd867gcz1nn7f61czb9wpf56"; depends=[data_table plyr stringr RJSONIO httr]; }; +pxweb = derive { name="pxweb"; version="0.5.5"; sha256="1rrsxis2fi1x90gj251phbrz3bbl7yyc39n20lk2rln14acdhfsy"; depends=[data_table plyr stringr RJSONIO httr]; }; pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[sp maptools rgeos]; }; pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; @@ -5067,7 +5148,7 @@ qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s qdapRegex = derive { name="qdapRegex"; version="0.2.0"; sha256="0hypa3xax02k61kwh59wb4r7y8s0g6hfhaih0kj9n442xqvrym5h"; depends=[stringi]; }; qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; }; qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; -qgraph = derive { name="qgraph"; version="1.3"; sha256="08arc3f3rici1r1r0nm42fv7g01fn3xixfh6y3lg8q3mr53fqhdm"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool sendplot d3Network ggm gtools]; }; +qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool d3Network ggm gtools]; }; qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; }; qicharts = derive { name="qicharts"; version="0.1.1"; sha256="1aisbm9h7jdzkgnfh679wi5hfzxw1asgr62z7l51zk9yw7p7mjaw"; depends=[lattice latticeExtra]; }; qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; }; @@ -5076,7 +5157,6 @@ qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; }; qmethod = derive { name="qmethod"; version="1.2.4"; sha256="0s3s1vasppbnzq78xf7klqppg91c4qvq59dka9dj7zl8zlr6hx3r"; depends=[psych GPArotation]; }; qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; -qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; }; qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; }; qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; }; @@ -5085,7 +5165,7 @@ qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn1 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; }; qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; }; qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; }; -qtl = derive { name="qtl"; version="1.35-3"; sha256="1p679lalb50h8zsnb2439m3lsq6kh2fncw6k0kq5szcgm6zaxi94"; depends=[]; }; +qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; }; qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; }; qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; }; @@ -5098,11 +5178,11 @@ quad = derive { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabz quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales Rcpp RcppArmadillo]; }; qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; -qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; }; +qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; }; qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; }; quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; }; -quantmod = derive { name="quantmod"; version="0.4-3"; sha256="1x9h7ydifvs8mpcd4r83qz17pixxw1466262hh2j0xi259i1ds0k"; depends=[xts zoo TTR]; }; +quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[xts zoo TTR]; }; quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; }; quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; }; quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; }; @@ -5144,13 +5224,13 @@ rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxg rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; }; rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; }; -rNOMADS = derive { name="rNOMADS"; version="2.1.2"; sha256="1ww9jyzpk5r1glq407xz0ab80n0lj9gp4v4zfm2myfch3bjkcn9h"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; +rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; -rPref = derive { name="rPref"; version="0.4"; sha256="0w1cfcqngyympp8xh72rc2w7njjf0y4bilvmfiamp90ykv1yd0vn"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; }; +rPref = derive { name="rPref"; version="0.5"; sha256="0wgyf785izfhx1jvff4as1dir1s432z9v2b2rgdxvay9y5zpc2ar"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; }; rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; }; rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; rSFA = derive { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; -rSPACE = derive { name="rSPACE"; version="1.0.4"; sha256="1vps3cf7szbkl87warp99fx4laivylwq3ihg8z7iincd2x072xgw"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; }; +rSPACE = derive { name="rSPACE"; version="1.1.0"; sha256="1kj6l41wdm2dqygwfdlfrys9idykjfj6vmv6pzbgp998a29fm53s"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; }; rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; rTensor = derive { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; }; rUnemploymentData = derive { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[stringr choroplethr rvest]; }; @@ -5158,6 +5238,7 @@ rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4 rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; }; race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; radar = derive { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; +radiant = derive { name="radiant"; version="0.1.75"; sha256="0rk971rr15w87b50rhf8vdr6vhs3lfd08vdrp1f7h9higrwk0as8"; depends=[lubridate ggplot2 dplyr magrittr car MASS gridExtra AlgDesign GPArotation psych wordcloud markdown knitr ggdendro broom tidyr pryr shiny shinyAce]; }; radir = derive { name="radir"; version="1.0"; sha256="1aiy92r854h1l9fsa8j65w495hj7hll7k1csfnvb92h0wh0bxyzy"; depends=[hermite]; }; rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[igraph expm reshape ggplot2 Hmisc fdrtool snowfall]; }; rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; }; @@ -5168,14 +5249,14 @@ randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67g random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; }; random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; }; randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; }; -randomForestSRC = derive { name="randomForestSRC"; version="1.6.0"; sha256="1fd2hlihqkrx5cg91cfiibxw7h3gca5asf8a9nnm7ldafsamczy5"; depends=[]; }; +randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; }; randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; }; randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[lattice boot fastGHQuad]; }; randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; }; randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; }; randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[permute matrixStats]; }; randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; }; -randomizr = derive { name="randomizr"; version="0.2.0"; sha256="040278biy0a3drcl5z79cd74psix1dnfg0a5gzv101jyhbnjp4ml"; depends=[]; }; +randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3ay14kd6v6jg2qw86w2wcdzr8f201xy5i1fgr"; depends=[]; }; randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; }; rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; }; @@ -5186,8 +5267,8 @@ rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12a rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; }; -raster = derive { name="raster"; version="2.3-24"; sha256="0397brw7fmfzc55p3v8isc22hksh2bzq64a2iwac52hf0bvl0fzn"; depends=[sp]; }; -rasterVis = derive { name="rasterVis"; version="0.32"; sha256="040cg1v30ixkjkibqjpvz94wz486ffsrsnpfgzlp302xvvsmb3dk"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; }; +raster = derive { name="raster"; version="2.3-33"; sha256="1mjsy36r2rflsnl0y0n805mq536jqvsba20xdhpl1iv2sknmxz2a"; depends=[sp]; }; +rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[raster lattice latticeExtra sp zoo hexbin RColorBrewer]; }; rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; @@ -5204,19 +5285,19 @@ rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; -rcbalance = derive { name="rcbalance"; version="1.2"; sha256="0880bvzbnq9gak2n70iwdk6n86bn1glg67lb7fby6fhipkgfxcp2"; depends=[MASS plyr]; }; +rcbalance = derive { name="rcbalance"; version="1.3"; sha256="1s38rfn44wmllwpqzxm0w2bjl649i7qfadwdnn0mnp1q86vsmi3q"; depends=[MASS plyr]; }; rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; }; rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; }; rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; }; rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; }; -rclinicaltrials = derive { name="rclinicaltrials"; version="1.4"; sha256="1jh4jn52hcwbycvwvfn7wb1h0r7makkli3hvxg17dbalrxky9xgq"; depends=[httr XML plyr]; }; +rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr XML plyr]; }; rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; -rcrossref = derive { name="rcrossref"; version="0.2.1"; sha256="19l3z2rfs1wj9z5myrskzbgsdpqya231wkiagvr6fynjdf2wcl9q"; depends=[jsonlite XML httr plyr bibtex dplyr]; }; +rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[jsonlite XML httr plyr bibtex dplyr]; }; rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[zoo RCurl RJSONIO]; }; rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; }; rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; -rdrobust = derive { name="rdrobust"; version="0.70"; sha256="1zfsgzyi648v5zzbjjw01vvznws6yv30n981ljn996g4y2qy7gp4"; depends=[]; }; +rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; }; rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; }; readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; }; readGenalex = derive { name="readGenalex"; version="0.4.1"; sha256="02rdx5ya06wpn0r6709aw6f86hk2xivfvjq5mggmm4dmlzgkwg0x"; depends=[]; }; @@ -5232,13 +5313,13 @@ rebmix = derive { name="rebmix"; version="2.7.0"; sha256="180kvij3aaxvqcbidfjir9 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; }; recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; }; reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; }; -recluster = derive { name="recluster"; version="2.7"; sha256="0kgq3bm5zh4iskm4ydpnsxmy9vcgxjk9iz7d1f1didlvxg3piys7"; depends=[vegan ape picante phangorn phytools cluster]; }; +recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[vegan ape picante phangorn phytools cluster]; }; recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[Matrix registry arules proxy]; }; recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; }; recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; }; reconstructr = derive { name="reconstructr"; version="0.5"; sha256="0lffi30grk88na2jmkbhs62xf3d8mzrmjsiajrpp7dsaxa650bf0"; depends=[Rcpp Rcpp]; }; recosystem = derive { name="recosystem"; version="0.2.5"; sha256="0i5rgkmjaz50qlyi85hmr61r0iir53prrphzvnjq5bjchb1k3m09"; depends=[Rcpp Rcpp]; }; -redcapAPI = derive { name="redcapAPI"; version="1.2"; sha256="10d4pjcap1pcabzb2jjp0c9n0k8zpcz8cb0fmsqwfisjsyda7slk"; depends=[chron DBI Hmisc httr stringr]; }; +redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; }; ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; }; referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot extremevalues car outliers]; }; @@ -5262,14 +5343,14 @@ relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5n relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; reldist = derive { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfxkfwhpxppqrpq5h3b22cjif5qjqz3kk8f"; depends=[mgcv]; }; -relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; }; +relevent = derive { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[trust sna coda]; }; reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; relimp = derive { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; }; relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; }; remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; }; remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; }; -rentrez = derive { name="rentrez"; version="0.4"; sha256="14v53b6z86isylc3fv5b23sl1lhn4rrmd8l4nfpjin1szzdzdx58"; depends=[XML httr jsonlite]; }; +rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[XML httr jsonlite]; }; repfdr = derive { name="repfdr"; version="1.1"; sha256="1k85y27k42kw5zmbrnnqb62x3djjzdm4zrvm2g4dl8ykdlnaikv9"; depends=[]; }; replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; }; repmis = derive { name="repmis"; version="0.4"; sha256="0m54pif9sj1lf23wbykxlsab3q1b90bwz8cwkh2ibic6gyh5h4dg"; depends=[data_table digest httr plyr R_cache xlsx]; }; @@ -5295,8 +5376,8 @@ revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkj reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; }; rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; }; -rfPermute = derive { name="rfPermute"; version="1.6.1"; sha256="1fpj0wjaxfqcp6z0azkmgqjsysgpm0vgg81pi6w9xs6a5nwa6wd1"; depends=[randomForest ggplot2 gridExtra]; }; -rfUtilities = derive { name="rfUtilities"; version="1.0"; sha256="020wwrbpfzi7pl6vf80gsi8qc4fqr9hsxnyj5qzab1axzdqq9hjq"; depends=[randomForest e1071]; }; +rfPermute = derive { name="rfPermute"; version="1.6.2"; sha256="069dhv41bwyp2nywkrr2hihyz8zialhxlyzpfpq4r9lyjnamg2k9"; depends=[ggplot2 randomForest gridExtra]; }; +rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9drjyjg2vsgsb37s0l284hvh35zm53hs8f881ycx3"; depends=[randomForest]; }; rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; }; rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; }; rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; }; @@ -5306,18 +5387,18 @@ rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; }; rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; }; -rgbif = derive { name="rgbif"; version="0.7.7"; sha256="074psvcpnyaqf4dhwlr9gylc9a70ksfhszpknyw52axgh3wq758c"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr assertthat whisker magrittr jsonlite]; }; +rgbif = derive { name="rgbif"; version="0.8.0"; sha256="1sdjlymymfc5chnrc5if0fvf64mjz6sc4071xsw2ja7zcdasxb40"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr whisker magrittr jsonlite]; }; rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; -rgdal = derive { name="rgdal"; version="0.9-1"; sha256="1jq6z4z0q00djfmm2nsr5cn7idall5pfqp2p88ah9g24k928v3gf"; depends=[sp sp]; }; +rgdal = derive { name="rgdal"; version="0.9-2"; sha256="0jzhjy3qnb9aimmwyssinbyxz49hzcfksmxhsqyz3g8868k946g5"; depends=[sp sp]; }; rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; }; rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; }; rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; }; -rglobi = derive { name="rglobi"; version="0.2.4"; sha256="1rz2dn0llx8jjd1ah9ajw9hv63rjbvkhihp81af48s4kr2g8bmim"; depends=[rjson RCurl]; }; +rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; depends=[rjson RCurl]; }; rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; }; rgr = derive { name="rgr"; version="1.1.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; }; -rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; }; +rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; }; rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; }; ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; }; @@ -5337,15 +5418,17 @@ riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww9 rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; }; riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; }; rivervis = derive { name="rivervis"; version="0.39.4"; sha256="1al0ylmpvkxfhkv9i4j6pvrlqn13pdwmzs7s6vazmgmkl3iggav4"; depends=[]; }; +rivr = derive { name="rivr"; version="0.9.1"; sha256="0rdrgsvxmkqwx65w7pz1sg5mkbqbi7c52cfyk7qzpvfgi5glp9zn"; depends=[Rcpp reshape2 Rcpp]; }; +rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive { name="rjags"; version="3-14"; sha256="1hfsa8jl5imk2j2qnafa5q95zn69bhvijdpvfs64vsiqsalsg7yk"; depends=[coda]; }; rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; }; rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx9vb4xyp62ig0qa7vzkbdplba2zr2"; depends=[jsonlite assertthat]; }; -rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; }; +rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; }; rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; }; rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; }; rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[yaml jsonlite]; }; -rlm = derive { name="rlm"; version="1.0"; sha256="0dcbrdk4yjcv96rjnqc8sq821kwk7bsg66pn2hsblcpb14l23hhf"; depends=[]; }; +rlm = derive { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; }; rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; }; rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; }; rmarkdown = derive { name="rmarkdown"; version="0.5.1"; sha256="08v16n4a9rdr0fh54hlmfxifbpl40nfr24g3wrjxxacml16smcsd"; depends=[knitr yaml htmltools caTools]; }; @@ -5373,7 +5456,7 @@ robCompositions = derive { name="robCompositions"; version="1.9.0"; sha256="0kpl robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[robustbase MASS lattice]; }; -robumeta = derive { name="robumeta"; version="1.5"; sha256="0c3mpzgm5y9bzjb50gp3l32xph6b6xinjdj4phxrkwaclvxx13yz"; depends=[]; }; +robumeta = derive { name="robumeta"; version="1.6"; sha256="13hwbl4pym3pkxxfbffhv22nn3f4spc6lb4gz1wxi9iha1s9ywi5"; depends=[]; }; robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; }; robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS Rcpp RcppArmadillo]; }; @@ -5399,15 +5482,15 @@ rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9 roxygen2 = derive { name="roxygen2"; version="4.1.0"; sha256="0jpaqrnkb6qfs6jly637j8sbng6r1gzw15phwkifsh0fgqbi61ap"; depends=[stringr brew digest Rcpp Rcpp]; }; royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; }; rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; }; -rpart = derive { name="rpart"; version="4.1-9"; sha256="11v8hrk8pz66naadsa1sk7bwij30rzm3m315y3q9i6gl4rlr8qca"; depends=[]; }; +rpart = derive { name="rpart"; version="4.1-9"; sha256="108zsalgmp4mj66m2mxr56qrh3yz0pxfij81gri224r5brypqak1"; depends=[]; }; rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7fsvnfkdkxq65v3v3fl88irp8vxrdblqgjyc09x"; depends=[rpart]; }; rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; }; -rpg = derive { name="rpg"; version="1.2"; sha256="13vvym3xf70fmm57nl56dc5wvvv9va9id2agxlzxd9yrhlxbcnhm"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; }; +rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; }; rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; }; -rplexos = derive { name="rplexos"; version="0.12.1"; sha256="13n5xysa1pi5pcbq80w268ybqc414i56d4hpln0yl6zva6dgpsqd"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; }; +rplexos = derive { name="rplexos"; version="0.13"; sha256="149y0y0qb18igg4pc0i27vfpwcvfvg24ixqrqcya5xvdrm1h63aj"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; }; rplos = derive { name="rplos"; version="0.4.6"; sha256="01vfb07fc5z0pm6d5wvcpfwjx5fha9par3fpra9v6snaqm74l3w5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; }; rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; @@ -5415,19 +5498,19 @@ rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hm rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; }; rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; }; -rqPen = derive { name="rqPen"; version="1.0"; sha256="1vd2kjbqb5jqvbciagw03fp28ljswifznkdqj34q753kzvryblri"; depends=[quantreg]; }; -rr = derive { name="rr"; version="1.0"; sha256="18h35whflnqzr7fkaqlwq73w9s1vbpk8nm5i5ww4wgz20wxm8l87"; depends=[MASS arm coda]; }; +rqPen = derive { name="rqPen"; version="1.1"; sha256="0da6pbzx2my052v8s9nyw0j5ljy4pfigyy82n72zp0jzhdzmq479"; depends=[quantreg]; }; +rr = derive { name="rr"; version="1.2"; sha256="0p3h15sbn2896ygxyvf4farys363r2p5jg41h07dzrcaif8i331l"; depends=[MASS arm coda]; }; rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; }; rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[robustbase mvtnorm lattice cluster pcaPP]; }; rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[rrcov robustbase pls spls pcaPP]; }; rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[rrcov robustbase lattice cluster norm]; }; rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; }; -rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; depends=[mc2d eha msm tkrplot]; }; rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; }; rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; }; rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; -rsatscan = derive { name="rsatscan"; version="0.3.9122"; sha256="100098c5v8s3xcwvgx63fqi1ngyq5hc7l4wwklhw5zm7h30fcr7z"; depends=[foreign]; }; +rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; +rscala = derive { name="rscala"; version="1.0.2"; sha256="13l1cmmj28kjrmxnvgi5zpxi8ak9956bzmsn1b3v7a3xb6glchij"; depends=[]; }; rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive { name="rsdmx"; version="0.4-5"; sha256="12rk0bcfsnkd2447jyc40857ksm7gbg4nn3slls9wsd641am6kxi"; depends=[XML RCurl plyr]; }; @@ -5437,7 +5520,7 @@ rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; }; rsm = derive { name="rsm"; version="2.07"; sha256="0d1kymgmprp41xvax6c5k881dxjgf6bnvpl4mh9l1pnjdcq7pyi5"; depends=[]; }; rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[XML rgl]; }; -rsnps = derive { name="rsnps"; version="0.1.0"; sha256="1wpbr2sjcw6hh9sq8h2jzgvc4xlygf0kcd91sqg89nmprfw73j6c"; depends=[plyr stringr httr RCurl XML]; }; +rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[plyr stringr httr RCurl XML jsonlite]; }; rspa = derive { name="rspa"; version="0.1-6"; sha256="0zwmcjakpir8mvy8cvy8j85gar4s7gmizxc3z4mdrc4iadps9gqd"; depends=[editrules]; }; rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; }; rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; }; @@ -5453,7 +5536,7 @@ rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; }; rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; }; rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; }; -rtkpp = derive { name="rtkpp"; version="0.8.4"; sha256="0v1n16hi1zvbdn6p737ryw8baflyw7aqjpnnzqr7rgwc518zhd1f"; depends=[Rcpp Rcpp]; }; +rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp Rcpp]; }; rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; }; rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; }; rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; @@ -5482,7 +5565,8 @@ sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94 sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; }; sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; -saccades = derive { name="saccades"; version="0.1"; sha256="0bmwqfhdqf4j0xpyfzzgl6h35r3wgjmkrmnwn9l17648f236d7c8"; depends=[zoom]; }; +saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; +sadists = derive { name="sadists"; version="0.1.0"; sha256="1qx0ki0w8i9w92phzcz57mm1kp4p2i5fznqvwa4amdqym66ky48c"; depends=[PDQutils hypergeo orthopolynom]; }; sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; }; sae = derive { name="sae"; version="1.0-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; }; sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; @@ -5530,11 +5614,11 @@ scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0 scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; }; scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; }; scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; -scriptests = derive { name="scriptests"; version="1.0-9"; sha256="03jv5hgzs4hvkpvjr9073nncmwj20cwispzwrbvxjdnvm5hnjg3y"; depends=[]; }; +scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; }; scrm = derive { name="scrm"; version="1.3-3"; sha256="0if338nkbfiakb82wrvy25xsnf337gm4xz5b9027s5yblwwxngf1"; depends=[Rcpp Rcpp]; }; scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; }; scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; }; -sda = derive { name="sda"; version="1.3.5"; sha256="0i5dxqc47d32b860qz9ipyy6h4mszx0vmg8xd5mz9lxz2if9k2gm"; depends=[entropy corpcor fdrtool]; }; +sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; }; sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; }; sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; }; sdcTable = derive { name="sdcTable"; version="0.17.1"; sha256="0wljdpggf8mhsjg0xrgb3xqd346zb4f8pk0jfgv38krhkfxz1ss5"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; }; @@ -5562,7 +5646,8 @@ seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqic seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; }; seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp Rcpp]; }; -segmented = derive { name="segmented"; version="0.5-1.0"; sha256="15bxn998n38hja7hbjfc8yjfbmqxsgh9xsp2l19b1w35r72hc3sd"; depends=[]; }; +segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; }; +seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp Rcpp]; }; selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; }; selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; }; selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[XML stringr]; }; @@ -5580,12 +5665,12 @@ semsfa = derive { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf sendmailR = derive { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; sensR = derive { name="sensR"; version="1.4-5"; sha256="1vp06ghmk852wkc4vmp4k68z6v623hsay69c8nm3m8xvf2vrqfgb"; depends=[multcomp MASS numDeriv]; }; -sensitivity = derive { name="sensitivity"; version="1.10.1"; sha256="1pszyf8lkp2jv773kfs1jmidq8dykiwhp592dnm4zhiy18sl7jl2"; depends=[boot]; }; +sensitivity = derive { name="sensitivity"; version="1.11"; sha256="197gm4ylh8giyh5iv9lf5dyb9ad7m406d08ai3vnf7irj7f8nwp2"; depends=[boot]; }; sensitivityPStrat = derive { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; }; sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; }; -separationplot = derive { name="separationplot"; version="1.0"; sha256="1m8s531dsmzdam5s2yn0qyvm89zfxrzj8sh8r2gpcf31qrai7m26"; depends=[MASS RColorBrewer]; }; +separationplot = derive { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive { name="seqDesign"; version="1.0.2"; sha256="0v4g4r9y79vqf4i2r96y6wgjf2aww98k06rk3lpr4cz1yp5x3gvx"; depends=[survival xtable]; }; seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; }; @@ -5608,18 +5693,18 @@ severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; }; sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; -sgPLS = derive { name="sgPLS"; version="1.0"; sha256="0n2apx74pcfqw1wakck1pnnahf3lxs5qzzki1j5w2vlp38f312k9"; depends=[mixOmics]; }; +sgPLS = derive { name="sgPLS"; version="1.1"; sha256="09nf9qqhlddcgp2y44lxgva9vy3dgbmw1hbl0phw95wb8b9p1m0s"; depends=[mixOmics]; }; sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; }; sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; }; sglasso = derive { name="sglasso"; version="1.1-0"; sha256="1iyj8clk2ibj94nxh1xi1wr50y2l53fxcivc2jdnilcqmscwbf1x"; depends=[Matrix]; }; sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; }; sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; -sgt = derive { name="sgt"; version="1.0"; sha256="1dg5ki1qgghzwl49vsjpvl47s8kh46iag5krknczfcahk4fq0knp"; depends=[maxLik]; }; +sgt = derive { name="sgt"; version="1.1"; sha256="0j4xxh5lypcl0hyfx7gzrhb40z36ygn97hf1nl6m8wj4dncg39jf"; depends=[maxLik]; }; shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; }; shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; }; -sharpshootR = derive { name="sharpshootR"; version="0.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; }; +sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[aqp ape soilDB igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; }; sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; }; shiny = derive { name="shiny"; version="0.11.1"; sha256="1aplb2wvgsbg6hhjsyjjhd8qbj11yrzm10rr812lzpiavd9wjn3w"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; }; shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; }; @@ -5628,33 +5713,34 @@ shinyFiles = derive { name="shinyFiles"; version="0.5.0"; sha256="0ax8blsflzwzzp shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; -shinythemes = derive { name="shinythemes"; version="1.0"; sha256="19qhbiyn8chchwj9w9vyi6q86l84amf2n0g5y310apw1hzsjnnr7"; depends=[shiny]; }; +shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; }; shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; }; shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; -showtext = derive { name="showtext"; version="0.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; }; +showtext = derive { name="showtext"; version="0.3"; sha256="1spbrzjasd0ljipbf45iar7b0vksla93iajypfbq2ndwyid3yzj4"; depends=[sysfonts showtextdb]; }; +showtextdb = derive { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; }; shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; }; shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; }; shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; }; siRSM = derive { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[rsm MASS foreach doSNOW]; }; siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[hdrcde coda MASS bayesm mnormt spatstat]; }; sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[MASS corpcor mmap ade4 infotheo]; }; -sidier = derive { name="sidier"; version="3.0"; sha256="0jkb2iqlafxzar359fqh09kzfz7iy4kkmg8sp9f6ihyvy35dvh93"; depends=[ape network igraph gridBase ggmap ggplot2]; }; +sidier = derive { name="sidier"; version="3.0.1"; sha256="1vl28biy7inycn74kzq0gm3r2fd5ylkndl863jy8b3jvdrq9achk"; depends=[ape network igraph gridBase ggmap ggplot2]; }; sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; }; signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; }; -signal_hsmm = derive { name="signal.hsmm"; version="1.1"; sha256="0ifx7ahl5nj90id0pk4gpz0hdq72rsf53n05s17g6j275dzkmd0n"; depends=[seqinr shiny]; }; +signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; }; simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; }; -simMSM = derive { name="simMSM"; version="1.1.4"; sha256="0dxl0cinc8zz77jjk7qbj81x6c9b1mw07x9rr5qdqbj9vnaj0gzy"; depends=[survival mvna]; }; +simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; }; simPH = derive { name="simPH"; version="1.3"; sha256="1hazh1flag3n7mrab9agc6nmiii0amdcxlbgzadiwpgyrdbdhkjn"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; }; simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; }; simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; }; -simctest = derive { name="simctest"; version="2.4"; sha256="12qxav3qy1s6g8yr6ygbjp3jlrf2p0h3zvl8bnqpk6mx95zw5gh3"; depends=[]; }; -simecol = derive { name="simecol"; version="0.8-4"; sha256="0k83zcnvxq89m60d9157w3sn2gwyl6m7812qy1bgn260ac2nqv10"; depends=[deSolve]; }; +simctest = derive { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; }; +simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9d0z8mkh6lc8qm4zivyk5af79mr5s0bn5"; depends=[deSolve]; }; simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; }; @@ -5665,12 +5751,12 @@ simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; }; siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; }; sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; }; -sirt = derive { name="sirt"; version="1.3"; sha256="1m76jk45s60kzqasx5scq24lbn4mljdg8j8sxq9fs1r9yjz76f3k"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; }; +sirt = derive { name="sirt"; version="1.5-0"; sha256="0mj6j336b4kzd2fsy3nha66r88cyfnq70cgfld36p9izlxlq6l7x"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; }; sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh0h5f5wyry1cbi33rj3h7sss8vi3vz0"; depends=[lars]; }; sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; }; sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; }; sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; -sjPlot = derive { name="sjPlot"; version="1.6.9"; sha256="1nf2ndwd6y5szvvycz2sdr572d3c4zc79frvhxh3iajb071awral"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; }; +sjPlot = derive { name="sjPlot"; version="1.7"; sha256="0kk9isz105y6m83vk6x6c7i55kch51w2a4l8nlc44ffbm8zwqqa1"; depends=[ggplot2 MASS car foreign psych scales dplyr tidyr]; }; sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; }; skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; @@ -5727,8 +5813,8 @@ soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; }; softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; }; soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[pls KernSmooth wavelets hexView sp GSIF]; }; -soilDB = derive { name="soilDB"; version="1.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; }; -soilphysics = derive { name="soilphysics"; version="2.0"; sha256="0gsxpndin79n8ygwjzdaf8njkqrf6y805m3gd19cyyz9iz6g9yfb"; depends=[rpanel MASS]; }; +soilDB = derive { name="soilDB"; version="1.5-2"; sha256="1xiiprshh40qkx23wxd20rd7bsbwgw03pa0hv8m6q64pri7v8xq0"; depends=[aqp plyr Hmisc RCurl XML sp]; }; +soilphysics = derive { name="soilphysics"; version="2.1"; sha256="0j2jqdzkm5clqsn0z01ldzx138yf37gvyrk79yqhmwiigvp5b728"; depends=[rpanel MASS]; }; soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; }; soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; }; @@ -5757,7 +5843,7 @@ spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4 spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; }; spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; }; spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; -spaMM = derive { name="spaMM"; version="1.4.1"; sha256="1dz6kx64g69i8fv87ws74a3j33hssshii15qf99brrs5dsd16jfz"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme Rcpp RcppEigen]; }; +spaMM = derive { name="spaMM"; version="1.5.1"; sha256="1sv5ndg7jmyivwkj7y7i4da862qb8p3z7m83vmbphwbykpl7jfs5"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme Rcpp RcppEigen]; }; spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; }; space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; }; @@ -5790,13 +5876,13 @@ spatial = derive { name="spatial"; version="7.3-9"; sha256="12qhfqmznij1jddjklhl spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[SpatialExtremes msm coda]; }; spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[iterators foreach rgdal raster mmap abind doParallel]; }; spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; }; -spatialEco = derive { name="spatialEco"; version="0.1-0"; sha256="1ks44g6np9q1yf4mr0wgijjvf8lvjpgkyfwjcj2d9938fng6p74x"; depends=[RANN rms sp raster spatstat cluster spdep SDMTools RCurl rgeos]; }; +spatialEco = derive { name="spatialEco"; version="0.1-1"; sha256="1k7xdgg541mwr9rk3h8pi7hgb61wza14azvmbxqd92m29p2yqn00"; depends=[RANN rms sp raster spatstat cluster spdep SDMTools RCurl rgeos]; }; spatialTailDep = derive { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; }; spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; }; spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; }; spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; }; spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; }; -spatstat = derive { name="spatstat"; version="1.40-0"; sha256="1pxmfh401zcssp10g3wcsbiq63vi4b9c95g3ir394m1hqf122qhc"; depends=[mgcv deldir abind tensor polyclip goftest]; }; +spatstat = derive { name="spatstat"; version="1.41-1"; sha256="1r2538h4arvlsn49ci84ch45wy5k9kiq4d22bd98jrh6xna3rd6x"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; }; spatsurv = derive { name="spatsurv"; version="0.9-8"; sha256="1dsqkcmhka8yzl13jfn19ywq1bk7788amj4nrl1bz05q3vz3drpp"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; }; spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; }; spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; }; @@ -5805,13 +5891,12 @@ spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yf spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; }; spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; }; -spdep = derive { name="spdep"; version="0.5-83"; sha256="14j2sr6c225pmfclq2v8d3dfkib0vy3y8cawdilybd8s96zlbd8f"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; }; +spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; }; spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[deSolve raster animation]; }; spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; -speaq = derive { name="speaq"; version="1.2.0"; sha256="1af5ivics0sc69s11fabjs93g2yfjxcls4j2hnb9abksih9hvd2n"; depends=[]; }; +speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[]; }; speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; }; -spectral_methods = derive { name="spectral.methods"; version="0.7.2.125"; sha256="06d7l3hv1yi887yd3ig63n2ajyxa7a0cpjaza8spif9yj5jia35d"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; }; spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; }; speedglm = derive { name="speedglm"; version="0.2-1.0"; sha256="13gjij9pb65j9c52d5cxl9n6fjmcwbhja4wdl4619dy5rj9vsyi4"; depends=[Matrix]; }; speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; @@ -5827,7 +5912,7 @@ spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9 spiders = derive { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; }; spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; -splancs = derive { name="splancs"; version="2.01-36"; sha256="0m29zh91jyz69nh2a9iigzcaxd1mlhq3b7z40vgqib4jnbzkbyg5"; depends=[sp]; }; +splancs = derive { name="splancs"; version="2.01-37"; sha256="0q548i76107laa9yrsjxqvwhl8zyhlib557qqr8aa7kjg6j0p5fn"; depends=[sp]; }; splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; }; splm = derive { name="splm"; version="1.3-7"; sha256="1bfi80vg129v8d0vp7sigbhskl227lmbry1vmklvcczrjqf2bh45"; depends=[spdep plm maxLik MASS bdsmatrix ibdreg nlme Matrix spam]; }; spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; @@ -5837,6 +5922,7 @@ splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1 spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[sp shape]; }; spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr rgdal leafletR whisker gistr]; }; sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; +sprex = derive { name="sprex"; version="1.0"; sha256="0m0v0db01a3zd934ini60hqnkc6cfyj8hbsxp2xvw06lblg46dzh"; depends=[]; }; sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; }; sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost survival GAMBoost randomForestSRC LogicReg]; }; sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; }; @@ -5859,12 +5945,14 @@ ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13 sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; }; ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; +ssize_fdr = derive { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; }; sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; }; ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; }; -st = derive { name="st"; version="1.2.3"; sha256="10wq705vyzarkgmfn3sblac979p20xv02hq01g75yp2krm1v8h3x"; depends=[sda fdrtool corpcor]; }; +st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[sda fdrtool corpcor]; }; +staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[Rcpp VGAM magicaxis Rcpp]; }; stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; }; stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; }; stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; }; @@ -5884,23 +5972,26 @@ statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; }; -stepR = derive { name="stepR"; version="1.0"; sha256="0sif4hrnxkpwimrlf6m3qdgk79vzca44apz0xqc0h647841n63ax"; depends=[]; }; +stepR = derive { name="stepR"; version="1.0-1"; sha256="1iafxg0g0cy6v98b85h68xrmfndc2hbmr9x7v5nk16zgcknl8k96"; depends=[]; }; stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; +stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; }; stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; }; stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; }; stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[matrixStats slam lda stringr Matrix glmnet]; }; +stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; }; stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; }; stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; stochvol = derive { name="stochvol"; version="1.0.0"; sha256="1c083gmfq9ldd41235shcb5i3ggd92fxvimhaavljnr1wsls5f2b"; depends=[coda Rcpp Rcpp]; }; stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; +stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp Rcpp]; }; stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp Rcpp]; }; stpp = derive { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[splancs KernSmooth spatstat]; }; stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; }; strap = derive { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; -strataG = derive { name="strataG"; version="0.9.2"; sha256="1yrq12aq3sb27pz8hxz48klp2rvnnz96b8yaaa3a65m3g5vcjrmd"; depends=[swfscMisc pegas ape MASS reshape2 Rcpp]; }; +strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[swfscMisc pegas ape MASS reshape2 Rcpp]; }; stratification = derive { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; }; stratigraph = derive { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; }; straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; @@ -5914,7 +6005,7 @@ stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; }; strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; }; structSSI = derive { name="structSSI"; version="1.1"; sha256="0rmf3q65adrqh9nrc4apqm4ca7frpwqr6xh80b4mxiz0z4wfcv9q"; depends=[igraph rjson ggplot2 reshape2]; }; -strum = derive { name="strum"; version="0.5.1"; sha256="1maws316zqhgvv2iq1iqhybxqx3rws9rnn7zxf07ksdxmqqqkcbj"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; +strum = derive { name="strum"; version="0.6"; sha256="1jd8h8fnjv4a58shl0j9fdlds7xns1j18b9qaqhrfa4hrdrw75s9"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; }; stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; }; stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; @@ -5928,7 +6019,7 @@ subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; }; -summarytools = derive { name="summarytools"; version="0.2"; sha256="056fah6526j9y63aksq43qj29jn233lkj45ql68sv08g0vbv28qs"; depends=[pander rapportools]; }; +summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander xtable rapportools rstudioapi]; }; supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; }; superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; }; @@ -5942,15 +6033,15 @@ survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zb survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; }; survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; }; -survMisc = derive { name="survMisc"; version="0.4.4"; sha256="0ir84sb2gj1aqglifrxx66sjirxgz3bkgyh1l2vcmyndnad871jr"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; }; +survMisc = derive { name="survMisc"; version="0.4.5"; sha256="137k453v6jsl07s0qks0wf452lxx3klbqqic52jj9yzgr6ic3xig"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; }; survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; -survRM2 = derive { name="survRM2"; version="1.0"; sha256="19lfs66x2zh7cd4s04ry3sd75q4fm8a3xmpl1b0jzvldhnq2yrgz"; depends=[survival]; }; +survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; }; survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; }; surveillance = derive { name="surveillance"; version="1.8-3"; sha256="10d170l0ah92awpa9cafxshpvmj3d206fqn5sm7bd73q87mvbgdp"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; }; survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; }; surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; }; -survival = derive { name="survival"; version="2.37-7"; sha256="1ihs42gjbw06aj5hz128964lshpi934cyc8npv9c8ann4mc2r3b5"; depends=[]; }; +survival = derive { name="survival"; version="2.38-1"; sha256="0kq0a6h1bmphp4vi1f3wzs5pddp3zw9vfi7vk6x27zglnwjhkfgm"; depends=[]; }; survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; }; survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; }; @@ -5985,7 +6076,7 @@ sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; }; sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; }; sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; }; -symbolicDA = derive { name="symbolicDA"; version="0.4-1"; sha256="14lcxgbsizw0l1xcjrmz3jvfsbwlirkd0shp293hg3qi7gbzcms8"; depends=[clusterSim XML rgl shapes e1071 ade4]; }; +symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[clusterSim XML rgl shapes e1071 ade4 cluster]; }; symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; }; synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; }; @@ -5993,12 +6084,14 @@ synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfw synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; }; synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; -synthpop = derive { name="synthpop"; version="1.0-0"; sha256="1ifdzfql2a9gn021l5f93qrx30db48hpq43c5zanmb2zdqb8zc16"; depends=[lattice MASS nnet rpart party]; }; +synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[lattice MASS nnet ggplot2 coefplot rpart party foreign plyr proto]; }; sysfonts = derive { name="sysfonts"; version="0.4"; sha256="0y33ykcxynm90inq8s5phdg3mfkx30szqld75h0b2faykpv6q3r4"; depends=[]; }; systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; }; +systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[Rcpp lpSolve Rcpp]; }; +syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; }; taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; }; taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; }; -tab = derive { name="tab"; version="2.1.3"; sha256="0ypb11gvasx7mdkpysfjvxb61660sdaggp6l43iyp2grfrilkm7y"; depends=[survey survival gee]; }; +tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[survey survival gee]; }; table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; }; tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; }; tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; @@ -6013,7 +6106,7 @@ tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdc taxize = derive { name="taxize"; version="0.5.2"; sha256="1141ypz76nda9ij0fr63kgjagj9al63gnqwxa7ld7v9xzig8zgyp"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan bold]; }; tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp Rcpp]; }; tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; -tcR = derive { name="tcR"; version="1.1"; sha256="0z5v42yalza10bizl6kw54saiawj9y33g0jwzsqzzaxfdvsxd2gz"; depends=[ggplot2 dplyr gridExtra reshape2 Rcpp data_table gtable roxygen2 stringdist Rcpp]; }; +tcR = derive { name="tcR"; version="1.3"; sha256="09jvmnyq9j0l8ng73jr2ldb70fbqryd6jzjsxdyhdxvj2w83qcxa"; depends=[ggplot2 dplyr gridExtra reshape2 igraph Rcpp data_table gtable roxygen2 stringdist Rcpp]; }; tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; }; tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; }; @@ -6030,6 +6123,7 @@ testit = derive { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfh testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3azfxb6xkdcmm6kjdv6ma47gv947m90ysnfk"; depends=[digest]; }; testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; }; texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; +texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; }; texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; }; textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; }; textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; }; @@ -6060,11 +6154,11 @@ timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadf timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; }; -timereg = derive { name="timereg"; version="1.8.6"; sha256="02whk0wqd1n2dzsfqvhs4plgkvrj04r1i83lvsa2j2qwjvbf831p"; depends=[survival lava]; }; +timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g3p2xl3zbsfiak7lagvs5sbsq84b0wpr7"; depends=[survival lava numDeriv]; }; timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive { name="timeseriesdb"; version="0.1"; sha256="1zwvjnx4b020avyxjx2nwg9n8p8bdrn038mfcl53y9cnxj3w5wsq"; depends=[DBI]; }; timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; }; -timma = derive { name="timma"; version="1.2.0"; sha256="06ycki3x99nwaxqxbnw7h5b3sx6jznl1ahnzqw6vjyrl4dw6d1fl"; depends=[Rcpp QCA Rcpp RcppArmadillo]; }; +timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; }; timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; }; tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tis = derive { name="tis"; version="1.27"; sha256="1kgzc032qa005hzcimhbbhcs5kcvm88pfb48ac84k205f6xhdsir"; depends=[]; }; @@ -6080,7 +6174,7 @@ tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0w tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; }; tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.1"; sha256="1rjpnr3x9nngvbx3vlzqsha9zg7ikqfxmqsalb3gvgph0bamdbbp"; depends=[NLP tm XML]; }; tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; }; -tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.1"; sha256="1hx0micnma1i6bys6jhwcxjsb7rlzac5kwwnrsgk7i1ynq7bh3zp"; depends=[NLP tm XML ISOcodes]; }; +tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; }; tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2.2"; sha256="08nm2iwx897d5v144lh2gj5c3yprnky48s882p278b8blmdwnfn0"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; tmap = derive { name="tmap"; version="0.6"; sha256="10aw79k3vdi3f20i4clsbvdlfylg34z02ah36wz5yj7y68fm5ijh"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; }; @@ -6089,7 +6183,7 @@ tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99w tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat geometry]; }; tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; }; tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; }; -toaster = derive { name="toaster"; version="0.2.5"; sha256="0yybv6lq22mzawyvywh1dpg5p5mx5qqqssdhgd3ff78cqp7j298r"; depends=[RODBC plyr reshape2 ggplot2 scales RColorBrewer wordcloud ggmap]; }; +toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; }; tolerance = derive { name="tolerance"; version="1.0.0"; sha256="1anim3rq60fscylnz066fddihrxzy0j0d09ni262fqhbc2fla0xy"; depends=[rgl]; }; topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; }; topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; @@ -6101,7 +6195,7 @@ tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; -track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi9gaadrin50fc39l5kjqwqa9vhmkz7"; depends=[]; }; +track = derive { name="track"; version="1.1.7"; sha256="1l3465h7dxyh6myf40jv05985w6z9yfpwkxalf51540gvz1jjm67"; depends=[]; }; tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; }; traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; }; @@ -6112,6 +6206,7 @@ transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1li trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; }; tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; }; +treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[rpart cluster]; }; treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; }; treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; }; treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; }; @@ -6137,11 +6232,12 @@ trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8s trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Rcpp Matrix Rcpp RcppEigen]; }; tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxfd5h0xhnx8kp8qyxc43j4v2nz5l4kq"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; +tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; }; tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; }; -tseries = derive { name="tseries"; version="0.10-33"; sha256="1ckncvzm5ili9ggzx09nx9hq1n2yz0kl3vxk1hmnxlklqm12fym3"; depends=[quadprog zoo]; }; +tseries = derive { name="tseries"; version="0.10-34"; sha256="068mjgjcsvgpynkvga8lv430cg8zhlr9frj5yapsxni2vj534pqj"; depends=[quadprog zoo]; }; tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; }; tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; }; @@ -6187,7 +6283,7 @@ urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl urltools = derive { name="urltools"; version="0.6"; sha256="0psi93pj1n3bv0r9h6bl1pi8462mxhilq7npnqqj3kqp1f8z64an"; depends=[Rcpp Rcpp]; }; usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; }; useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; }; -userfriendlyscience = derive { name="userfriendlyscience"; version="0.1-2"; sha256="1b2ypga0kzf8qsl160by1vfp8p6z2mczn3w1qgk042y83kiaiawx"; depends=[ggplot2 plyr psych pwr fBasics e1071 ltm MBESS foreign knitr xtable GGally lavaan]; }; +userfriendlyscience = derive { name="userfriendlyscience"; version="0.2-0"; sha256="01r66pykmjarcw2644yvzqizffck9nj78iq9dgxz1743nqnjld61"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; }; uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; }; usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; }; ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; }; @@ -6199,14 +6295,14 @@ varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqd varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; }; varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; }; -vardpoor = derive { name="vardpoor"; version="0.2.6"; sha256="1csnvdpcllq1lrzq3xqhgbnrf3gdah011rknhbl5z67zwa8gs4w1"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; +vardpoor = derive { name="vardpoor"; version="0.2.8"; sha256="02gbj5d7qwj05cybr0rc6zx2308r35rh5dzcxms0b3ijzpl32bcs"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; }; vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; vcdExtra = derive { name="vcdExtra"; version="0.6-5"; sha256="0z2xyvmxka1awx0bnqvp6d16zj8gb6jhj0q4xil7r8ya4hqqmmac"; depends=[vcd gnm MASS]; }; -vcrpart = derive { name="vcrpart"; version="0.3-2"; sha256="1mvhashafvc7ssg60np1g6i9bjvc00dniwilw6x54gnlpczq1qrp"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; +vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; vdg = derive { name="vdg"; version="1.0.1"; sha256="1z9kgg9bsa80px94cwkna9hsjfa69kvhssmqlcidzb4h5hg7a3fd"; depends=[ggplot2 quantreg proxy]; }; vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; @@ -6225,10 +6321,11 @@ violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988x vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; }; -visreg = derive { name="visreg"; version="2.1-0"; sha256="1l8az4ykfr3rfgxx7wj9qvma77lcgr3pa60cxzqabm9cg6622fsf"; depends=[lattice]; }; +visreg = derive { name="visreg"; version="2.1-1"; sha256="16ghi7p809mcb3jfw1c9ibdd1mhq54m7x0qbcbiwxpnnd7grqy4w"; depends=[lattice]; }; visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; }; visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; }; +vmsbase = derive { name="vmsbase"; version="2.0"; sha256="04j6zibwcn1ywckbdqw5p6da5qpgpll7a96x5a1kyimiwk408j1r"; depends=[sqldf ggmap mapdata maps marmap intervals plotrix sp foreign cluster cairoDevice ggplot2 DBI RSQLite fields gsubfn AMORE ecodist gWidgets gWidgetsRGtk2 chron maptools outliers PBSmapping R6 VennDiagram gmt]; }; vowels = derive { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; vows = derive { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 rpanel mgcv RLRsim oro_nifti shape stringr]; }; vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; @@ -6238,6 +6335,7 @@ vudc = derive { name="vudc"; version="1.0"; sha256="1xjbjfya4zn94arc76pcfflc2dcn vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; }; wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; }; waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp Rcpp]; }; +wahc = derive { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; }; waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; }; @@ -6250,6 +6348,7 @@ waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqh wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; }; wbs = derive { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; }; weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; +webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[XML RCurl RJSONIO]; }; webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; }; webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; }; @@ -6268,7 +6367,9 @@ wikipediatrend = derive { name="wikipediatrend"; version="0.2.0"; sha256="11gxi9 wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[sp rgeos adehabitatLT]; }; windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; }; witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; }; +wkb = derive { name="wkb"; version="0.1-0"; sha256="0ynamg8zrk80j5ysyg7pymdcxzlscbhhygp8czmsd33p2y31pggd"; depends=[sp]; }; wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; }; +wmlf = derive { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; }; wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; }; wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; }; @@ -6288,11 +6389,10 @@ wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kpr wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; }; wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; }; wux = derive { name="wux"; version="1.2-3"; sha256="1hpgjs7jl4zckm87hrsnmqyvxg93aqsnrf79wisvs2wajgh73zmi"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor]; }; -x_ent = derive { name="x.ent"; version="1.0.6"; sha256="0yjg7gi8yhn7vw90i802dcrp6mln84rjlpcgnjvwq21s8nffs2z6"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2]; }; +x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319gb087zqgn7bzw4amq4k8vk9vjkjm"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2 statmod]; }; x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; }; x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; }; xergm = derive { name="xergm"; version="1.4.1"; sha256="1lcqa2vxdg4ljk2p0m8cqw68bqxycxql57nr3n4ggic2ys0sbrxa"; depends=[statnet statnet_common network sna ergm texreg Matrix boot coda ROCR igraph vegan lme4 Rcpp speedglm Rcpp]; }; -xgboost = derive { name="xgboost"; version="0.3-2"; sha256="1sp0rl4ixdcqljcf12cc517vnwj851g88xla641nfl0qbcj8b7n7"; depends=[Matrix]; }; xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; }; @@ -6309,7 +6409,7 @@ yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11ms yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; }; ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; }; -yhatr = derive { name="yhatr"; version="0.13.2"; sha256="0065252bgn96g1z7ddkyfbnnahvvdgfx3lxrb51fk7bkbvxs2781"; depends=[httr RCurl rjson plyr jsonlite stringr]; }; +yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr RCurl rjson plyr jsonlite stringr]; }; ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; }; yuima = derive { name="yuima"; version="1.0.36"; sha256="1rz96v0c9sikjvm3i8x887v1bkiixps691vclpd6i4cchyayx63h"; depends=[zoo expm cubature mvtnorm]; }; zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; }; @@ -6318,10 +6418,10 @@ zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0g zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; }; -zoib = derive { name="zoib"; version="1.1"; sha256="1w63wqzmf7977hk0nalgayar75ijaqjl3rgfmn90sa4fs1nqnxg7"; depends=[rjags coda matrixcalc Formula]; }; -zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; }; +zoib = derive { name="zoib"; version="1.2"; sha256="15rki5w21r7q0af9w5pyzq9x55gwmgs35pqgdqxmjnpsp8v135k7"; depends=[rjags coda matrixcalc Formula]; }; +zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; }; zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; }; zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; -zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; +zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c1100c79fac7..f662c26fe424 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -198,131 +198,131 @@ let # tweaks for the individual packages and "in self" follow packagesWithRDepends = { - # sort -t '=' -k 2 FactoMineR = [ self.car ]; }; packagesWithNativeBuildInputs = { - # sort -t '=' -k 2 - graphscan = [ pkgs.gsl ]; - RAppArmor = [ pkgs.apparmor ]; + abn = [ pkgs.gsl ]; + adimpro = [ pkgs.imagemagick ]; + audio = [ pkgs.portaudio ]; + BayesSAE = [ pkgs.gsl ]; + BayesVarSel = [ pkgs.gsl ]; + BayesXsrc = [ pkgs.readline pkgs.ncurses ]; + bigGP = [ pkgs.openmpi ]; + bnpmr = [ pkgs.gsl ]; BNSP = [ pkgs.gsl ]; - SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h + cairoDevice = [ pkgs.gtk2 ]; + Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; + CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ]; + chebpol = [ pkgs.fftw ]; + cit = [ pkgs.gsl ]; curl = [ pkgs.curl pkgs.openldap ]; - Rssa = [ pkgs.fftw ]; + devEMF = [ pkgs.xlibs.libXft ]; + diversitree = [ pkgs.gsl pkgs.fftw ]; + EMCluster = [ pkgs.liblapack ]; fftw = [ pkgs.fftw ]; fftwtools = [ pkgs.fftw ]; - kza = [ pkgs.fftw ]; - mwaved = [ pkgs.fftw ]; - spate = [ pkgs.fftw ]; - chebpol = [ pkgs.fftw ]; - seewave = [ pkgs.fftw pkgs.libsndfile ]; - rgeos = [ pkgs.geos ]; - Rglpk = [ pkgs.glpk ]; - RCA = [ pkgs.gmp ]; - gmp = [ pkgs.gmp ]; - rcdd = [ pkgs.gmp ]; - Rlibeemd = [ pkgs.gsl ]; - igraph = [ pkgs.gmp ]; - glpkAPI = [ pkgs.gmp pkgs.glpk ]; - sdcTable = [ pkgs.gmp pkgs.glpk ]; - Rmpfr = [ pkgs.gmp pkgs.mpfr ]; Formula = [ pkgs.gmp ]; - BayesSAE = [ pkgs.gsl ]; - BayesVarSel = [ pkgs.gsl ]; + geoCount = [ pkgs.gsl ]; + git2r = [ pkgs.zlib ]; + glpkAPI = [ pkgs.gmp pkgs.glpk ]; + gmp = [ pkgs.gmp ]; + graphscan = [ pkgs.gsl ]; + gsl = [ pkgs.gsl ]; HiCseg = [ pkgs.gsl ]; + igraph = [ pkgs.gmp ]; + JavaGD = [ pkgs.jdk ]; + jpeg = [ pkgs.libjpeg ]; KFKSDS = [ pkgs.gsl ]; - R2GUESS = [ pkgs.gsl ]; - RcppZiggurat = [ pkgs.gsl ]; - SemiCompRisks = [ pkgs.gsl ]; - VBLPCM = [ pkgs.gsl ]; - abn = [ pkgs.gsl ]; - cit = [ pkgs.gsl ]; + kza = [ pkgs.fftw ]; libamtrack = [ pkgs.gsl ]; mixcat = [ pkgs.gsl ]; - outbreaker = [ pkgs.gsl ]; - ridge = [ pkgs.gsl ]; - simplexreg = [ pkgs.gsl ]; - stsm = [ pkgs.gsl ]; - survSNP = [ pkgs.gsl ]; - topicmodels = [ pkgs.gsl ]; - RcppGSL = [ pkgs.gsl ]; - bnpmr = [ pkgs.gsl ]; - V8 = [ pkgs.v8 ]; - geoCount = [ pkgs.gsl ]; - devEMF = [ pkgs.xlibs.libXft ]; - gsl = [ pkgs.gsl ]; mvabund = [ pkgs.gsl ]; - diversitree = [ pkgs.gsl pkgs.fftw ]; - TKF = [ pkgs.gsl ]; - VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; - RGtk2 = [ pkgs.gtk2 ]; - cairoDevice = [ pkgs.gtk2 ]; - adimpro = [ pkgs.imagemagick ]; - rjags = [ pkgs.jags ]; - runjags = [ pkgs.jags ]; - JavaGD = [ pkgs.jdk ]; - RODBC = [ pkgs.libiodbc ]; - RODBCext = [ pkgs.libiodbc ]; - jpeg = [ pkgs.libjpeg ]; - EMCluster = [ pkgs.liblapack ]; - png = [ pkgs.libpng ]; - pbdMPI = [ pkgs.openmpi ]; - bigGP = [ pkgs.openmpi ]; - rtiff = [ pkgs.libtiff ]; - tiff = [ pkgs.libtiff ]; - Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; - XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; - rpud = [ pkgs.linuxPackages.nvidia_x11 ]; - CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ]; - rgl = [ pkgs.mesa pkgs.x11 ]; - ncdf = [ pkgs.netcdf ]; + mwaved = [ pkgs.fftw ]; ncdf4 = [ pkgs.netcdf ]; - pbdNCDF4 = [ pkgs.netcdf ]; - RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + ncdf = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; - npRmpi = [ pkgs.openmpi ]; - pbdPROF = [ pkgs.openmpi ]; - sprint = [ pkgs.openmpi ]; - Rmpi = [ pkgs.openmpi ]; openssl = [ pkgs.openssl ]; + outbreaker = [ pkgs.gsl ]; + pbdMPI = [ pkgs.openmpi ]; + pbdNCDF4 = [ pkgs.netcdf ]; + pbdPROF = [ pkgs.openmpi ]; PKI = [ pkgs.openssl ]; - RSclient = [ pkgs.openssl ]; - Rserve = [ pkgs.openssl ]; - Rpoppler = [ pkgs.poppler ]; - audio = [ pkgs.portaudio ]; - rpg = [ pkgs.postgresql ]; - RPostgreSQL = [ pkgs.postgresql ]; - ssanv = [ pkgs.proj ]; + png = [ pkgs.libpng ]; + PopGenome = [ pkgs.zlib ]; proj4 = [ pkgs.proj ]; - rgdal = [ pkgs.proj pkgs.gdal ]; - RProtoBuf = [ pkgs.protobuf ]; - rPython = [ pkgs.python ]; - qtpaint = [ pkgs.qt4 ]; qtbase = [ pkgs.qt4 ]; - BayesXsrc = [ pkgs.readline pkgs.ncurses ]; - udunits2 = [ pkgs.udunits pkgs.expat ]; - tkrplot = [ pkgs.xlibs.libX11 ]; - rzmq = [ pkgs.zeromq3 ]; - PopGenome = [ pkgs.zlib ]; - RJaCGH = [ pkgs.zlib ]; - RcppCNPy = [ pkgs.zlib ]; + qtpaint = [ pkgs.qt4 ]; + R2GUESS = [ pkgs.gsl ]; + R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + RAppArmor = [ pkgs.libapparmor ]; rbamtools = [ pkgs.zlib ]; + RCA = [ pkgs.gmp ]; + rcdd = [ pkgs.gmp ]; + RcppCNPy = [ pkgs.zlib ]; + RcppGSL = [ pkgs.gsl ]; + RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; + RcppZiggurat = [ pkgs.gsl ]; + rgdal = [ pkgs.proj pkgs.gdal ]; + rgeos = [ pkgs.geos ]; + rgl = [ pkgs.mesa pkgs.x11 ]; + Rglpk = [ pkgs.glpk ]; + RGtk2 = [ pkgs.gtk2 ]; + Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; + ridge = [ pkgs.gsl ]; + RJaCGH = [ pkgs.zlib ]; + rjags = [ pkgs.jags ]; + rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ]; + Rlibeemd = [ pkgs.gsl ]; rmatio = [ pkgs.zlib ]; - RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; - seqminer = [ pkgs.zlib pkgs.bzip2 ]; - seqinr = [ pkgs.zlib ]; + Rmpfr = [ pkgs.gmp pkgs.mpfr ]; + Rmpi = [ pkgs.openmpi ]; + RMySQL = [ pkgs.zlib pkgs.mysql ]; + RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + RODBCext = [ pkgs.libiodbc ]; + RODBC = [ pkgs.libiodbc ]; + rpg = [ pkgs.postgresql ]; rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + Rpoppler = [ pkgs.poppler ]; + RPostgreSQL = [ pkgs.postgresql ]; + RProtoBuf = [ pkgs.protobuf ]; + rpud = [ pkgs.linuxPackages.nvidia_x11 ]; + rPython = [ pkgs.python ]; + RSclient = [ pkgs.openssl ]; + Rserve = [ pkgs.openssl ]; + Rssa = [ pkgs.fftw ]; rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ]; - Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; + rtiff = [ pkgs.libtiff ]; + runjags = [ pkgs.jags ]; + RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; + rzmq = [ pkgs.zeromq3 ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; - RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; - rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ]; - R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; - sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + sdcTable = [ pkgs.gmp pkgs.glpk ]; + seewave = [ pkgs.fftw pkgs.libsndfile ]; + SemiCompRisks = [ pkgs.gsl ]; + seqinr = [ pkgs.zlib ]; + seqminer = [ pkgs.zlib pkgs.bzip2 ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ]; + simplexreg = [ pkgs.gsl ]; + SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h + spate = [ pkgs.fftw ]; + sprint = [ pkgs.openmpi ]; + ssanv = [ pkgs.proj ]; + stsm = [ pkgs.gsl ]; + survSNP = [ pkgs.gsl ]; + sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; + TAQMNGR = [ pkgs.zlib ]; + tiff = [ pkgs.libtiff ]; + TKF = [ pkgs.gsl ]; + tkrplot = [ pkgs.xlibs.libX11 ]; + topicmodels = [ pkgs.gsl ]; + udunits2 = [ pkgs.udunits pkgs.expat ]; + V8 = [ pkgs.v8 ]; + VBLPCM = [ pkgs.gsl ]; + VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; + WhopGenome = [ pkgs.zlib ]; XBRL = [ pkgs.zlib pkgs.libxml2 ]; - RMySQL = [ pkgs.zlib pkgs.mysql ]; + XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; }; packagesWithBuildInputs = { @@ -606,7 +606,6 @@ let "ripa" "rite" "rnbn" - "rriskDistributions" "rsgcc" "sdcMicroGUI" "sharpshootR" @@ -641,7 +640,6 @@ let packagesToSkipCheck = [ "Rmpi" # tries to run MPI processes "gmatrix" # requires CUDA runtime - "npRmpi" # tries to run MPI processes "sprint" # tries to run MPI processes "pbdMPI" # tries to run MPI processes ]; @@ -663,7 +661,6 @@ let "ArrayBin" # requires SAGx "babel" # requires edgeR "BACA" # requires RDAVIDWebService - "bamboo" # depends on broken jvmr "BcDiag" # requires fabia "bdvis" # requres taxize "beadarrayFilter" # requires beadarray @@ -687,13 +684,13 @@ let "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX - "cqrReg" # requires Rmosek "crmn" # requires pcaMethods, and Biobase "CrypticIBDcheck" # requires rJPSGCS "cudaBayesreg" # requres Rmath "curvHDR" # requires flowCore "D2C" # requires gRbase "DAAGbio" # requires limma + "daff" # requires V8 to build "dagbag" # requires Rlapack "DBKGrad" # requires SDD "dbmss" # requires spatstat @@ -701,6 +698,7 @@ let "dcGOR" # requires dnet "demi" # requires affy, affxparser, and oligo "DepthProc" # requires samr + "DiagrammeR" # requires V8 to build "Digiroo2" # requires spatstat "dixon" # requires spatstat "dnet" # requires supraHex, graph, Rgraphviz, and Biobase @@ -761,7 +759,6 @@ let "isva" # requires qvalue "jomo" # linking errors "js" # requires broken V8 - "jvmr" # tries to download files during its build "KANT" # requires affy, and Biobase "ktspair" # requires Biobase "latticeDensity" # requires spatstat @@ -848,7 +845,7 @@ let "RAM" # requires Heatplus "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "RbioRXN" # requires fmcsR, and KEGGREST - "Rcell" # requires EBImage + "RcppAPT" # configure script depends on /bin/sh "RcmdrPlugin_seeg" # requires seeg "Rcplex" # requires cplexAPI "RcppRedis" # requires Hiredis @@ -860,6 +857,7 @@ let "retistruct" # depends on broken RImageJROI "rggobi" # requires GGobi "RImageJROI" # requires spatstat + "rjade" # requires V8 to build "rJPSGCS" # requires chopsticks "rLindo" # requires LINDO API "Rmosek" # requires mosek @@ -892,6 +890,7 @@ let "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat + "SID" # requires pcalg "SimRAD" # requires Biostrings, and ShortRead "SimSeq" # requires edgeR "siplab" # requires spatstat @@ -909,7 +908,6 @@ let "spocc" # requires leafletR "SQDA" # requires limma "Statomica" # requires Biobase, multtest - "StochKit2R" # tarball is invalid on server "stpp" # requires spatstat "structSSI" # requires multtest "strum" # requires Rgraphviz @@ -982,12 +980,6 @@ let ]; }); - npRmpi = old.npRmpi.overrideDerivation (attrs: { - configureFlags = [ - "--with-Rmpi-type=OPENMPI" - ]; - }); - Rmpfr = old.Rmpfr.overrideDerivation (attrs: { configureFlags = [ "--with-mpfr-include=${pkgs.mpfr}/include" @@ -1002,7 +994,7 @@ let RAppArmor = old.RAppArmor.overrideDerivation (attrs: { patches = [ ./patches/RAppArmor.patch ]; - LIBAPPARMOR_HOME = "${pkgs.apparmor}"; + LIBAPPARMOR_HOME = "${pkgs.libapparmor}"; }); RMySQL = old.RMySQL.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/generate-cran-packages.R b/pkgs/development/r-modules/generate-cran-packages.R index 3dea348f3301..3510a2fa92ce 100644 --- a/pkgs/development/r-modules/generate-cran-packages.R +++ b/pkgs/development/r-modules/generate-cran-packages.R @@ -3,7 +3,12 @@ library(parallel) cl <- makeCluster(10) options(repos=structure(c(CRAN="http://cran.rstudio.com/"))) + +readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines('cran-packages.nix'), -1))) + nixPrefetch <- function(name, version) { + prevV <- readFormatted$V2 == name & readFormatted$V4 == version + if (sum(prevV) == 1) as.character(readFormatted$V6[ prevV ]) else system(paste0("nix-prefetch-url --type sha256 http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE) # system(paste0("nix-hash --flat --base32 --type sha256 /nix/store/*", name, "_", version, ".tar.gz", "| head -n 1"), intern=TRUE) } @@ -21,7 +26,7 @@ formatPackage <- function(name, version, sha256, depends, imports, linkingTo, kn paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };") } -clusterExport(cl, c("nixPrefetch")) +clusterExport(cl, c("nixPrefetch","readFormatted")) pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates"))) pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib") diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 90dab874e18e..89acb7516045 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.3"; + version = "6.4.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "181wm6yxyf9dsp1dgy7bpjz5j72a5fc818293k5mxr8g1gf0s3f4"; + sha256 = "0w41h5m51mfswdrqpgyjs73x4qr73scswv34f5zwckcih4dvsdzz"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 202109cdbf68..cd8cde1ae52e 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = http://coan2.sourceforge.net/; license = with licenses; bsd3; - platforms = with platforms; all; + platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index fb7d8e74e457..aab47dadc905 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "findbugs-3.0.0"; +stdenv.mkDerivation rec { + name = "findbugs-3.0.1"; src = fetchurl { - url = mirror://sourceforge/findbugs/findbugs-3.0.0.tar.gz; - sha256 = "0csz6drzdz867r2p2wa4cvick6bv9dpz2yym9wrvp3fnxabmgiri"; + url = "mirror://sourceforge/findbugs/${name}.tar.gz"; + sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8"; }; buildPhase = '' @@ -34,8 +34,9 @@ stdenv.mkDerivation { EOF ''; - meta = { + meta = with stdenv.lib; { description = "A static analysis tool to find bugs in Java programs automatically"; homepage = http://findbugs.sourceforge.net/; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 2709caaab062..7098771cc6e3 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pmd-4.2.6"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + name = "pmd-${version}"; + version = "5.2.3"; + + buildInputs = [ unzip ]; src = fetchurl { - url = mirror://sourceforge/pmd/pmd-bin-4.2.6.zip ; - sha256 = "0gg1px2jmqn09f5vjzgy9gck37qjm9p2d7gf9grsmrr2xncbipp8"; + url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; + sha256 = "03frkyiii7304qrcypdqcxqxjf5n3p59zjib0r802mbbx1nzcisn"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 28456d931e0a..a58ad0f39b2e 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb }: +{ stdenv, fetchurl, fetchpatch, perl, gdb }: stdenv.mkDerivation rec { name = "valgrind-3.10.1"; @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"; }; + patches = [(fetchpatch { + name = "glibc-2.21.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" + + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; + sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; + })]; + # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index f962eaef770b..f20f6d94f6f8 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -2,19 +2,19 @@ /* Cargo binary snapshot */ -let snapshotDate = "2015-01-24"; +let snapshotDate = "2015-02-26"; in with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; }); let snapshotHash = if stdenv.system == "i686-linux" - then "96213038f850569f1c4fa6a0d146c6155c0d566b" + then "2a28b604d09b4a76a54a05d91f7f158692427b3a" else if stdenv.system == "x86_64-linux" - then "4d87486493c2881edced7b1d2f8beaac32aaa5b5" + then "7367f4aca86d38e209ef7236b00175df036c03e2" else if stdenv.system == "i686-darwin" - then "17b9fc782e86bffe170abb83a01e0cb7c90a0daa" + then "e5cabb0a4a2b4e47f7b1ae9b802e2b5d0b14eac5" else if stdenv.system == "x86_64-darwin" - then "18887bdbd3e6d2a127aa34216fa06e9877b0fbc6" + then "3026c60ddd46d2bcf1cb178fc801095dbfba5286" else throw "no snapshot for platform ${stdenv.system}"; snapshotName = "cargo-nightly-${platform}.tar.gz"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out" - cp -r bin "$out/bin" + ./install.sh "--prefix=$out" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ diff --git a/pkgs/development/tools/build-managers/cmake/3.2.nix b/pkgs/development/tools/build-managers/cmake/3.2.nix new file mode 100644 index 000000000000..dd16b649cd13 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/3.2.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchurl +, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib +, useNcurses ? false, ncurses, useQt4 ? false, qt4 +}: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "3.2"; + minorVersion = "1"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm"; + }; + + enableParallelBuilding = true; + + patches = + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path-3.0.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = + [ bzip2 curl expat jsoncpp libarchive xz zlib ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake \ + --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3bbfff9221ba..3bff9d59e7fa 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { mkdir -pv $out cp -rv lib $out + gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar) + test -f $gradle_launcher_jar makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index d62e000fc2a5..5ba5d86ac77a 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/martine/ninja/archive/v${version}.tar.gz"; - sha256 = "0z9rzay6ipy6q025n1f2im8d8jy6in9pcdsiqj30xpdlsjg7p9zv"; + sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw"; }; buildInputs = [ python asciidoc re2c ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 72beb092bb07..01a3b740e6e1 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.7"; + version = "0.13.8"; src = fetchurl { url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "9673ca4611e6367955ae068d5888f7ae665ab013c3e8435ffe2ca94318c6d607"; + sha256 = "0n4ivla8s8ygfnf95dj624nhcyganigf7fy0gamgyf31vw1vnw35"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile new file mode 100644 index 000000000000..9cd40fd3f4b6 --- /dev/null +++ b/pkgs/development/tools/chefdk/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'chef-dk' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock new file mode 100644 index 000000000000..60ff7b5ba3e4 --- /dev/null +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -0,0 +1,99 @@ +GEM + remote: https://rubygems.org/ + specs: + chef (12.0.3) + chef-zero (~> 3.2) + diff-lcs (~> 1.2, >= 1.2.4) + erubis (~> 2.7) + ffi-yajl (~> 1.2) + highline (~> 1.6, >= 1.6.9) + mixlib-authentication (~> 1.3) + mixlib-cli (~> 1.4) + mixlib-config (~> 2.0) + mixlib-log (~> 1.3) + mixlib-shellout (>= 2.0.0.rc.0, < 3.0) + net-ssh (~> 2.6) + net-ssh-multi (~> 1.1) + ohai (~> 8.0) + plist (~> 3.1.0) + pry (~> 0.9) + chef-dk (0.4.0) + chef (~> 12.0) + cookbook-omnifetch (~> 0.2) + ffi-yajl (~> 1.0) + mixlib-cli (~> 1.5) + mixlib-shellout (>= 2.0.0.rc.0, < 3.0.0) + solve (~> 1.2) + chef-zero (3.2.1) + ffi-yajl (~> 1.1) + hashie (~> 2.0) + mixlib-log (~> 1.3) + rack + uuidtools (~> 2.1) + coderay (1.1.0) + cookbook-omnifetch (0.2.0) + minitar (~> 0.5.4) + dep-selector-libgecode (1.0.2) + dep_selector (1.0.3) + dep-selector-libgecode (~> 1.0) + ffi (~> 1.9) + diff-lcs (1.2.5) + erubis (2.7.0) + ffi (1.9.6) + ffi-yajl (1.4.0) + ffi (~> 1.5) + libyajl2 (~> 1.2) + hashie (2.1.2) + highline (1.7.1) + ipaddress (0.8.0) + libyajl2 (1.2.0) + method_source (0.8.2) + mime-types (2.4.3) + minitar (0.5.4) + mixlib-authentication (1.3.0) + mixlib-log + mixlib-cli (1.5.0) + mixlib-config (2.1.0) + mixlib-log (1.6.0) + mixlib-shellout (2.0.1) + net-dhcp (1.3.2) + net-ssh (2.9.2) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) + net-ssh-multi (1.2.0) + net-ssh (>= 2.6.5) + net-ssh-gateway (>= 1.2.0) + ohai (8.1.1) + ffi (~> 1.9) + ffi-yajl (~> 1.1) + ipaddress + mime-types (~> 2.0) + mixlib-cli + mixlib-config (~> 2.0) + mixlib-log + mixlib-shellout (~> 2.0) + net-dhcp + rake (~> 10.1) + systemu (~> 2.6.4) + wmi-lite (~> 1.0) + plist (3.1.0) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + rack (1.6.0) + rake (10.4.2) + semverse (1.2.1) + slop (3.6.0) + solve (1.2.1) + dep_selector (~> 1.0) + semverse (~> 1.1) + systemu (2.6.4) + uuidtools (2.1.5) + wmi-lite (1.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + chef-dk diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix new file mode 100644 index 000000000000..8352c71a6864 --- /dev/null +++ b/pkgs/development/tools/chefdk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby, perl }: + +bundlerEnv { + name = "chefdk-0.4.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ perl ]; + + meta = with lib; { + description = "A streamlined development and deployment workflow for Chef platform."; + homepage = https://downloads.chef.io/chef-dk/; + license = with licenses; asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix new file mode 100644 index 000000000000..f83e73693d89 --- /dev/null +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -0,0 +1,344 @@ +{ + "chef" = { + version = "12.0.3"; + source = { + type = "gem"; + sha256 = "0lqix0mli6fm3lwrf563sjvfkfsrnyzbz8xqkp54q65dkl63ldy0"; + }; + dependencies = [ + "chef-zero" + "diff-lcs" + "erubis" + "ffi-yajl" + "highline" + "mixlib-authentication" + "mixlib-cli" + "mixlib-config" + "mixlib-log" + "mixlib-shellout" + "net-ssh" + "net-ssh-multi" + "ohai" + "plist" + "pry" + ]; + }; + "chef-dk" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "12fdk5j6cymwk4vk45mvi5i1hs9a88jvg6g7x6pxbc0bp3if2c6a"; + }; + dependencies = [ + "chef" + "cookbook-omnifetch" + "ffi-yajl" + "mixlib-cli" + "mixlib-shellout" + "solve" + ]; + }; + "chef-zero" = { + version = "3.2.1"; + source = { + type = "gem"; + sha256 = "04zypmygpxz8nwhjs4gvr8rcb9vqhmz37clbh7k7xxh5b2hs654k"; + }; + dependencies = [ + "ffi-yajl" + "hashie" + "mixlib-log" + "rack" + "uuidtools" + ]; + }; + "coderay" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; + }; + }; + "cookbook-omnifetch" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "027zz78693jd5g0fwp0xlzig2zijsxcgvfw5854ig37gy5a54wy4"; + }; + dependencies = [ + "minitar" + ]; + }; + "dep-selector-libgecode" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "0755ps446wc4cf26ggmvibr4wmap6ch7zhkh1qmx1p6lic2hr4gn"; + }; + }; + "dep_selector" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "1ic90j3d6hmyxmdxzdz8crwmvw61f4kj0jphk43m6ipcx6bkphzw"; + }; + dependencies = [ + "dep-selector-libgecode" + "ffi" + ]; + }; + "diff-lcs" = { + version = "1.2.5"; + source = { + type = "gem"; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + "erubis" = { + version = "2.7.0"; + source = { + type = "gem"; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + }; + }; + "ffi" = { + version = "1.9.6"; + source = { + type = "gem"; + sha256 = "1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj"; + }; + }; + "ffi-yajl" = { + version = "1.4.0"; + source = { + type = "gem"; + sha256 = "1l289wyzc06v0rn73msqxx4gm48iqgxkd9rins22f13qicpczi5g"; + }; + dependencies = [ + "ffi" + "libyajl2" + ]; + }; + "hashie" = { + version = "2.1.2"; + source = { + type = "gem"; + sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9"; + }; + }; + "highline" = { + version = "1.7.1"; + source = { + type = "gem"; + sha256 = "1355zfwmm6baq44rp0ny7zdnsipgn5maxk19hvii0jx2bsk417fr"; + }; + }; + "ipaddress" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + }; + }; + "libyajl2" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; + }; + }; + "method_source" = { + version = "0.8.2"; + source = { + type = "gem"; + sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; + }; + }; + "mime-types" = { + version = "2.4.3"; + source = { + type = "gem"; + sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; + }; + }; + "minitar" = { + version = "0.5.4"; + source = { + type = "gem"; + sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka"; + }; + }; + "mixlib-authentication" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1c5p5ipa3cssmwgdn0q3lyy1w7asikh9qfpnn7xcfz2f9m7v02zg"; + }; + dependencies = [ + "mixlib-log" + ]; + }; + "mixlib-cli" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0im6jngj76azrz0nv69hgpy1af4smcgpfvmmwh5iwsqwa46zx0k0"; + }; + }; + "mixlib-config" = { + version = "2.1.0"; + source = { + type = "gem"; + sha256 = "13mb628614nl4dfwyyqpxc7b688ls6cfnjx06j8c13sl003xkp7g"; + }; + }; + "mixlib-log" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1xblfxby3psh4n5cgc6j6xnvmmssyr8qjy0l76f92nr4b9yvv9m2"; + }; + }; + "mixlib-shellout" = { + version = "2.0.1"; + source = { + type = "gem"; + sha256 = "16n2zli15504bfzxwj5riq92zz3h8n8xswvs5gi0dp2dhyjd7lp3"; + }; + }; + "net-dhcp" = { + version = "1.3.2"; + source = { + type = "gem"; + sha256 = "13mq3kwk6k3cd0vhnj1xq0gvbg2hbynzpnvq6fa6vqakbyc0iznd"; + }; + }; + "net-ssh" = { + version = "2.9.2"; + source = { + type = "gem"; + sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + }; + }; + "net-ssh-gateway" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-ssh-multi" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "0927244ac8h3z6wl5cifkblsa95ddpsxr6k8h2fmdvg5wdqs4ydh"; + }; + dependencies = [ + "net-ssh" + "net-ssh-gateway" + ]; + }; + "ohai" = { + version = "8.1.1"; + source = { + type = "gem"; + sha256 = "1lcbl7lrmy56x6l6ca7miawj9h40ff6nv4b3n6bz3w7fa3vh9xz0"; + }; + dependencies = [ + "ffi" + "ffi-yajl" + "ipaddress" + "mime-types" + "mixlib-cli" + "mixlib-config" + "mixlib-log" + "mixlib-shellout" + "net-dhcp" + "rake" + "systemu" + "wmi-lite" + ]; + }; + "plist" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs"; + }; + }; + "pry" = { + version = "0.10.1"; + source = { + type = "gem"; + sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; + }; + dependencies = [ + "coderay" + "method_source" + "slop" + ]; + }; + "rack" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; + }; + }; + "rake" = { + version = "10.4.2"; + source = { + type = "gem"; + sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; + }; + }; + "semverse" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8"; + }; + }; + "slop" = { + version = "3.6.0"; + source = { + type = "gem"; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + }; + }; + "solve" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0ff5iwhsr6fcp10gd2ivrx1fcw3lm5f5f11srhy2z5dc3v79mcja"; + }; + dependencies = [ + "dep_selector" + "semverse" + ]; + }; + "systemu" = { + version = "2.6.4"; + source = { + type = "gem"; + sha256 = "16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z"; + }; + }; + "uuidtools" = { + version = "2.1.5"; + source = { + type = "gem"; + sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; + }; + }; + "wmi-lite" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix new file mode 100644 index 000000000000..9a0afdc8e1d1 --- /dev/null +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -0,0 +1,48 @@ +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: + +stdenv.mkDerivation rec { + version = "4.0.3.16.84"; + name = "sqldeveloper-${version}"; + + src = requireFile { + name = "${name}-no-jre.zip"; + url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html; + sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g"; + }; + + buildInputs = [ makeWrapper unzip ]; + + buildCommand = '' + mkdir -p $out/bin + # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed + echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper + + cd $out + unzip ${src} + cp -r sqldeveloper/* $out/ + # Activate the needed shell script + rm $out/sqldeveloper.sh + chmod +x $out/bin/sqldeveloper + chmod +x $out/sqldeveloper/bin/sqldeveloper + + wrapProgram $out/bin/sqldeveloper \ + --set JAVA_HOME "${oraclejdk7}" + ''; + + meta = with stdenv.lib; { + description = "Oracle's Oracle DB GUI client."; + longDescription = '' + Oracle SQL Developer is a free integrated development environment that + simplifies the development and management of Oracle Database in both + traditional and Cloud deployments. SQL Developer offers complete + end-to-end development of your PL/SQL applications, a worksheet for + running queries and scripts, a DBA console for managing the database, + a reports interface, a complete data modeling solution, and a migration + platform for moving your 3rd party databases to Oracle. + ''; + homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html; + license = licenses.unfree; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index de7b2cfc6891..64de64dea067 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/phacility/libphutil.git"; - rev = "00f1fcdc19e0d5712f4d8cdb4e6804adc6dfa2ec"; - sha256 = "92031c50c61a8b46b7e978566b1add50dae5849f3c4c2870826d343c4bc458ce"; + rev = "ce3959b4046f5dcc4f3413a59328bda2a42e76b0"; + sha256 = "3c206b428fa5e0391868f7782db4af4d1cf2f338899831a36771cef74db14a76"; }; arcanist = fetchgit { url = "git://github.com/phacility/arcanist.git"; - rev = "8173ea3eea73abe12935ffc80fdd65f2d658336b"; - sha256 = "efcbfb42cb879e7589c94c7bf293de996981cf2175935790501c389253aa7f43"; + rev = "b961869edac9469be93f2c3ac7a24562d3186860"; + sha256 = "2ae1272c76a1e2bdedd87d453ddb75f6110f9224063e7ee39e88fcb8b3b4c884"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20150118"; + version = "20150318"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ef8e16281852..472f437978bf 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix new file mode 100644 index 000000000000..a06426e9cf40 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper }: + +stdenv.mkDerivation rec { + name = "automake-1.10.3"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>. + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.gz"; + sha256 = "fda9b22ec8705780c8292510b3376bb45977f45a4f7eb3578c5ad126d7758028"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + # Run the test suite in parallel. + enableParallelBuilding = true; + + meta = { + branch = "1.10"; + homepage = http://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = [ ]; + }; +} diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 7a4e2d7f44f9..9b4864e92fe5 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 70f3dbcbadca..34bffff23d4a 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 7190985ed026..96a481ade1c1 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -37,5 +37,7 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index 65c92954a274..c78e9e6c0a41 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -37,5 +37,7 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.simons ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 305ccdb8dd06..7c0cfa51cd79 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig : (runCommand "ccache-links" { } + links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 2425e346121d..c308c5c70199 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace "src/cflow.h" \ --replace "/usr/bin/cpp" \ - "$(cat ${stdenv.cc}/nix-support/orig-gcc)/bin/cpp" + "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp" ''; buildInputs = [ gettext ] ++ diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix new file mode 100644 index 000000000000..259224aac5da --- /dev/null +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + inherit perl; + + name = "checkbashisms"; + version = "2.0.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/checkbaskisms/${version}/${name}"; + sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; + }; + + meta = { + homepage = http://sourceforge.net/projects/checkbaskisms/; + description = "Performs basic checks on shell scripts for the presence of non portable syntax."; + license = stdenv.lib.licenses.gpl2; + }; + + # The link returns directly the script. No need for unpacking + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/bin + cp $src $out/bin/checkbashisms + chmod 755 $out/bin/checkbashisms + ''; + + # Makes sure to point to the proper perl version + fixupPhase = '' + sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms + ''; +} diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 085af9df3a39..ffa56aaa9a06 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1"; + version="4.1.1"; name="${baseName}-${version}"; - hash="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.tar.gz"; - sha256="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb"; + hash="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.1.tar.gz"; + sha256="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20"; }; buildInputs = [ ]; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index df5fdbfab5a3..5afe5525d0e2 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 3528e8fbe08e..f63a726f73b8 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb }: let - version = "0.7.1"; + version = "0.7.2"; in stdenv.mkDerivation rec { name="dfu-programmer-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; - sha256 = "0cwy7z5h6f13yx9bkgh61bphzii6lcl21j2gckskphf37bfzazwz"; + sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; configureFlags = [ "--disable-libusb_1_0" ]; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index a7e42a07a63e..35468d1351f0 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoconf -, automake114x +, automake , findutils # for xargs , gettext_0_19 , libtool @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; }; - buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ]; + buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7d46b0059191..e6169c48a445 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libtool, ncurses }: stdenv.mkDerivation rec { - name = "global-6.2.12"; + name = "global-6.3.4"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "05jkhya1cs6yqhkf8nw5x56adkxxrqyga7sq7hx44dbf7alczwfa"; + sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85"; }; buildInputs = [ libtool ncurses ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -v *.el "$out/share/emacs/site-lisp" ''; - meta = { + meta = with stdenv.lib; { description = "Source code tag system"; longDescription = '' @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2d8d4f9bcd75..088e1574ebe1 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; license = licenses.gpl3Plus; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.all; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index d0cc086a9a6a..443915d71e90 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, m4, perl, lzma }: +{ stdenv, fetchurl, m4, perl, help2man }: -stdenv.mkDerivation (rec { - name = "libtool-2.4.2"; +stdenv.mkDerivation rec { + name = "libtool-2.4.5"; src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; - sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"; + sha256 = "11v9gl8ancavx7179n6zk4k8hwa0zl4wz4w9z3mffk71gnfb972h"; }; - nativeBuildInputs = [ lzma m4 perl ]; + propagatedNativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ perl help2man ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! @@ -18,6 +19,10 @@ stdenv.mkDerivation (rec { # leads to the failure of a number of tests. doCheck = false; + # Don't run the native `strip' when cross-compiling. This breaks at least + # with `.a' files for MinGW. + dontStrip = stdenv ? cross; + meta = { description = "GNU Libtool, a generic library support script"; @@ -39,10 +44,3 @@ stdenv.mkDerivation (rec { }; } -// - -# Don't run the native `strip' when cross-compiling. This breaks at least -# with `.a' files for MinGW. -(if (stdenv ? cross) - then { dontStrip = true; } - else { })) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 4a38762a3ff3..dfd5c2994fd0 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.2.0"; + version="2.2.1"; name="${baseName}-${version}"; - hash="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; - url="http://luarocks.org/releases/luarocks-2.2.0-rc1.tar.gz"; - sha256="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; + hash="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; + url="http://luarocks.org/releases/luarocks-2.2.1.tar.gz"; + sha256="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; }; buildInputs = [ lua curl makeWrapper which diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix new file mode 100644 index 000000000000..d3373e9f4a61 --- /dev/null +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, ncurses, libpcap }: + +stdenv.mkDerivation rec { + + version = "3.4-beta2"; + + name = "sipp-${version}"; + + src = fetchurl { + url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz"; + sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv"; + }; + + configurePhase = '' + export ac_cv_lib_curses_initscr=yes + export ac_cv_lib_pthread_pthread_mutex_init=yes + sed -i "s@-lcurses@-lncurses@g" ./configure + sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + ./configure --prefix=$out --with-pcap + ''; + + postInstall = '' + mkdir -pv $out/share/pcap + cp pcap/* $out/share/pcap + ''; + + buildInputs = [ncurses libpcap]; +} + diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix new file mode 100644 index 000000000000..0a1032cecf81 --- /dev/null +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -0,0 +1,15 @@ +{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }: +stdenv.mkDerivation { + name = "${name}-${sqitchModule.version}"; + buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; + unpackPhase = ":"; + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin + for d in bin/sqitch etc lib share ; do + ln -s ${sqitchModule}/$d $out/$d + done + ''; + dontStrip = true; + postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; +} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a4cd9b286079..43959c8a43c8 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "strace-4.9"; + name = "strace-4.10"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "0rbgznvrxzw7vfah7mwzb4j4mm9gp4hkpiyaghlivfa0qnjzwnq9"; + sha256 = "1qhfwijxvblwdvvm70f8bhzs4fpbzqmwwbkfp636brzrds30s676"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index cf1ec5edbcd9..27e59af34fc6 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify-0.60"; + name = "uncrustify"; + version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}.tar.gz"; - sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa"; + url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index bd568eaf84d1..2d02bf054b79 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; -let version = "2.1.1"; in +let version = "2.1.2"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; - sha256 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks"; + sha256 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n"; }; buildInputs = [ ocaml findlib yojson menhir ] diff --git a/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch b/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch deleted file mode 100644 index 523d0f6524e7..000000000000 --- a/pkgs/development/tools/ocaml/opam/1.2.0-src_ext-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opam-1.2.0/src_ext/Makefile 2014-10-15 21:32:13.000000000 -0400 -+++ opam-1.2.0/src_ext/Makefile.new 2014-10-29 17:37:00.785365601 -0400 -@@ -51,7 +51,7 @@ archives: $(SRC_EXTS:=.download) - [ -e $(notdir $(URL_$*)) ] || $(FETCH) $(URL_$*) - $(MD5CHECK) $(notdir $(URL_$*)) $(MD5_$*) - --%.stamp: %.download -+%.stamp: - mkdir -p tmp - cd tmp && tar xf$(if $(patsubst %.tar.gz,,$(URL_$*)),j,z) ../$(notdir $(URL_$*)) - rm -rf $* diff --git a/pkgs/development/tools/ocaml/opam/1.2.0.nix b/pkgs/development/tools/ocaml/opam/default.nix index 9081bcbcb09a..b6dce1328688 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.0.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: -# Opam 1.2.0 only works with ocaml >= 3.12.1 according to ./configure assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; let @@ -22,12 +21,12 @@ let sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; }; dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/33677/dose3-3.2.2.tar.gz"; - sha256 = "a30a189f9f298ed1de96d7098440c951f3df2c8da626f7f37f38cbfddefc909c"; + url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; + sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; }; cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.4.tbz"; - sha256 = "ecb65e2cfd984ec07e97a78f334a80cda41fb8f8bb5e37c41fd33e6a0e2e69ef"; + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; + sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; }; uutf = fetchurl { url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; @@ -38,13 +37,13 @@ let sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.0.zip"; - sha256 = "b78bb9570fbd1dae50583792525a3dd612f8f90db367771fabd7bf4571ba25f7"; + url = "https://github.com/ocaml/opam/archive/1.2.1.zip"; + sha256 = "1mvsy89l5g9nvwmmls5jf46anh6gk8dk8a1dn42rmnihnb0zjcs4"; }; }; -in -stdenv.mkDerivation rec { - name = "opam-1.2.0"; +in stdenv.mkDerivation rec { + name = "opam-${version}"; + version = "1.2.1"; buildInputs = [ unzip curl ncurses ocaml ]; @@ -61,7 +60,9 @@ stdenv.mkDerivation rec { ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} ''; - patches = [ ./1.2.0-src_ext-Makefile.patch ]; + preConfigure = '' + substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + ''; postConfigure = "make lib-ext"; @@ -70,10 +71,10 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { - maintainers = [ stdenv.lib.maintainers.henrytill ]; + meta = with stdenv.lib; { description = "A package manager for OCaml"; - homepage = "http://opam.ocamlpro.com/"; - platforms = stdenv.lib.platforms.all; + homepage = http://opam.ocamlpro.com/; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 4176182ab621..9f02b10c898d 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.13.7.5"; + version = "0.14.1"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0qdly4493d4p6jif0anf79c8h6ylc34aw622zk4n8icyax8gv2nm"; + sha256 = "0xfskwzr6n94sa22m24x7z051qfbb9d6k4dipcv95s8j8zq74dcv"; }; meta = { diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index d07f7fd28e93..75c099877617 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { #TODO add emacs support - name = "racer-git-2015-01-20"; + name = "racer-git-2015-02-28"; src = fetchgit { url = https://github.com/phildawes/racer; - rev = "599aa524ea949ec5f9f0be0375dbb1df9cb852ae"; - sha256 = "1kasm7vffn176wr072m1dmqg1rb3wqai9yisxf8mia62548pdx88"; + rev = "2e1d718fae21431de4493c238196466e9d4996bc"; + sha256 = "0lvp494kg2hlbbdrwxmmxkyhjw53y9wjdml9z817pwj3fwmrjsx0"; }; buildInputs = [ rustc cargo makeWrapper ]; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 37ceeba77255..f2d39938a483 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "chromedriver_linux64"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/${name}.zip"; - sha256 = "1949lhrv4hrmgapvypsgwzyr75w7vpy7nkkkwjkjxn61dkwmx4jw"; + url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip"; + sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; }; buildInputs = [ unzip makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index fcae52e1d324..c05189213834 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }: let - version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0"; + version = if nightly then "1.5.2-nightly201503173c8ae2d934" else "1.5.1"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; @@ -11,8 +11,8 @@ in stdenv.mkDerivation { then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; sha256 = if nightly - then "1bk0jiha7n3s9xawj77d4q1navq28pq061w2wa6cs70lik7n6ri4" - else "08g0kmz2978jrfx4551fi12ypcsv9p6vic89lfs08ki7ajw2yrgb"; + then "10blf1hr80fknrzyrbj7qy2xn7wilnyn6y2r7ijrw2gns4ia3d0h" + else "0zdxdb9n0yk6dp6j6x3bka7vrnf7kz8jjcpl6fw5fr9f742s9s26"; }; prePatch = '' @@ -24,6 +24,8 @@ in stdenv.mkDerivation { buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); setupHook = ../nodejs/setup-hook.sh; + passthru.interpreterName = "iojs"; + meta = { description = "A friendly fork of Node.js with an open governance model"; homepage = https://iojs.org/; diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs index e0e073a0ff9b..3140c5e842b4 100755 --- a/pkgs/development/web/iojs/update-iojs +++ b/pkgs/development/web/iojs/update-iojs @@ -1,10 +1,12 @@ -#!/bin/sh -e +#!/bin/sh # # Fetch the latest io.js release (stable/nightly) and update # `default.nix` in this directory. # -cd "$(dirname "$0")" +set -e + +HERE="$(dirname "$0")" latest() { curl -s "$1" | grep 'href="v' \ @@ -39,11 +41,11 @@ nightly=$(latest_log nightly 'https://iojs.org/download/nightly/') sed -i \ "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \ - default.nix + "$HERE/default.nix" stableHash=$(hash_log "$(url iojs.src)") nightlyHash=$(hash_log "$(url iojs-nightly.src)") sed -i \ "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \ - default.nix + "$HERE/default.nix" diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 4b9e057243c0..042e29f29705 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,22 +1,33 @@ { stdenv, runCommand, nodejs, neededNatives}: { - name, src, + name, version ? "", src, + + # by default name of nodejs interpreter e.g. "nodejs-${name}" + namePrefix ? nodejs.interpreterName + "-", # Node package name - pkgName ? (builtins.parseDrvName name).name, + pkgName ? + if version != "" then stdenv.lib.removeSuffix "-${version}" name else + (builtins.parseDrvName name).name, # List or attribute set of dependencies deps ? {}, # List or attribute set of peer depencies - peerDependencies ? [], + peerDependencies ? {}, + + # List or attribute set of optional dependencies + optionalDependencies ? {}, + + # List of optional dependencies to skip + skipOptionalDependencies ? [], # Whether package is binary or library - bin ? null, + bin ? false, - # Flags passed to npm install - flags ? [], + # Additional flags passed to npm install + flags ? "", # Command to be run before shell hook preShellHook ? "", @@ -24,6 +35,12 @@ # Command to be run after shell hook postShellHook ? "", + # Same as https://docs.npmjs.com/files/package.json#os + os ? [], + + # Same as https://docs.npmjs.com/files/package.json#cpu + cpu ? [], + # Attribute set of already resolved deps (internal), # for avoiding infinite recursion resolvedDeps ? {}, @@ -34,42 +51,72 @@ with stdenv.lib; let - npmFlags = concatStringsSep " " (map (v: "--${v}") flags); - - sources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv $(find . -type d -mindepth 1 -maxdepth 1) $out - ''; - - # Convert deps to attribute set - attrDeps = if isAttrs deps then deps else - (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); - - # All required node modules, without already resolved dependencies - requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps); - - # Recursive dependencies that we want to avoid with shim creation - recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps); - - peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies; - self = let - # Pass resolved dependencies to dependencies of this package - deps = map ( - dep: dep.override { - resolvedDeps = resolvedDeps // { "${name}" = self; }; - } - ) (attrValues requiredDeps); + sources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv $(find . -type d -mindepth 1 -maxdepth 1) $out + ''; + + platforms = if os == [] then nodejs.meta.platforms else + fold (entry: platforms: + let + filterPlatforms = + stdenv.lib.platforms.${removePrefix "!" entry} or []; + in + # Ignore unknown platforms + if filterPlatforms == [] then platforms + else + if hasPrefix "!" entry then + subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms + else + platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms) + ) [] os; + + mapDependencies = deps: f: rec { + # Convert deps to attribute set + attrDeps = if isAttrs deps then deps else + (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); + + # All required node modules, without already resolved dependencies + # Also override with already resolved dependencies + requiredDeps = mapAttrs (name: dep: + dep.override { + resolvedDeps = resolvedDeps // { "${name}" = self; }; + } + ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps))); + + # Recursive dependencies that we want to avoid with shim creation + recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps)); + }; + + _dependencies = mapDependencies deps (name: dep: + dep.pkgName != pkgName); + _optionalDependencies = mapDependencies optionalDependencies (name: dep: + (builtins.tryEval dep).success && + !(elem dep.pkgName skipOptionalDependencies) + ); + _peerDependencies = mapDependencies peerDependencies (name: dep: + dep.pkgName != pkgName); + + requiredDependencies = + _dependencies.requiredDeps // + _optionalDependencies.requiredDeps // + _peerDependencies.requiredDeps; + + recursiveDependencies = + _dependencies.recursiveDeps // + _optionalDependencies.recursiveDeps // + _peerDependencies.recursiveDeps; patchShebangs = dir: '' - node=`type -p node` - coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ - xargs sed --follow-symlinks -i \ - -e 's@#!/usr/bin/env node@#!'"$node"'@' \ - -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ - -e 's@#!/.*/node@#!'"$node"'@' \ - -e 's@#!/.*/coffee@#!'"$coffee"'@' || true + node=`type -p node` + coffee=`type -p coffee || true` + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ + -e 's@#!/usr/bin/env node@#!'"$node"'@' \ + -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ + -e 's@#!/.*/node@#!'"$node"'@' \ + -e 's@#!/.*/coffee@#!'"$coffee"'@' || true ''; in stdenv.mkDerivation ({ @@ -147,9 +194,9 @@ let # We do not handle shrinkwraps yet rm npm-shrinkwrap.json 2>/dev/null || true - mkdir build-dir + mkdir ../build-dir ( - cd build-dir + cd ../build-dir mkdir node_modules # Symlink or copy dependencies for node modules @@ -161,12 +208,7 @@ let '' else '' cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/ '' - ) deps} - - # Symlink peer dependencies - ${concatMapStrings (dep: '' - ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') peerDeps} + ) (attrValues requiredDependencies)} # Create shims for recursive dependenceies ${concatMapStrings (dep: '' @@ -177,10 +219,10 @@ let "version": "${getVersion dep}" } EOF - '') (attrValues recursiveDeps)} + '') (attrValues recursiveDependencies)} ) - export HOME=$PWD/build-dir + export HOME=$PWD/../build-dir runHook postConfigure ''; @@ -189,14 +231,14 @@ let # If source was a file, repackage it, so npm pre/post publish hooks are not triggered, if [[ -f $src ]]; then - tar --exclude='build-dir' -czf build-dir/package.tgz ./ + GZIP=-1 tar -czf ../build-dir/package.tgz ./ export src=$HOME/package.tgz else export src=$PWD fi # Install package - (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags}) + (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags}) runHook postBuild ''; @@ -211,7 +253,7 @@ let ${concatMapStrings (dep: '' rm node_modules/${dep.pkgName}/package.json rmdir node_modules/${dep.pkgName} - '') (attrValues recursiveDeps)} + '') (attrValues recursiveDependencies)} mkdir -p $out/lib/node_modules @@ -230,10 +272,10 @@ let done fi - # Symlink dependencies + # Move peer dependencies to node_modules ${concatMapStrings (dep: '' mv node_modules/${dep.pkgName} $out/lib/node_modules - '') peerDeps} + '') (attrValues _peerDependencies.requiredDeps)} # Install binaries and patch shebangs mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true @@ -256,25 +298,36 @@ let mkdir -p node_modules ${concatMapStrings (dep: '' ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') deps} + '') (attrValues requiredDependencies)} ${postShellHook} ''; + # Stipping does not make a lot of sense in node packages + dontStrip = true; + + meta = { + inherit platforms; + maintainers = [ stdenv.lib.maintainers.offline ]; + }; + passthru.pkgName = pkgName; - } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // { - name = "${ - if bin == true then "bin-" else if bin == false then "node-" else "" - }${name}"; + } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // { + name = namePrefix + name; # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; - # Make buildNodePackage useful with --run-env - nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives; + nativeBuildInputs = + (args.nativeBuildInputs or []) ++ neededNatives ++ + (attrValues requiredDependencies); # Expose list of recursive dependencies upstream, up to the package that # caused recursive dependency - recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps); + recursiveDeps = + (flatten ( + map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies) + )) ++ + (attrNames recursiveDependencies); }); in self diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 51abc90c277c..53d09178fc9d 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, unstableVersion ? false +, pkgconfig, runCommand, which, unstableVersion ? false }: let @@ -54,6 +54,8 @@ in stdenv.mkDerivation { ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; setupHook = ./setup-hook.sh; + passthru.interpreterName = "nodejs"; + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix index 94ddcc1b056a..789b043e18f2 100644 --- a/pkgs/games/castle-combat/default.nix +++ b/pkgs/games/castle-combat/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { fixLoaderPath = let dollar = "\$"; in '' sed -i "$out/bin/castle-combat" \ - -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ -export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" + -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ +export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" ''; # ^ # `--- The run-time says: "libgcc_s.so.1 must be installed for diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 31ae3aa3aa4a..58649f9220de 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,21 +2,21 @@ , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem +, makeDesktopItem, qt5 }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.4.0"; name = "flightgear-${version}"; src = fetchurl { - url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2"; - sha256 = "1sd6ic9rrcgrqvc6ywkasj2pnmmmdv1i2rlyac2a882rh8i1kgz4"; + url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${name}.tar.bz2"; + sha256 = "102pg7mahgxzypvyp76x363qy3a4gxavr4hj16gsha07nl2msr5m"; }; datasrc = fetchurl { url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2"; - sha256 = "0mq5hkh8zgm129mg1ij3rrk7h2xs9ijxa7d7hipjlp6mcyhlk0q4"; + sha256 = "12qjvycizg693g5jj5qyp1jiwwywg6p9fg6j3zjxhx6r4g1sgvwc"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut freealut mesa libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto - libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr + libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5 ]; preConfigure = '' diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 4d4eb7659e19..e01999b2ecc3 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -6,13 +6,13 @@ , cherrypy , sqlite3 }: -let - version = "2.2.1"; +let + version = "2.3.2"; in buildPythonPackage rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; - sha256 = "7f5dd06a879b9ab059592355412182ee286e78e124aa25d588cacf9e4ab7c423"; + sha256 = "0jkrw45i4v24p6xyq94z7rz5948h7f5dspgs5mcdaslnlp2accfp"; }; pythonPath = [ pyqt4 @@ -51,7 +51,7 @@ in buildPythonPackage rec { uploaded to a central server for analysis. This data will be valuable to study the behaviour of our memory over a very long time period. The results will be used to improve the scheduling algorithms behind the - software even further. + software even further. ''; }; } diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index bbf12065cc71..a94f388b322c 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -29,13 +29,12 @@ stdenv.mkDerivation { cp -R * $out/ mv $out/*.so $out/lib - rm $out/libstdc++.so.6 ln -s $out/PA $out/bin/PA ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 16fb621d01d8..6be9b06e9074 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation { name = "rogue-5.4.4"; - + src = fetchurl { url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz; sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx"; }; - - buildInputs = [ncurses]; - + + buildInputs = [ ncurses ]; + meta = { homepage = http://rogue.rogueforge.net/rogue-5-4/; description = "The final version of the original Rogue game developed for the UNIX operating system"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix new file mode 100644 index 000000000000..171a6d6fe838 --- /dev/null +++ b/pkgs/games/scrolls/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, gcc +, mesa_glu, libX11, libXext, libXcursor, pulseaudio +}: +stdenv.mkDerivation { + name = "scrolls-2014-03-08"; + + meta = { + description = "Scrolls is a strategy collectible card game."; + homepage = "https://scrolls.com/"; + # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ + + platforms = [ "x86_64-linux" ]; + + licence = stdenv.lib.licenses.unfree; + }; + + src = fetchurl { + url = "http://download.scrolls.com/client/linux.tar.gz"; + sha256 = "0gpwb8f1wrj6dfd9ffxga07whnxdgk66bj7j9gkbxlvrx3sj8zbp"; + }; + + libPath = stdenv.lib.makeLibraryPath [ + gcc + mesa_glu + libX11 + libXext + libXcursor + pulseaudio + ]; + + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir -p "$out/opt/Scrolls" + cp -r ../Scrolls "$out/opt/Scrolls/" + cp -r ../Scrolls_Data "$out/opt/Scrolls/" + chmod +x "$out/opt/Scrolls/Scrolls" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$libPath" "$out/opt/Scrolls/Scrolls" + + mkdir "$out/bin" + ln -s "$out/opt/Scrolls/Scrolls" "$out/bin/Scrolls" + ''; + +} diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 685304564626..0a444cf61b44 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ buildFHSUserEnv, config }: +{ lib, buildFHSUserEnv, config }: buildFHSUserEnv { name = "steam"; @@ -14,7 +14,8 @@ buildFHSUserEnv { pkgs.gnome2.zenity pkgs.xdg_utils ] - ++ (if config.steam.java or false then [ pkgs.jdk ] else [ ]) + ++ lib.optional (config.steam.java or false) pkgs.jdk + ++ lib.optional (config.steam.primus or false) pkgs.primus ; multiPkgs = pkgs: @@ -58,6 +59,8 @@ buildFHSUserEnv { pkgs.pulseaudio pkgs.flashplayer + + pkgs.gst_all_1.gst-plugins-ugly # "Audiosurf 2" needs this ]; extraBuildCommandsMulti = '' @@ -66,8 +69,8 @@ buildFHSUserEnv { ''; profile = '' - export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64 - export PATH=$PATH:/usr/bin:/usr/sbin + # Ugly workaround for https://github.com/ValveSoftware/steam-for-linux/issues/3504 + export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so ''; runScript = "exec steam"; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index a687270bfc9c..0478e208da22 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ''} ''; - meta = { + meta = with stdenv.lib; { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = licenses.unfree; + maintainers = with maintainers; [ jagajaga ]; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index d9de1254915a..2c41a11ab575 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/stuntrally/stuntrally.git; rev = "refs/tags/${version}"; - sha256 = "0zyzkac11dv9c1rxknydkisg2iw1rmi72psidl7jmq8v3rrqxk4r"; + sha256 = "1lsh7z7sjfwpdybg6vbwqx1zxsgbfp2n60n7xl33v225p32qh1qf"; }; tracks = fetchgit { url = git://github.com/stuntrally/tracks.git; rev = "refs/tags/${version}"; - sha256 = "1j237dbhd1ik5mj8whbvlff5da9vzzgiskcj5nzfpw1vb1jpdjvd"; + sha256 = "1614j6q1d2f69l58kkqndndvf6svcghhw8pzc2s1plf6k87h67mg"; }; preConfigure = '' @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/vdrift-ogre/; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 9e180e7df257..3aa23ffd0e8c 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.75"; + name = "tibia-10.76"; src = fetchurl { - url = http://static.tibia.com/download/tibia1075.tgz; - sha256 = "16g4spc8lh7sq3lbnjiprj8d2xd9r9mxy4yz2fnfzj6pa4bx3182"; + url = http://static.tibia.com/download/tibia1076.tgz; + sha256 = "1kzsbrravk8lmpirghhsynnygmcig8jkbw6qfzk1fkabi1d02yrv"; }; shell = stdenv.shell; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index c7144b96a3d7..6b4c6e68bacc 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl }: +{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.2.018"; + version = "4.2.023"; srcs = [ (fetchurl { - url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full018.zip"; - sha256 = "10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83"; + url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full023.zip"; + sha256 = "e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.018.tar.gz"; - sha256 = "c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.023.tar.gz"; + sha256 = "03zrrx5b96c1srf2p24ca7zygq84byvrmcgh42d8bh5ds579ziqp"; }) ]; - buildInputs = [ unzip SDL mesa openal curl ]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.018"; + buildInputs = [ unzip SDL mesa openal curl libXxf86vm]; + sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.023"; configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index ab0c0dc25e48..3d111ec59428 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - meta = { + meta = with stdenv.lib; { description = "Samsung's Linux drivers; includes binaries without source code"; homepage = "http://www.samsung.com/"; - license = "samsung"; # Binary-only + license = licenses.unfree; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e161fcd181c5..1bc9f86766fd 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,11 +4,11 @@ , pulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150201"; + name = "dolphin-emu-20150302"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "3c475b91ea5c4baa13b1339c3d2921938e8a3be9"; - sha256 = "1az8cv5y2hccvnp719rpynwglamf04zck1ic796c126xp286i5ki"; + rev = "cd8c37bc0792a492b59976eba10a3e54e0ea2842"; + sha256 = "06cb89c97w86ffn2nls0jb69macd5lqz930fjyjjahk9njx164fv"; fetchSubmodules = false; }; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index f2aa1e06ec80..fc64caf1053d 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"; }; - enableParallelBuilding = true; + # nondeterministic failures when creating directories + enableParallelBuilding = false; buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper libarchive libao unzip xdg_utils gsettings_desktop_schemas ]; diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index db1082f7989b..f8a32cb8ff40 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,27 +7,27 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; let - version = "1.7.36"; + version = "1.7.39"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1"; + sha256 = "0p1kj61hkfyhbxdfgj3z3hlxi5nvcbdknkjqiicbabkpzq3v1zva"; }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi"; - sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f"; + url = "mirror://sourceforge/wine/wine_gecko-2.36-x86.msi"; + sha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; }; gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi"; - sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7"; + url = "mirror://sourceforge/wine/wine_gecko-2.36-x86_64.msi"; + sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh"; }; mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi"; - sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr"; + url = "mirror://sourceforge/wine/wine-mono-4.5.4.msi"; + sha256 = "1wnn273f232141x9x0sahg4w499x0g2p0xphxmwm5wh1xrzyvg10"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index b9b29cdabe3b..ce7813b237cb 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -141,7 +141,7 @@ mkDerivation { } export PATH - echo $name loaded + echo $name loaded >&2 trap nix_cleanup EXIT EOF diff --git a/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix new file mode 100644 index 000000000000..de0060032f74 --- /dev/null +++ b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "2.2.3"; + name = "numix-gtk-theme-${version}"; + + src = fetchurl { + url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz"; + sha256 = "b0acc2d81300b898403766456d3406304553cc7016677381f3179dbeb1192a2d"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/themes/Numix + cp -dr --no-preserve='ownership' {LICENSE,CREDITS,index.theme,gtk-2.0,gtk-3.0,metacity-1,openbox-3,unity,xfce-notify-4.0,xfwm4} $out/share/themes/Numix/ + ''; + + meta = { + description = "Numix GTK theme"; + homepage = https://numixproject.org; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2b594299c285..6378ffdafe3c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -487,11 +487,11 @@ rec { }; wakatime = buildVimPlugin { - name = "wakatime-3.0.7"; + name = "wakatime-3.0.8"; src = fetchFromGitHub { - sha256 = "1kn50fz9hnimzic640blmb5wi64vkcn45g15i4ckfzivza4jyc73"; - rev = "30ce2e30670d80ec1ef033ae4415c1f6ea46f18f"; + sha256 = "0sb3vgwnn8x1g50qlcimhw0rnkiw26rmk1d3j2a5bipx69xcl9pb"; + rev = "d6816d3766b31dd247a68023b04913b4a15fe565"; repo = "vim-wakatime"; owner = "wakatime"; }; @@ -655,11 +655,11 @@ rec { }; "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-02-10"; + name = "Gist"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "4d64b05bcbfdc8c22f37ff29776626be48251af7"; - sha256 = "16101ab3802bbeba7e83706446474b61fbb6312270161cdb669780b54c3c04cf"; + rev = "8a567b823163d349406dffaff4519e0bac10eade"; + sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88"; }; dependencies = []; @@ -675,111 +675,111 @@ rec { }; "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2013-11-26"; + name = "Hoogle"; src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "e5a95db90efdb93cd06c0c6946c24ae3e401800dd0da344cc83171ff1bc696f2"; + sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; }; dependencies = []; }; "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized-2011-05-09"; + name = "Solarized"; src = fetchgit { url = "git://github.com/altercation/vim-colors-solarized"; rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "1de517cfc66707e44c2d4d72080ee949cfb963a087e9e52c62cc4394f13ed597"; + sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; }; dependencies = []; }; "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2015-02-15"; + name = "Supertab"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; - sha256 = "9f610d2acd57537f6fa2bfafb9300fe7d42afedf30bc4bb3fb02974743f9ab27"; + rev = "454c06e25680799b6f408622d6bfbaf920ace825"; + sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01"; }; dependencies = []; }; "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-02-17"; + name = "Syntastic"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "47821840200cd8e14e99001caac602a37cdf8d5c"; - sha256 = "becf0b07d25d9514ac7c5328d4e3deeab5731792887c8334571b72c3871a50ee"; + rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52"; + sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723"; }; dependencies = []; }; "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular-2013-05-16"; + name = "Tabular"; src = fetchgit { url = "git://github.com/godlygeek/tabular"; rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "dbfbeaf833ecc87c7f505fe25c79110f10535d81065fd4a30853565d288448d6"; + sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; }; dependencies = []; }; "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2015-02-16"; + name = "Tagbar"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "a284cd009104b5c9b64a378cd98fdf4993c1689e"; - sha256 = "c6458537ea211a77a8fb6f85b4d7eac1fec6714fd60398ebae00647599397922"; + rev = "00dfa82b00e734b453153564efeec933c48087f0"; + sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635"; }; dependencies = []; }; "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2014-07-08"; + name = "The_NERD_Commenter"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; - sha256 = "7624da2591153946e0e9d0637c31b551bc1f87cea8441d725bdd01b0cd972588"; + sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; }; dependencies = []; }; "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2014-11-20"; + name = "The_NERD_tree"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921"; - sha256 = "75aa60c361c66c0bae986fc6a7111ccf529ab74409a9e11355e4c2fa065e1afc"; + sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0"; }; dependencies = []; }; "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-02-14"; + name = "UltiSnips"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "56ac14840f47521be9b61fb5ae72930f35d5d8a9"; - sha256 = "a0766d809a0a858e3393429d67e68e7a85d67519e143a64e8ddd3f7fa2418ca6"; + rev = "d693259abb2e28f70abf760d395fcf526d5272ee"; + sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600"; }; dependencies = []; }; "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2015-01-09"; + name = "VimOutliner"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; rev = "7c995f973c54b0d026137615af28059890edb197"; - sha256 = "c48acd2d4939ece0de7a2bae42f04e2f247a087947b66da86b4fb96fb32330d9"; + sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5"; }; dependencies = []; }; "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2014-10-27"; + name = "WebAPI"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; rev = "a7789abffe936db56e3152e23733847f94755753"; - sha256 = "a5e9560b71b9e3c242c8623972f11a9298708e99f90b4f919610b0959417a767"; + sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; }; dependencies = []; @@ -800,63 +800,63 @@ rec { }; "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2014-11-10"; + name = "commentary"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; - sha256 = "7f92a27f16f8a3a9285b14ca9dd9c7deb6cc7391075024446e5be395cca18c1e"; + sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d"; }; dependencies = []; }; "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-2013-07-29"; + name = "ctrlp"; src = fetchgit { url = "git://github.com/kien/ctrlp.vim"; rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; - sha256 = "3736b2f152df20be0a0d5ed6a39929b2df1ed9bbe98f68d80db657c00f0dcb30"; + sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; }; dependencies = []; }; "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite-2015-01-26"; + name = "extradite"; src = fetchgit { url = "git://github.com/int3/vim-extradite"; rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; - sha256 = "0f03c331bfa61292087ec403e5a9083f3dc03988b6d5cb6704934d2e6c646fdb"; + sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714"; }; dependencies = []; }; "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-02-08"; + name = "fugitive"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "eb8eb1850a47671a8a3639feab8b2a50577e4913"; - sha256 = "d589245c1a9490a7c370ea80492a606fa207fac268a3c1bd5151fc3f326d3514"; + rev = "933f6a1e1df549564062f936bd1c836d28cf1676"; + sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908"; }; dependencies = []; }; "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2014-10-19"; + name = "ghcmod"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; - sha256 = "b5a50bc1bcc0777def41cf7f18557f6674f709cbf22577ebe845ec1bb8e39e9d"; + sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; }; dependencies = []; }; "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "github-MarcWeber-vim-addon-vim2nix-2015-02-08"; + name = "github-MarcWeber-vim-addon-vim2nix"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-vim2nix"; - rev = "5507ee4db7599873d72fab035c752dea245e2cd4"; - sha256 = "02094bd066f930469a2acebe93f960a4b57ee1e302fe2e80a87ef9e607791295"; - }; - dependencies = ["vim-addon-manager"]; + rev = "5507ee4db7599873d72fab035c752dea245e2cd4"; + sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx"; + }; + dependencies = ["vim-addon-manager"]; }; "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -881,401 +881,400 @@ rec { ''; }; "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2014-11-06"; + name = "pathogen"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; - sha256 = "9ccb1d234d9eb8bccc3a50ff6fadcc925644a0e17cd4444623d22843c5d82e80"; + sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7"; }; dependencies = []; }; "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus-2011-09-02"; + name = "quickfixstatus"; src = fetchgit { url = "git://github.com/dannyob/quickfixstatus"; rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "a7f15f5404bf0719c5c1eab9c117c3ca4302b0232f959b509c364f3869a2c9fd"; + sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; }; dependencies = []; }; "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses-2013-03-04"; + name = "rainbow_parentheses"; src = fetchgit { url = "git://github.com/kien/rainbow_parentheses.vim"; rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "6f467a4de21e26e7d50a74d9fd1503ea67d94bdd93fde19ed5da42552487957b"; + sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; }; dependencies = []; }; "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-2015-01-29"; + name = "rust"; src = fetchgit { url = "git://github.com/wting/rust.vim"; rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; - sha256 = "f7335d4265db4d0e030b6d1f23818710e8b80be4aeb42ebb60396d5327c6f669"; + sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee"; }; dependencies = []; }; "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2014-11-24"; + name = "sensible"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; rev = "b30dcf387af977acfa21732592bfca05598b2188"; - sha256 = "8b2b22cd0dc766d4ecc3fc9f9ad21412b033ff02b6a3047a768da82773bb6bfe"; + sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f"; }; dependencies = []; - }; "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2015-02-04"; + name = "snipmate"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5"; - sha256 = "7b4a730b557d4f0d117e8ad7529ff38f81d29986db6d4418c0ea39ff3c827e65"; + sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap-2012-09-19"; + name = "sourcemap"; src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "95665edd31b4840728f6e1492ccf143d52079b2c1ce11407cf9936b03c9df23c"; + sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; }; dependencies = []; }; "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2015-02-08"; + name = "surround"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "fd75eb2cb2ffe85a457445cb152d5a6c7acda140"; - sha256 = "3322993b1c0aec299525d5d8120433b72a03e70cee573289639ed5675e33974e"; + rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd"; + sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269"; }; dependencies = []; }; "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2015-01-11"; + name = "table-mode"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9"; - sha256 = "610bbcad80fc153e2d68745ad767205d906c08055e884b93b98a0e2aa947d4dd"; + sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c"; }; dependencies = []; }; "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2015-01-15"; + name = "tlib"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; rev = "9e629767e5a91ede057d07f8754326e68c92a692"; - sha256 = "2c3c039175494fb3b2f5002194f3ee9f50dafc65c80bc5f3a07d9911aea52208"; + sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6"; }; dependencies = []; }; "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2015-01-29"; + name = "undotree"; src = fetchgit { url = "git://github.com/mbbill/undotree"; rev = "42000e2a7140843030f517de9d4923dd5fa40458"; - sha256 = "8a340bce79409b1f6c88c8c9310fd9d9eb97bba23c5208f66715e5a008cb0cba"; + sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293"; }; dependencies = []; }; "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2014-09-22"; + name = "vim-addon-actions"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; rev = "a5d20500fb8812958540cf17862bd73e7af64936"; - sha256 = "4a6d9e25b69cf458980e0b2acabc5b87e1e0d763f357fbeaee1e859b2f3d9069"; + sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2013-10-18"; + name = "vim-addon-async"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; - sha256 = "ff9c7ce533dd2d0c2cabcd507f22c27b8507b03f58dfe30158304dca77133730"; + sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; }; dependencies = ["vim-addon-signs"]; }; "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd-2015-01-05"; + name = "vim-addon-background-cmd"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-background-cmd"; rev = "e99076519139b959edce0581b0f31207a5ec7c64"; - sha256 = "54872b6f636994a3057c0fcda3e6e540684205cf2d08a41778bcfbdd6d0a57a2"; + sha256 = "524795221ae727635fe52ead47dff452d2dd48900917da609426ea399a2eceeb"; }; dependencies = ["vim-addon-mw-utils"]; }; "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting-2013-06-10"; + name = "vim-addon-commenting"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-commenting"; rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "f0ce6072dd607c7fe3a337903d49d19bf90bc59d302977cc30dd26696cd723a9"; + sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; }; dependencies = []; }; "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion-2015-02-10"; + name = "vim-addon-completion"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "177738cbe3ab6083517e211c8aa8e6235beafb518a7e8b87922a675dbbed5b5b"; + rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; + sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; }; dependencies = ["tlib"]; }; "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats-2014-11-05"; + name = "vim-addon-errorformats"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-errorformats"; rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "59a7abe3d6be8e579737c7c614a5cb148df14cc1dcea3d711acb115190cb31b3"; + sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; }; dependencies = []; }; "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor-2012-01-11"; + name = "vim-addon-goto-thing-at-cursor"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "a91752a43042086448246777cd9dc2fa7f5f8f54ef052148acfa51c05f58281e"; + sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; }; dependencies = ["tlib"]; }; "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc-2014-02-14"; + name = "vim-addon-local-vimrc"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; - sha256 = "b496281c8b0dd4c7aada20789a6a3a6b6d1d2741d19b0a690d09bf121d0f40d8"; + sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; }; dependencies = []; }; "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2014-12-03"; + name = "vim-addon-manager"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07"; - sha256 = "6cff7636e5939931a1f152fe635319028fb92d88483789d737e89ef2d73ea16f"; + sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3"; }; dependencies = []; }; "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru-2013-08-08"; + name = "vim-addon-mru"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mru"; rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "b00f609e5e043171b2be729bbc7b5094678fdfe7de97a1b34bf9855bec7d75f8"; + sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; }; dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; }; "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils-2012-11-05"; + name = "vim-addon-mw-utils"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mw-utils"; rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; - sha256 = "7ba038830b6f6c60a93d3dc8e60755a3728ddc8414e9d8c0089d5b530eb848e7"; + sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; }; dependencies = []; }; "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2014-11-05"; + name = "vim-addon-nix"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; - sha256 = "db4c397ae56f81f600e67549c76a879901d6084246b34751526a9e39f3f720c1"; + sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; }; dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other-2014-07-15"; + name = "vim-addon-other"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-other"; rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "ec0b80acd31bac66bb1fc72bfc960f2a89b156d6ecd0a620c143bde8fbfe1e21"; + sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; }; dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual-2015-01-01"; + name = "vim-addon-php-manual"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "d127d274bd37c1ad4deae4e988403f987cb11c0a8d7f7d729bf1fcf282a33add"; + sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd"; }; dependencies = []; }; "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs-2013-04-19"; + name = "vim-addon-signs"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-signs"; rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "27035d6d8eace02be4a5585100372a709d7a582ea66b56a1c282ee5041e1fc70"; + sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; }; dependencies = []; }; "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2014-01-18"; + name = "vim-addon-sql"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "0d5cb4e6fa829a39cf8ba537a463aece768619ce8bcbb8693a4c348fa64541ca"; + sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; }; dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; }; "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2013-07-12"; + name = "vim-addon-syntax-checker"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; - sha256 = "530f1d69e8ebae201c07b38e50ebfadbae60649d4a73977c124cd3f1378d659f"; + sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer-2012-01-13"; + name = "vim-addon-toggle-buffer"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "c258c941e75f09474d27ebeb859438565e3e237873fa71d1abfc75f8dfaee963"; + sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug-2014-08-29"; + name = "vim-addon-xdebug"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-xdebug"; rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "ebf61896e9b32eeeb0553124cc0011aee7d779307a32771c3ecb7181951d479a"; + sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; }; dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2015-02-13"; + name = "vim-airline"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "ca925efdbfe88b03597efc7caee4ee8762a2cfe0"; - sha256 = "47def66ab083fb847c8ee40e0a23bf6d69cdcc7919c869089542381c8319c972"; + rev = "446397e006d8cba9e1ac38d8c656ba39218c139b"; + sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119"; }; dependencies = []; }; "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2014-10-10"; + name = "vim-coffee-script"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; rev = "827e4a38b07479433b619091469a7495a392df8a"; - sha256 = "ca93ff77aab2c5f0b855afa60b26fce355f74684e8de27e76d2d22eda3e75904"; + sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; }; dependencies = []; }; "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2014-12-14"; + name = "vim-easy-align"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; rev = "c62d124be614de65922b15d468c4049d1eee9353"; - sha256 = "733dbf6c4d1a29957451d64c7cf431f877e5abefcee19017742b4d5e8d60165b"; + sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee"; }; dependencies = []; }; "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-02-11"; + name = "vim-gitgutter"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "061258e04476c0f9f653a969e640bf03b3659594"; - sha256 = "535643c8e958d7c020ef0c39aadb5c6a7f3bad8895213bc0f6774c12e2627ac3"; + rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd"; + sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d"; }; dependencies = []; }; "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script-2013-12-27"; + name = "vim-iced-coffee-script"; src = fetchgit { url = "git://github.com/noc7c9/vim-iced-coffee-script"; rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "631786c89ebcd630788f2c7201b3f2503e0106eef4e3d9d808e91946f7778c08"; + sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; }; dependencies = []; }; "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2013-11-25"; + name = "vim-latex-live-preview"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; - sha256 = "c129e9360f0c3c616a26ea74cfde03c70cfae16f9e1eeb89cfbcfc16beb3b5b9"; + sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; }; dependencies = []; }; "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2015-01-12"; + name = "vim-signature"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45"; - sha256 = "606e2b1dc19c0e9c7301e0c9a6ff07cd7cefe057f3a5ac17536735dcb1a03e06"; + sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675"; }; dependencies = []; }; "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-02-17"; + name = "vim-snippets"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "93b4de1299916de0d93d70629f86ff0fa9735061"; - sha256 = "82a909f180ea11959d20f838a2716ff188bdec9f5ea2406ccd4fa27388462cf6"; + rev = "27906a3754f0ac292d0915a4075bff22db53fa3e"; + sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6"; }; dependencies = []; }; "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs-2014-04-16"; + name = "vim2hs"; src = fetchgit { url = "git://github.com/dag/vim2hs"; rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "1c8120a530a29047a8034dc7b381a53f41b0d827d90ea496736b97b65a6b01f5"; + sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; }; dependencies = []; }; "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2014-07-18"; + name = "vundle"; src = fetchgit { url = "git://github.com/gmarik/vundle"; rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "95b9b4b8bb76fa60f2a26ef48c3801385051bcb5b2f591d548dc45284b3ab79e"; + sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; }; dependencies = []; diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix new file mode 100644 index 000000000000..ab81ece5f71c --- /dev/null +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "alsa-firmware-1.0.29"; + + src = fetchurl { + urls = [ + "ftp://ftp.alsa-project.org/pub/firmware/${name}.tar.bz2" + "http://alsa.cybermirror.org/firmware/${name}.tar.bz2" + ]; + sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw"; + }; + + configureFlags = '' + --with-hotplug-dir=$(out)/lib/firmware + ''; + + dontStrip = true; + + postInstall = '' + # These are lifted from the Arch PKGBUILD + # remove files which conflicts with linux-firmware + rm -rf $out/lib/firmware/{ct{efx,speq}.bin,ess,korg,sb16,yamaha} + # remove broken symlinks (broken upstream) + rm -rf $out/lib/firmware/turtlebeach + # remove empty dir + rm -rf $out/bin + ''; + + meta = { + homepage = http://www.alsa-project.org/main/index.php/Main_Page; + description = "Soundcard firmwares from the alsa project"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix new file mode 100644 index 000000000000..788297ba3396 --- /dev/null +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -0,0 +1,183 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, perl, which +, glibc, flex, bison, python27, swig, dbus, pam +}: + +let + apparmor-series = "2.9"; + apparmor-patchver = "1"; + apparmor-version = "${apparmor-series}.${apparmor-patchver}"; + + apparmor-meta = component: with stdenv.lib; { + homepage = http://apparmor.net/; + description = "Linux application security system - ${component}"; + license = licenses.gpl2; + maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; + platforms = platforms.linux; + }; + + apparmor-sources = fetchurl { + url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; + sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; + }; + + prePatchCommon = '' + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" + ''; + + libapparmor = stdenv.mkDerivation { + name = "libapparmor-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + autoconf + automake + bison + flex + dbus # requires patch to dbus ... + glibc + libtool + perl + pkgconfig + python27 + swig + which + ]; + + prePatch = prePatchCommon + '' + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + ''; + + buildPhase = '' + cd ./libraries/libapparmor + ./autogen.sh + ./configure --prefix="$out" --with-python + make + ''; + + installPhase = '' + make install + ''; + + meta = apparmor-meta "library"; + }; + + apparmor-utils = stdenv.mkDerivation { + name = "apparmor-utils-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + python27 + libapparmor + which + ]; + + prePatch = prePatchCommon; + + buildPhase = '' + cd ./utils + make LANGS="" + ''; + + installPhase = '' + make install LANGS="" DESTDIR="$out" BINDIR="$out/bin" VIM_INSTALL_PATH="$out/share" PYPREFIX="" + ''; + + meta = apparmor-meta "user-land utilities"; + }; + + apparmor-parser = stdenv.mkDerivation { + name = "apparmor-parser-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + bison + flex + which + ]; + + prePatch = prePatchCommon + '' + substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" + substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" + substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ## techdoc.pdf still doesn't build ... + substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" + ''; + + buildPhase = '' + cd ./parser + make LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include + ''; + + installPhase = '' + make install LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include DESTDIR="$out" DISTRO="unknown" + ''; + + meta = apparmor-meta "rule parser"; + }; + + apparmor-pam = stdenv.mkDerivation { + name = "apparmor-pam-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + pam + pkgconfig + which + ]; + + buildPhase = '' + cd ./changehat/pam_apparmor + make USE_SYSTEM=1 + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "PAM service"; + }; + + apparmor-profiles = stdenv.mkDerivation { + name = "apparmor-profiles-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ which ]; + + buildPhase = '' + cd ./profiles + make + ''; + + installPhase = '' + make install DESTDIR="$out" EXTRAS_DEST="$out/share/apparmor/extra-profiles" + ''; + + meta = apparmor-meta "profiles"; + }; + + apparmor-kernel-patches = stdenv.mkDerivation { + name = "apparmor-kernel-patches-${apparmor-version}"; + src = apparmor-sources; + + phases = ''unpackPhase installPhase''; + + installPhase = '' + mkdir "$out" + cp -R ./kernel-patches "$out" + ''; + + meta = apparmor-meta "kernel patches"; + }; + +in + +{ + inherit libapparmor apparmor-utils apparmor-parser apparmor-pam + apparmor-profiles apparmor-kernel-patches; +} diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 16eb933e176c..e2bcf9837e7a 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version="2.1.1"; + version = "3.0"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256="0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva"; + sha256 = "0afva1vh3lwhw9bryh41dxg82kfnxj1ifa91p3gjwffc2fpqmnvl"; }; buildInputs = [ glib pkgconfig gperf utillinux diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index c2d95c3d5354..6e1a4ac025c6 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.20"; + version="0.9.22"; name="${baseName}-${version}"; - hash="1sjahmpjd6zmn27xp5xl683xm3353rp3094sgl2brq6477ffbi6y"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.20-rc1.tar.bz2"; - sha256="1sjahmpjd6zmn27xp5xl683xm3353rp3094sgl2brq6477ffbi6y"; + hash="1yyh1vjhpdl307bj1ri7jskq4hpq1ifcqfz55i02w9faiz9kkmc5"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.22-rc1.tar.bz2"; + sha256="1yyh1vjhpdl307bj1ri7jskq4hpq1ifcqfz55i02w9faiz9kkmc5"; }; buildInputs = [ ]; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index b8a67b87a804..be3d6a997b3a 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,16 +1,12 @@ { stdenv, fetchgit }: -let - version = "17657c35869baa999b454e868cd3d5a7e1656425"; - shortVersion = stdenv.lib.substring 0 7 version; -in stdenv.mkDerivation { - name = "firmware-linux-nonfree-${shortVersion}"; + name = "firmware-linux-nonfree-2015-03-09"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = version; - sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb"; + rev = "020e534ec90106d42a890cd9d090b24e3d158c53"; + sha256 = "101mpps0jcv2dd4jh1w3j4h78d4iv8n8r1cnf4br2vg66zl3zg9v"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 404d785146c3..d34a028220c9 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gradm-${version}"; - version = "3.0-201408301734"; + version = "3.1-201503211320"; src = fetchurl { url = "http://grsecurity.net/stable/${name}.tar.gz"; - sha256 = "171i1jyw82dnv2fi4dnh40dw1wa5hrllnpjf181cafnzxjpyb45i"; + sha256 = "17yd307jqva8jqib2xr3i9kmp58f2cb4jd7an5rbk5zr1k48ap9j"; }; buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 2355fec1b529..d2413be6f5ab 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gzip, bzip2 }: +{ stdenv, fetchurl, autoconf, automake, libtool, gzip, bzip2 }: stdenv.mkDerivation rec { name = "kbd-1.15.3"; @@ -14,10 +14,24 @@ stdenv.mkDerivation rec { sha256 = "0e859211cfe16a18a3b9cbf2ca3e280a23a79b4e40b60d8d01d0fde7336b6d50"; }; + neoSrc = fetchurl { + name = "neo.map"; + url = "https://svn.neo-layout.org/linux/console/neo.map?r=2455"; + sha256 = "1wlgp09wq84hml60hi4ls6d4zna7vhycyg40iipyh1279i91hsx7"; + }; + configureFlags = "--disable-nls"; + preConfigure = '' + sh autogen.sh + ''; + patchPhase = '' + mkdir -p data/keymaps/i386/neo + cat "$neoSrc" > data/keymaps/i386/neo/neo.map + sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in + # Add the dvp keyboard in the dvorak folder ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map @@ -33,10 +47,13 @@ stdenv.mkDerivation rec { ''} ''; + buildInputs = [ autoconf automake libtool ]; + makeFlags = "setowner= "; meta = { homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; description = "Linux keyboard utilities and keyboard maps"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3e92e9c3fa6a..e6d45af7c599 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -3,31 +3,35 @@ with stdenv.lib; '' - # Power management and debugging. + # Debugging. DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - ${optionalString (versionOlder version "3.19") '' - PM_RUNTIME y - ''} - ${optionalString (versionAtLeast version "3.10") '' - X86_INTEL_PSTATE y - ''} TIMER_STATS y - ${optionalString (versionOlder version "3.10") '' - USB_SUSPEND y - ''} BACKTRACE_SELF_TEST n CPU_NOTIFIER_ERROR_INJECT? n DEBUG_DEVRES n DEBUG_NX_TEST n DEBUG_STACK_USAGE n - ${optionalString (!(features.grsecurity or true)) '' + ${optionalString (!(features.grsecurity or false)) '' DEBUG_STACKOVERFLOW n ''} RCU_TORTURE_TEST n SCHEDSTATS n DETECT_HUNG_TASK y + # Power management. + ${optionalString (versionOlder version "3.19") '' + PM_RUNTIME y + ''} + PM_ADVANCED_DEBUG y + ${optionalString (versionAtLeast version "3.10") '' + X86_INTEL_PSTATE y + ''} + INTEL_IDLE y + CPU_FREQ_DEFAULT_GOV_PERFORMANCE y + ${optionalString (versionOlder version "3.10") '' + USB_SUSPEND y + ''} + # Support drivers that need external firmware. STANDALONE n @@ -49,7 +53,6 @@ with stdenv.lib; NUMA? y # Disable some expensive (?) features. - KPROBES n PM_TRACE_RTC n # Enable various subsystems. @@ -151,7 +154,9 @@ with stdenv.lib; EXT2_FS_XATTR y EXT2_FS_POSIX_ACL y EXT2_FS_SECURITY y - EXT2_FS_XIP y # Ext2 execute in place support + ${optionalString (versionOlder version "4.0") '' + EXT2_FS_XIP y # Ext2 execute in place support + ''} EXT3_FS_POSIX_ACL y EXT3_FS_SECURITY y EXT4_FS_POSIX_ACL y @@ -166,7 +171,6 @@ with stdenv.lib; XFS_RT? y # XFS Realtime subvolume support OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y UBIFS_FS_ADVANCED_COMPR? y ${optionalString (versionAtLeast version "3.6") '' NFS_SWAP y @@ -189,6 +193,17 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.14") '' CEPH_FS_POSIX_ACL y ''} + ${optionalString (versionAtLeast version "3.13") '' + SQUASHFS_FILE_DIRECT y + SQUASHFS_DECOMP_MULTI_PERCPU y + ''} + SQUASHFS_XATTR y + SQUASHFS_ZLIB y + SQUASHFS_LZO y + SQUASHFS_XZ y + ${optionalString (versionAtLeast version "3.19") '' + SQUASHFS_LZ4 y + ''} # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -224,7 +239,9 @@ with stdenv.lib; BT_HCIUART_BCSP? y BT_HCIUART_H4? y # UART (H4) protocol support BT_HCIUART_LL? y - BT_RFCOMM_TTY? y # RFCOMM TTY support + ${optionalString (versionAtLeast version "3.4") '' + BT_RFCOMM_TTY? y # RFCOMM TTY support + ''} CRASH_DUMP? n ${optionalString (versionOlder version "3.1") '' DMAR? n # experimental @@ -258,12 +275,15 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.6") '' RC_DEVICES? y # Enable IR devices ''} + RT2800USB_RT55XX y SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG? n + ${optionalString (versionOlder version "3.15") '' + USB_DEBUG? n + ''} USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y @@ -294,9 +314,16 @@ with stdenv.lib; # Tracing. FTRACE y + KPROBES y FUNCTION_TRACER y FTRACE_SYSCALLS y SCHED_TRACER y + STACK_TRACER y + ${optionalString (versionAtLeast version "3.10") '' + UPROBE_EVENT y + ''} + FUNCTION_PROFILER y + RING_BUFFER_BENCHMARK n # Devtmpfs support. DEVTMPFS y diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 87ac82a41946..31fe3081ab24 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.69"; + version = "3.10.72"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "14m4npds1f0whsd1nhnpl3bsscck9kg0r8bvrha4bdlhc8fjzrrc"; + sha256 = "17qfy5hmd2cn5wfk4mfvv9ygn958a4j75lsya9xdjrw10in1a22a"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index acfe74828e72..951b55c2f35a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.37"; + version = "3.12.39"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0p7d6qdk7327yzfxzlxbxizrf7dm8vxbc3spm2ai4q278wxbi8jx"; + sha256 = "0svd2rnkrzpmnrv5qd5vfz4wkff6973s68zg5a1blmjs4p5asvl6"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 156c5cced8f7..a1340335983e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.33"; + version = "3.14.36"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07wqh93z5hix5aga2ns8fnkz350i2sx2l7gzr7n6136gbcb5lxb6"; + sha256 = "03pl303z3vvldc3hamlrq77mcy66nsqdfk7yi43nzyrnmrby3l0r"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 2dcde824aa6d..154c9633cdb6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.7"; - # Remember to update grsecurity! + version = "3.18.9"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "08gl48x9fim8b8icsardp18vckzmi411kwkaswlznmr67gfz89yz"; + sha256 = "00cm64s17d03rlzkgqs0fq91vm95csfa2xw4zhp7y0md9fd73dxi"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 1706a5f05c45..2a34202c8950 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19"; - modDirVersion = "3.19.0"; + version = "3.19.2"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy"; + sha256 = "0b8bfpfpyrpccb8v4nld0a0siricg8f3awmhz8wn4kwdvhhf83hc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 994d14ecae58..54cf9bc9324a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.66"; + version = "3.2.68"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "09l0rfv10c5kzlgfhi339ly496f6j9ichq3arpvkb3fivjkxcm45"; + sha256 = "0yz3k3qqr13r6fa2f8i83rryiawy4rrd7qk2zx6jxq6byfd31ba2"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 6d28c376078d..67a51dc767df 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,15 +2,17 @@ let - rev = "7849605f5a"; + rev = "fe4a83540ec73dfc298f16f027277355470ea9a0"; in import ./generic.nix (args // rec { - version = "3.6.y-${rev}"; + version = "3.18.y-${rev}"; + + modDirVersion = "3.18.7-v7"; src = fetchurl { url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; name = "linux-raspberrypi-${version}.tar.gz"; - sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl"; + sha256 = "05gq40f038hxjqd3sdb1914g2bzw533dyxy59sgdpybs8801x2vb"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d9d16f9ac770..1c2a3edf298b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19-rc7"; - modDirVersion = "3.19.0-rc7"; - extraMeta.branch = "3.19"; + version = "4.0-rc4"; + modDirVersion = "4.0.0-rc4"; + extraMeta.branch = "4.0"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "007xjngbyvdx127rkrzxs23kxcw2z54gzad9954iwhphqw0kpq9x"; + url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; + sha256 = "01jn3mpxd1gly79psgh27l9ad24i07z9an0mw93pbs16nnncv0dn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6d9baed7f2dd..ea29c7f9e0c8 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -118,9 +118,12 @@ let # Some image types need special install targets (e.g. uImage is installed with make uinstall) installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else "install") ]; - postInstall = optionalString installsFirmware '' + postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware - '' + (if isModular then '' + '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' + make $makeFlags "''${makeFlagsArray[@]}" dtbs + cp $buildRoot/arch/$karch/boot/dts/*dtb $out + '' else "") + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" unlink $out/lib/modules/${modDirVersion}/build @@ -222,6 +225,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe "ARCH=${stdenv.platform.kernelArch}" ]; + karch = stdenv.platform.kernelArch; + crossAttrs = let cp = stdenv.cross.platform; in (drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // { makeFlags = commonMakeFlags ++ [ @@ -229,6 +234,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe "CROSS_COMPILE=$(crossConfig)-" ]; + karch = cp.kernelArch; + # !!! uboot has messed up cross-compiling, nativeDrv builds arm tools on x86, # crossDrv builds x86 tools on x86 (but arm uboot). If this is fixed, uboot # can just go into buildInputs (but not nativeBuildInputs since cp.uboot diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 72ca1a0bb315..a2473e3f4c8d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, apparmor }: +{ stdenv, fetchurl }: let @@ -18,7 +18,7 @@ let }; }; - grsecPatch = { grversion ? "3.0", kversion, revision, branch, sha256 }: + grsecPatch = { grversion ? "3.1", kversion, revision, branch, sha256 }: { name = "grsecurity-${grversion}-${kversion}"; inherit grversion kversion revision; patch = fetchurl { @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.33"; - revision = "201502200812"; + { kversion = "3.14.36"; + revision = "201503182218"; branch = "stable"; - sha256 = "1dydrphgz8sfjf7w8b0kqai9k1dld6jv6frhqs6gqjj06wbg1rwd"; + sha256 = "14njc3xih3v38fnh7wrx7xdapqi67032qa6gp2qzhp41f5q7i4i8"; }; grsecurity_unstable = grsecPatch - { kversion = "3.18.7"; - revision = "201502200813"; + { kversion = "3.19.2"; + revision = "201503201903"; branch = "test"; - sha256 = "1svvy0sip6p3h8iqlw0rh3lnxqziwz9fw8znyq1rw5cia89dx4c8"; + sha256 = "0ha4hvf2c9im9cyq9sxdbdx165i6ngywf46899aq3giyw74gnpf3"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index be375ea310f1..efd3515ff240 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , withGtk ? false, gtk ? null }: with lib; @@ -21,8 +21,9 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang + # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; - buildInputs = [ elfutils python perl newt slang pkgconfig] ++ + buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++ stdenv.lib.optional withGtk gtk; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 6fa59e4ae5fb..612291e62e42 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "lockdep-${version}"; - version = "3.17"; - fullver = "3.17.0"; # The library ver is 3.17.0, but the kernel is 3.17 + version = "3.19.1"; + fullver = "3.19.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm"; + sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi"; }; preConfigure = "cd tools/lib/lockdep"; diff --git a/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch b/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch deleted file mode 100644 index 2c9cb9835d1c..000000000000 --- a/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6f0af2643c40b57280796eaa4fe60ce4f678b6dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= <andre.goddard@gmail.com> -Date: Thu, 13 Nov 2014 21:33:02 -0800 -Subject: [PATCH] Fix compilation on Linux kernel >= 3.18.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since kernel commit 8a9522d2fe compilation fails as kvm_age_page -tracepoint had its signature changed, so update it accordingly. - -Tested pointing to kernels: - git reset --hard v3.17; make init/version.o - git reset --hard v3.18-rc1; make init/version.o - -Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/kvm.h | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - mode change 100644 => 100755 instrumentation/events/lttng-module/kvm.h - -diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h -old mode 100644 -new mode 100755 -index c0d42e2..4f95095 ---- a/instrumentation/events/lttng-module/kvm.h -+++ b/instrumentation/events/lttng-module/kvm.h -@@ -232,6 +232,34 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu, - TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol)) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)) -+ -+LTTNG_TRACEPOINT_EVENT(kvm_age_page, -+ TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref), -+ TP_ARGS(gfn, level, slot, ref), -+ -+ TP_STRUCT__entry( -+ __field( u64, hva ) -+ __field( u64, gfn ) -+ __field( u8, level ) -+ __field( u8, referenced ) -+ ), -+ -+ TP_fast_assign( -+ tp_assign(gfn, gfn) -+ tp_assign(level, level) -+ tp_assign(hva, ((gfn - slot->base_gfn) << -+ PAGE_SHIFT) + slot->userspace_addr) -+ tp_assign(referenced, ref) -+ ), -+ -+ TP_printk("hva %llx gfn %llx level %u %s", -+ __entry->hva, __entry->gfn, __entry->level, -+ __entry->referenced ? "YOUNG" : "OLD") -+) -+ -+#else -+ - LTTNG_TRACEPOINT_EVENT(kvm_age_page, - TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref), - TP_ARGS(hva, slot, ref), -@@ -254,6 +282,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page, - __entry->referenced ? "YOUNG" : "OLD") - ) - #endif -+#endif - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) - diff --git a/pkgs/os-specific/linux/lttng-modules/build-fix.patch b/pkgs/os-specific/linux/lttng-modules/build-fix.patch deleted file mode 100644 index 76f449b8b2c6..000000000000 --- a/pkgs/os-specific/linux/lttng-modules/build-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] Update compaction instrumentation for 3.14.x stable kernels - -Conditional compilation introduced by lttng-modules commit - - 0007344741ef65259bc52dea72259173dfbf96c0 - -needs to be applied to kernels 3.14.25 and up in the 3.14.x branch. - -Signed-off-by: Simon Marchi <simon.marchi at polymtl.ca> -Reported-by: Bjørn Forsman <bjorn.forsman at gmail.com> ---- - instrumentation/events/lttng-module/compaction.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h -index ee23aa9..773a6ad 100644 ---- a/instrumentation/events/lttng-module/compaction.h -+++ b/instrumentation/events/lttng-module/compaction.h -@@ -46,7 +46,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is - TP_ARGS(nr_scanned, nr_taken) - ) - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+#if LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) - LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, - - TP_PROTO(unsigned long nr_all, --- -2.1.3 diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 871edf87b7a0..5fe065d3cc66 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchgit, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 -assert builtins.substring 0 4 kernel.version != "3.12"; stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.6.0-rc1"; # "git describe bf2ba318fff" + version = "2.6.0-5-g1b2a542"; - src = fetchurl { - url = "https://github.com/lttng/lttng-modules/archive/v${version}.tar.gz"; - sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; + src = fetchgit { + url = "https://github.com/lttng/lttng-modules.git"; + rev = "1b2a5429de815c95643df2eadf91253909708728"; + sha256 = "0zccaiadnk0xl6xrqaqlg9rpkwjgbq2fiyc3psylzqimnx0ydxc2"; }; - # from upstream ML, should be in the next release - patches = [ ./build-fix.patch ./6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch ]; - preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 04ca4514a0f4..97f80b53032b 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl, libcap, apparmor, perl, docbook2x +{ stdenv, autoreconfHook, fetchurl, libcap, libapparmor, perl, docbook2x , docbook_xml_dtd_45, gnutls, pkgconfig }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0"; }; - buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; + buildInputs = [ libcap libapparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1f046de40edd..1ab7a600fcd9 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainers = with stdenv.lib.maintainers; [ joachifm ]; - license = with stdenv.lib.licenses; gpl2Plus; + maintainers = [ stdenv.lib.maintainers.joachifm ]; + license = stdenv.lib.licenses.gpl2Plus; homepage = "https://www.gnu.org/software/macchanger"; - platform = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index 192e2c7ac5f9..4e2888fa942a 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "mingetty-1.08"; - + src = fetchurl { url = mirror://sourceforge/mingetty/mingetty-1.08.tar.gz; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://sourceforge.net/projects/mingetty; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 97407c887cea..cd13914580a9 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1kgmi17zpzgjhywmmqxazj8qsx8cf9siwa65jqd2i6rs7jnnb335"; + sha256 = "1d7inhai37g1ph6yg7ldyl4k5c7i8xvaa5w62n85n3albk2n00as"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 41523b931672..5edadeda81ba 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -36,6 +36,22 @@ installPhase() { cp -prd *.so.* tls "$out/lib/" rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + if test -z "$libsOnly"; then + # Install the X drivers. + mkdir -p $out/lib/xorg/modules + cp -p libnvidia-wfb.* $out/lib/xorg/modules/ + mkdir -p $out/lib/xorg/modules/drivers + cp -p nvidia_drv.so $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/extensions + cp -p libglx.so.* $out/lib/xorg/modules/extensions + + # Install the kernel module. + mkdir -p $out/lib/modules/$kernelVersion/misc + cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc + fi + + # All libs except GUI-only are in $out now, so fixup them. for libname in `find "$out/lib/" -name '*.so.*'` do # I'm lazy to differentiate needed libs per-library, as the closure is the same. @@ -52,35 +68,8 @@ installPhase() { #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - if test -z "$libsOnly"; then - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc - cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc - - # Install the X driver. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions - - #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* - - # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-smi; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i - done - - patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.* - - # Header files etc. + # Install headers and /share files etc. mkdir -p $out/include/nvidia cp -p *.h $out/include/nvidia @@ -99,13 +88,26 @@ installPhase() { --replace '__UTILS_PATH__' $out/bin \ --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Install the programs. + mkdir -p $out/bin + + for i in nvidia-settings nvidia-smi; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.* + # Test a bit. $out/bin/nvidia-settings --version else - rm $out/lib/libnvidia-gtk3.* + rm $out/lib/libnvidia-gtk2.* fi - # for simplicity and dependency reduction, don't support the gtk2 interface - rm $out/lib/libnvidia-gtk2.* + + # For simplicity and dependency reduction, don't support the gtk3 interface. + rm $out/lib/libnvidia-gtk3.* } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f62649e2daae..02731d7f7753 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl -, gtk3, atk, pango, glib, gdk_pixbuf, cairo +, gtk, atk, pango, glib, gdk_pixbuf, cairo , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -12,9 +12,11 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "346.35"; + versionNumber = "346.47"; + # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; + in stdenv.mkDerivation { @@ -26,12 +28,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "09fz8nydi8ip3yv7dmbwnpwvjql5wp582z57022ppb9hqwq3r9mv"; + sha256 = "0vkayz6nhw00kn2nvxvr9hsh4sa555nbbr9swlx5x1frziym48dv"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1z9a69a9xbcrz925mj02l2qaqcnhxzh2msbq4hf73p7x4h94ibkx"; + sha256 = "0xqnjs54i281pnkky7dnz4n7jcn2vqjba0kra8da1wnyklm6gdni"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -46,9 +48,8 @@ stdenv.mkDerivation { openclPath = makeLibraryPath [zlib]; allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; - # we don't support the gtk2 version - gtk3Path = optionalString (!libsOnly) (makeLibraryPath - [ gtk3 atk pango glib gdk_pixbuf cairo ] ); + gtkPath = optionalString (!libsOnly) (makeLibraryPath + [ gtk atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xlibs.libXv ]; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 6260134bf111..a5a43926e045 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=$(out)" + "KVER=${kernel.modDirVersion}" ]; meta = { diff --git a/pkgs/os-specific/linux/pam_console/configure.ac b/pkgs/os-specific/linux/pam_console/configure.ac deleted file mode 100644 index 0d2d0288acff..000000000000 --- a/pkgs/os-specific/linux/pam_console/configure.ac +++ /dev/null @@ -1,27 +0,0 @@ -AC_PREREQ([2.59]) -AC_INIT([pam_console], [@PV@]) -AM_INIT_AUTOMAKE([pam_console], [@PV@]) - -AC_CONFIG_HEADER([config.h]) - -AC_GNU_SOURCE - -AM_CONDITIONAL([HAVE_VERSIONING], [test "x" = "y"]) - -PKG_CHECK_MODULES([GLIB], [glib-2.0]) - -m4_undefine([AC_PROG_CXX]) -m4_defun([AC_PROG_CXX],[]) -m4_undefine([AC_PROG_F77]) -m4_defun([AC_PROG_F77],[]) -AC_PROG_LIBTOOL - -AC_PROG_YACC - -SECUREDIR=${libdir}/security -SCONFIGDIR=${sysconfdir}/security - -AC_SUBST([SECUREDIR]) -AC_SUBST([SCONFIGDIR]) - -AC_OUTPUT([Makefile]) diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix deleted file mode 100644 index 7c1e83c0ed60..000000000000 --- a/pkgs/os-specific/linux/pam_console/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, pam, autoconf, automake, libtool, pkgconfig, glib, bison, flex}: - -let - - # Configure script borrowed from the good folks at Gentoo - # (http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-auth/pam_console/files/pam_console-configure.ac). - configure = ./configure.ac; - -in - -stdenv.mkDerivation { - name = "pam_console-0.99.5-1"; - - src = fetchurl { - url = http://cvs.fedora.redhat.com/repo/dist/pam/pam-redhat-0.99.5-1.tar.bz2/e2edde7861c48195728bc531e5a277e0/pam-redhat-0.99.5-1.tar.bz2; - sha256 = "077xdhwspc785fas4yfw50mpy92rdfh35kq9awlrpbzq1fnapsfs"; - }; - - buildInputs = [pam autoconf automake libtool pkgconfig glib bison flex]; - - makeFlags = "LEX=flex"; - - preConfigure = " - cd pam_console - cp ${configure} configure.ac - touch NEWS AUTHORS ChangeLog - # Don't try to create /var/run/console. - substituteInPlace Makefile.am --replace 'mkdir -m $(LOCKMODE) -p -p $(DESTDIR)$(LOCKDIR)' '' - autoreconf --install - "; -} diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix deleted file mode 100644 index 46da3053d20c..000000000000 --- a/pkgs/os-specific/linux/pam_login/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, pam}: - -stdenv.mkDerivation { - name = "pam_login-3.35"; - - src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.35.tar.bz2; - sha256 = "1w2hpwjhmwjhf8rg789xpl0hibahqlr3ccivfy3m4kgrm5gf04kv"; - }; - - patches = [ ./sys-stat-h.patch ]; - - # To overcome a gcc 4.4 warning: - # "#ident is a deprecated GCC extension" - postPatch = '' - sed -i s/-Werror// configure - ''; - - buildInputs = [pam]; -} diff --git a/pkgs/os-specific/linux/pam_login/sys-stat-h.patch b/pkgs/os-specific/linux/pam_login/sys-stat-h.patch deleted file mode 100644 index 163fd7ce8e25..000000000000 --- a/pkgs/os-specific/linux/pam_login/sys-stat-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -Include the needed <sys/stat.h> since recent glibc is stricter about that. - ---- pam_login-3.35/src/login.c~ 2007-05-04 14:07:49.000000000 +0200 -+++ pam_login-3.35/src/login.c 2010-04-27 11:38:13.000000000 +0200 -@@ -47,6 +47,7 @@ - #include <signal.h> - #include <stdio.h> - #include <string.h> -+#include <sys/stat.h> - #include <sys/ioctl.h> - #include <sys/param.h> - #include <sys/resource.h> diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 5646ba89f662..80e87d8aaccb 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "0.9.2"; + version = "1.0.2"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "1pmlpjhr2475h5v90abmsfgr37r3b6c4mknhzswbgcb10vgh322p"; + sha256 = "15708pm5l1bgxg1bgic82hqvmn3gcq83mi1l8akhz9qlykh5sfdq"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix new file mode 100644 index 000000000000..0273fed3ec4a --- /dev/null +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation { + name = "perf-tools-20150130"; + + src = fetchFromGitHub { + owner = "brendangregg"; + repo = "perf-tools"; + rev = "85414b01247666c9fefad25a1406c8078011c936"; + sha256 = "1g15nnndcmxd1k9radcvfpn223pp627vs9wh90yiy73v03g7b8cs"; + }; + + buildInputs = [ perl ]; + + patchPhase = + '' + for i in execsnoop iolatency iosnoop kernel/funcslower killsnoop opensnoop; do + substituteInPlace $i \ + --replace /usr/bin/gawk "$(type -p gawk)" \ + --replace /usr/bin/mawk /no-such-path \ + --replace /usr/bin/getconf "$(type -p getconf)" \ + --replace awk=awk "awk=$(type -p gawk)" + done + + rm -rf examples deprecated + ''; + + installPhase = + '' + d=$out/libexec/perf-tools + mkdir -p $d $out/share + cp -prvd . $d/ + ln -s $d/bin $out/bin + mv $d/man $out/share/ + ''; + + meta = { + platforms = lib.platforms.linux; + homepage = https://github.com/brendangregg/perf-tools; + description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index a04407ba5c2a..00d330ca955e 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, autoconf, automake, cairo, docbook_xsl, gtk -, libdrm, libpng , libtool, libxslt, makeWrapper, pango, pkgconfig -, udev +{ stdenv, fetchurl, autoreconfHook, cairo, docbook_xsl, gtk +, libdrm, libpng, libxslt, makeWrapper, pango, pkgconfig, udev }: stdenv.mkDerivation rec { @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - autoconf automake cairo docbook_xsl gtk libdrm libpng libtool + autoreconfHook cairo docbook_xsl gtk libdrm libpng libxslt makeWrapper pango pkgconfig udev ]; @@ -22,23 +21,23 @@ stdenv.mkDerivation rec { -i configure.ac ''; - configurePhase = '' - ./configure \ - --prefix=$out \ - -bindir=$out/bin \ - -sbindir=$out/sbin \ - --exec-prefix=$out \ - --libdir=$out/lib \ - --libexecdir=$out/lib \ - --sysconfdir=$out/etc \ - --localstatedir=/var \ - --with-log-viewer \ - --without-system-root-install \ - --without-rhgb-compat-link \ - --enable-tracing \ - --enable-systemd-integration \ - --enable-pango \ - --enable-gtk + postPatch = '' + configureFlags=" + --prefix=$out + --bindir=$out/bin + --sbindir=$out/sbin + --exec-prefix=$out + --libdir=$out/lib + --libexecdir=$out/lib + --sysconfdir=$out/etc + --localstatedir=/var + --with-log-viewer + --without-system-root-install + --without-rhgb-compat-link + --enable-tracing + --enable-systemd-integration + --enable-pango + --enable-gtk" ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 618b59b32aa5..4e13aa2687c6 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,14 +1,14 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.3-1.2"; + version = "0.6.3-1.3"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g"; + sha256 = "1d4gdlkhshlyfkswbqx06fhs8m5lxgk3vhds6g7ipd3q93ngrczx"; }; - patches = [ ./install_prefix.patch ./const.patch ./time.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; }) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index fc204bc02321..5c3ccd86120f 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "086476f"; + version = "2015-03-20"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "086476f92005506cb07e75f889e8ddb69026e842"; - sha256 = "1n3cjdwxccvcns7jydgznkb6jy0p59qx1yg512jjf4m9hf5p2pwm"; + rev = "79a0056e137c9cc540eb9ff7327c85ac8d094e6c"; + sha256 = "0xj132x0q76h9anjh7km2blqnr19yx7szwifj02x5h6xa07vq6fd"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; diff --git a/pkgs/os-specific/linux/spl/time.patch b/pkgs/os-specific/linux/spl/time.patch deleted file mode 100644 index 6b1e23bc05ef..000000000000 --- a/pkgs/os-specific/linux/spl/time.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/module/spl/spl-time.c b/module/spl/spl-time.c -index 0ed49cc..b0fad4f 100644 ---- a/module/spl/spl-time.c -+++ b/module/spl/spl-time.c -@@ -40,12 +40,7 @@ extern unsigned long long monotonic_clock(void); - void - __gethrestime(timestruc_t *ts) - { -- struct timespec tspec; -- -- getnstimeofday(&tspec); -- -- ts->tv_sec = tspec.tv_sec; -- ts->tv_nsec = tspec.tv_nsec; -+ *ts = current_kernel_time(); - } - EXPORT_SYMBOL(__gethrestime); - diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 3765469b9ab5..5a7d07000046 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.96"; + version = "0.1.99"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0fw5km1ms5faa9hlhzb6nba79m59443zblv43gpzsq1pwvpg7r94"; + sha256 = "02faw8s07i7jjydqzqfs0r9lc2qmny3sn26741bz0hmazs9h9w76"; }; buildInputs = [ cmake zlib luajit diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index b7bbdee369a1..fd1d932990eb 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { meta = { description = "A system logging daemon"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 7b4ecbb027e1..042e601ec14f 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index aff730e387a5..ca1f698fa31e 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.linux-usb.org/; description = "Tools for working with USB devices, such as lsusb"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 81eeee68fbad..62fb4976ad05 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.25.2"; + name = "util-linux-2.26"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz"; - sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6"; + url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz"; + sha256 = "a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489"; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ./unshare-fix-map-root-user.patch ]; #FIXME: make it also work on non-nixos? @@ -53,5 +52,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kernel.org/pub/linux/utils/util-linux/; description = "A set of system utilities for Linux"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch b/pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch deleted file mode 100644 index 1d1531e110cb..000000000000 --- a/pkgs/os-specific/linux/util-linux/unshare-fix-map-root-user.patch +++ /dev/null @@ -1,66 +0,0 @@ -In rare cases droping groups with setgroups(0, NULL) is an operation -that can grant a user additional privileges. User namespaces were -allwoing that operation to unprivileged users and that had to be -fixed. - -Update unshare --map-root-user to disable the setgroups operation -before setting the gid_map. - -This is needed as after the security fix gid_map is restricted to -privileged users unless setgroups has been disabled. - -Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> ---- - include/pathnames.h | 1 + - sys-utils/unshare.c | 19 +++++++++++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/include/pathnames.h b/include/pathnames.h -index 1cc4e15e6e4f..1c53e4554268 100644 ---- a/include/pathnames.h -+++ b/include/pathnames.h -@@ -92,6 +92,7 @@ - - #define _PATH_PROC_UIDMAP "/proc/self/uid_map" - #define _PATH_PROC_GIDMAP "/proc/self/gid_map" -+#define _PATH_PROC_SETGROUPS "/proc/self/setgroups" - - #define _PATH_PROC_ATTR_CURRENT "/proc/self/attr/current" - #define _PATH_PROC_ATTR_EXEC "/proc/self/attr/exec" -diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c -index 95e4afbd055e..d409a7c936b6 100644 ---- a/sys-utils/unshare.c -+++ b/sys-utils/unshare.c -@@ -39,6 +39,24 @@ - #include "pathnames.h" - #include "all-io.h" - -+static void disable_setgroups(void) -+{ -+ const char *file = _PATH_PROC_SETGROUPS; -+ const char *deny = "deny"; -+ int fd; -+ -+ fd = open(file, O_WRONLY); -+ if (fd < 0) { -+ if (errno == ENOENT) -+ return; -+ err(EXIT_FAILURE, _("cannot open %s"), file); -+ } -+ -+ if (write_all(fd, deny, strlen(deny))) -+ err(EXIT_FAILURE, _("write failed %s"), file); -+ close(fd); -+} -+ - static void map_id(const char *file, uint32_t from, uint32_t to) - { - char *buf; -@@ -178,6 +196,7 @@ int main(int argc, char *argv[]) - } - - if (maproot) { -+ disable_setgroups(); - map_id(_PATH_PROC_UIDMAP, 0, real_euid); - map_id(_PATH_PROC_GIDMAP, 0, real_egid); - } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 11b77c3d66f4..3f4568022860 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.3-1.2"; + version = "0.6.3-1.3"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "1iqkh08ikmsg8zi7s2pr46z9z7lshbb65pv2ihg1llwmgcm42r9r"; + sha256 = "08m5ah8a6zp96djz2xj9rb94zq973dwwfpc26jy0adzdq2q20zb4"; }; patches = [ diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 17a38bf18017..62600886fa64 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,16 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: -let - gitVersion = "7d2868d5fc88a4c30769b44f56a3a88a4277a9ab"; -in - callPackage ./generic.nix (args // rec { - version = stdenv.lib.substring 0 7 gitVersion; + version = "2015-03-20"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = gitVersion; - sha256 = "1gf0x8d0zs2h3w910agxm4nb9qr4chs54iiblnqz4k74yyhbmwgg"; + rev = "bc88866657979c5658441e201e19df365c67ddfe"; + sha256 = "1d97xw7cak64f0ywwskjssnryljidf4hpngmqv0mmz4lk4hwirm9"; }; patches = [ diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index b1f732a451f8..f3d0a43c4cff 100755 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, jre, makeWrapper, bash }: let - kafkaVersion = "0.8.1.1"; - scalaVersion = "2.8.0"; + kafkaVersion = "0.8.2.1"; + scalaVersion = "2.10"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - sha256 = "1bya4qs0ccrqibmdivgdxcsyiay4c3vywddrkci1dz9v3ymrqby9"; + sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; }; buildInputs = [ jre makeWrapper bash ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix new file mode 100644 index 000000000000..25f3fbb5a642 --- /dev/null +++ b/pkgs/servers/computing/slurm/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python, munge, perl, pam, openssl, mysql }: + +#TODO: add sview support based on gtk2 + +stdenv.mkDerivation rec { + name = "slurm-llnl-${version}"; + version = "14.11.5"; + + src = fetchurl { + url = "http://www.schedmd.com/download/latest/slurm-${version}.tar.bz2"; + sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2"; + }; + + buildInputs = [ python munge perl pam openssl mysql ]; + + configureFlags = '' + --with-munge=${munge} + --with-ssl=${openssl} + ''; + + preConfigure = '' + substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" + substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" + ''; + + meta = with stdenv.lib; { + homepage = http://www.schedmd.com/; + description = "Simple Linux Utility for Resource Management"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.jagajaga ]; + }; +} diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index afe4a8e127d6..b299981bee2a 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ , bundlerEnv }: let - version = "0.4.1"; + version = "0.5.0"; # `sass` et al gems = bundlerEnv { name = "consul-deps"; @@ -39,6 +39,11 @@ stdenv.mkDerivation { outputs = [ "out" "ui" ]; installPhase = '' + # Fix references to go-deps in the binary + hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') + xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) + sed -i "s,$hash,$xs,g" consul + # Install consul binary mkdir -p $out/bin cp consul $out/bin diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix index 4faf1d3abc23..ad41dbb70a59 100644 --- a/pkgs/servers/consul/deps.nix +++ b/pkgs/servers/consul/deps.nix @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "armon"; repo = "consul-api"; - rev = "1b81c8e0c4cbf1d382310e4c0dc11221632e79d1"; - sha256 = "0fgawc1si0hn41kfr9sq351jccy8y5ac83l437vnshj60i9q9s6w"; + rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; + sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; }; } { @@ -25,8 +25,8 @@ let src = fetchFromGitHub { owner = "armon"; repo = "go-metrics"; - rev = "2b75159ce5d3641fb35b5a159cff309ac3cf4177"; - sha256 = "1fjsa7r97zlpdzi5l7qvgyabznn5pm6bpwi1rgrwaxh7gc3a28vi"; + rev = "88b7658f24511c4b885942b26e9ea7a61ee37ebc"; + sha256 = "18f7nr6khirdmcsy5mic1yggwc189wfiqvms8i7yfcvfns5nq9cc"; }; } { @@ -34,8 +34,8 @@ let src = fetchFromGitHub { owner = "armon"; repo = "go-radix"; - rev = "b045fc0ad3587e8620fb42a0dea882cf8c08aef9"; - sha256 = "1p09dwhngaszbr9si68xl1la74i359l0wibhhirpxrc8q4pgjplx"; + rev = "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80"; + sha256 = "10vhgr35dfbsm90q8aqp82vhdf4izqrx8bzzgn0h3vrx94c2pnq1"; }; } { @@ -43,8 +43,17 @@ let src = fetchFromGitHub { owner = "armon"; repo = "gomdb"; - rev = "a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8"; - sha256 = "0hiw5qkkyfd22v291w7rbnlrb4kraqzbkjfx2dvl7rqchkb0hv68"; + rev = "151f2e08ef45cb0e57d694b2562f351955dff572"; + sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61"; + }; + } + { + root = "github.com/golang/protobuf"; + src = fetchFromGitHub { + owner = "golang"; + repo = "protobuf"; + rev = "c22ae3cf020a21ebb7ae566dccbe90fc8ea4f9ea"; + sha256 = "1ab605jw0cprq0kbp0b5iyjw805wk08r3p9mvcyland7v4gfqys2"; }; } { @@ -52,8 +61,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "consul"; - rev = "v0.4.1"; - sha256 = "0fqrhmzi0jbbwylv7c1l0ywqr67aqlv6s891f4inp0y4abd7shc7"; + rev = "a022dfcb32246274adc8fb383882353c056d1da3"; + sha256 = "1al6bc62c8qygq4yhr8rq9jkx51ijv11816kipphylw73kyyrzg5"; }; } { @@ -70,8 +79,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; - rev = "v0.5.1"; - sha256 = "1h8sqmzf73bn12bj1yqldp9gl46gz766c3zrymwgl8p0mb74dllf"; + rev = "v0.7.0"; + sha256 = "0xaym2mi8j3hw1waplhqfypnxv32fi81xxx3clfzk0a6bjmaihfx"; }; } { @@ -79,8 +88,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "go-checkpoint"; - rev = "89ef2a697dd8cdb4623097d5bb9acdb19a470767"; - sha256 = "0mfykh9jkh1m2zxlm2df4j5i6hd6iq1kc8afjladdhcqyrkwcch0"; + rev = "88326f6851319068e7b34981032128c0b1a6524d"; + sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; }; } { @@ -97,8 +106,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "go-syslog"; - rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c"; - sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; }; } { @@ -106,8 +115,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "golang-lru"; - rev = "253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116"; - sha256 = "01vdya86x4fylzwapnz6p3wkb8y17sfvbss656sixc37iirrhqr2"; + rev = "f09f965649501e2ac1b0c310c632a7bebdbdc1d4"; + sha256 = "0yjnmk2d2x0kqvkg1sdfkl3jr408yl76rpyqzkkbpkvdcjrz554c"; }; } { @@ -115,8 +124,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; - rev = "e51eabcdf801f663738fa12f4340fbad13062738"; - sha256 = "09d047lg6py9waqd6zwb0c9id8hya4xv2cg7yi9jbx8kwq31s75l"; + rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84"; + sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c"; }; } { @@ -133,8 +142,17 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "memberlist"; - rev = "16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8"; - sha256 = "0xagvyyfl37r0n6s67m1dmrahaxf4gprnfkm12x9jcpp5rbq7jjq"; + rev = "3d05e25e06bbb9e2b0e0afbd0b1c7dcebdd29cab"; + sha256 = "1pjknjfvbs692y6laizgd4fmd4pqn039vvnmnag7q362mrpf5aj4"; + }; + } + { + root = "github.com/hashicorp/net-rpc-msgpackrpc"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "net-rpc-msgpackrpc"; + rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2"; + sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969"; }; } { @@ -142,8 +160,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "raft"; - rev = "cc9710ab540985954a67c108f414aa3152f5916f"; - sha256 = "1v4hib68gaicaqcx3iyclxbp5p3g750rayh8f35sh5fwbklqw1qi"; + rev = "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab"; + sha256 = "02kr7919m6iv7l26wnihalfi4lydz886j6x75a53vgchdcsbv7ai"; }; } { @@ -151,8 +169,17 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "raft-mdb"; - rev = "6f52d0ce62a34e3f5bd29aa4d7068030d700d94a"; - sha256 = "0pchi88ib7nzz6rdc91dpxq1k3q2021m8245v0yqh0ilbvvvyj7i"; + rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"; + sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i"; + }; + } + { + root = "github.com/hashicorp/scada-client"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "scada-client"; + rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"; + sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b"; }; } { @@ -160,8 +187,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; - rev = "v0.6.3"; - sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y"; + rev = "f1fd5030d6a55d3edc6916d2ba58e933c21314de"; + sha256 = "0w84iw255aray7acasacwn8njm36aqbxiyalnjqwfsn0pwfjla0b"; }; } { @@ -169,8 +196,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; - rev = "v0.3.1"; - sha256 = "0z6r9dbqrzxaw4b1vbr14ci85jgz6qrq8p36ylcyabzfvwbxrl1m"; + rev = "v0.3.7"; + sha256 = "04cs6sjwysg95l5cfsmnpnx3d126bv86qbkg91gj8h98knk5bs6z"; }; } { @@ -178,8 +205,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "yamux"; - rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000"; - sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan"; + rev = "b4f943b3f25da97dec8e26bee1c3269019de070d"; + sha256 = "18ivpiix006f0g085a11gra8z0n6bq344rrgc5rphn7nmnghqchz"; }; } { @@ -192,12 +219,21 @@ let }; } { + root = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchFromGitHub { + owner = "matttproud"; + repo = "golang_protobuf_extensions"; + rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; + sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; + }; + } + { root = "github.com/miekg/dns"; src = fetchFromGitHub { owner = "miekg"; repo = "dns"; - rev = "dc30c7cd4ed2fc8af73d49da4ee285404958b8bd"; - sha256 = "1pqdgjz0qwbbfgya2brsvhj88jp6rmprjwzgjsjnnv9nxwfsbb5s"; + rev = "6427527bba3ea8fdf2b56fba43d20d1e3e76336d"; + sha256 = "1zszpn44kak4cs5lmy9i7sslizqngldgb0ixn0la9x9gxf16h9zn"; }; } { @@ -214,8 +250,35 @@ let src = fetchFromGitHub { owner = "mitchellh"; repo = "mapstructure"; - rev = "740c764bc6149d3f1806231418adb9f52c11bcbf"; - sha256 = "0rlz93rmz465nr0wmzvq1n58yc0qdw7v1chr6zmj9jj9pix0a7cb"; + rev = "442e588f213303bec7936deba67901f8fc8f18b1"; + sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd"; + }; + } + { + root = "github.com/prometheus/client_golang"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "client_golang"; + rev = "0.2.0"; + sha256 = "0iq2hlmdazwmpjq2k9gvpv2zprzxzmyzsc89c2kalrwl52ksg250"; + }; + } + { + root = "github.com/prometheus/client_model"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + root = "github.com/prometheus/procfs"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "procfs"; + rev = "6c34ef819e19b4e16f410100ace4aa006f0e3bf8"; + sha256 = "1n48jhx50bhnjznxds4nmz04digbbbbjq3hkvvl29js1grylda0i"; }; } { @@ -232,8 +295,8 @@ let src = fetchFromGitHub { owner = "ugorji"; repo = "go"; - rev = "a7f0616e8cd41d08149bec05c87524abe4e0520e"; - sha256 = "1sxbsvfb46gp6jpb8wy9z6329g2zzbm07xnzml627dsvwdcxvy4q"; + rev = "c8676e5e9db1226325ca0ed7771633fb0109878b"; + sha256 = "18r1iajmc9a461kx0pz3lpv91lzlfg93cjw0k0j7ffk6901m0084"; }; } ]; diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix index 2b44fc8b8a6f..59ca524b51e3 100644 --- a/pkgs/servers/consul/template.nix +++ b/pkgs/servers/consul/template.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "consul-template-${version}"; - version = "0.5.1"; + version = "0.7.0"; src = import ./deps.nix { inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' + # Fix references to go-deps in the binary + hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') + xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) + sed -i "s,$hash,$xs,g" consul-template + mkdir -p $out/bin cp consul-template $out/bin ''; @@ -23,7 +28,7 @@ stdenv.mkDerivation rec { description = "Generic template rendering and notifications with Consul"; homepage = https://github.com/hashicorp/consul-template; license = licenses.mpl20; - maintainers = with maintainers; [ puffnfresh ]; + maintainers = with maintainers; [ puffnfresh wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 50e71a745464..fbfa2d8d9b7d 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.9.5-W1"; in +let version = "9.10.2"; in stdenv.mkDerivation rec { - name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1b3ycb376b1j2fc0k6w16k8j9vgsfrzy3nlw1vxzzi41fgyqmcd3"; + sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg"; }; patchPhase = '' diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix index 5b7d96c14cf8..bf672aa89d84 100644 --- a/pkgs/servers/dns/mesos-dns/default.nix +++ b/pkgs/servers/dns/mesos-dns/default.nix @@ -11,8 +11,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "mesosphere"; repo = "mesos-dns"; - rev = "29940029d4b0c17142373c3280a8b452722b665b"; - sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n"; + rev = "f37051fc5a723eb021797e7d57d92755c011a28e"; + sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15"; }; # Avoid including the benchmarking test helper in the output: diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index c0b460778d9e..a6bb4171934f 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -8,14 +8,16 @@ , ratelimit ? false , recvmmsg ? false , rootServer ? false +, rrtypes ? false +, zoneStats ? false }: stdenv.mkDerivation rec { - name = "nsd-4.1.0"; + name = "nsd-4.1.1"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "ec3f6902f6f26a6b9248dcd7e9f42472fa52755740b4ba6b9d3bd08910b39b62"; + sha256 = "b0c3fab40ac7a8b5ffca642bc9e1b424aa72aebd03adf13a1f24ab4874734640"; }; buildInputs = [ libevent openssl ]; @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { ++ edf ratelimit "ratelimit" ++ edf recvmmsg "recvmmsg" ++ edf rootServer "root-server" + ++ edf rrtypes "draft-rrtypes" + ++ edf zoneStats "zone-stats" ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 7c16153e9b53..6572e63a14ff 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "gpm-1.20.6"; - + src = fetchurl { url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8"; @@ -28,5 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nico.schottelius.org/software/gpm/; description = "A daemon that provides mouse support on the Linux console"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index e164c21ec78d..cb550652b785 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.4.10"; + version = "2.4.12"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0slwcqw9f7fnb3kyz27hlsgh8j4wiza4yzqyp6vhfpvl3an4sv0p"; + sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd"; }; buildInputs = [perl] ++ diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e01b6ac25575..ee5b4a1cd5d2 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.9"; + version = "1.7.10"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "12lg64jrdy8qc8fjdy4nr165h2nf854w295ssj3amp9hypqcgbqs"; + sha256 = "0q24rwwlw3xas0ar4jygyb6czwjzsjz11sax199z7fnfd2sc2wyz"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/kafka/default.nix b/pkgs/servers/kafka/default.nix deleted file mode 100644 index 6ffd171d980c..000000000000 --- a/pkgs/servers/kafka/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash }: - -stdenv.mkDerivation rec { - name = "kafka"; - version = "0.8.1.1"; - src = fetchurl { - url = "http://www.mirrorservice.org/sites/ftp.apache.org/${name}/${version}/${name}_2.9.2-${version}.tgz"; - sha256 = "cb141c1d50b1bd0d741d68e5e21c090341d961cd801e11e42fb693fa53e9aaed"; - }; - - buildInputs = [ makeWrapper jre ]; - - installPhase = '' - mkdir -p $out - cp -R config libs $out - mkdir -p $out/bin - cp -R bin/${name}-*.sh $out/bin - for i in $out/bin/${name}-*.sh; do - wrapProgram $i \ - --set JAVA_HOME "${jre}" \ - --prefix PATH : "${bash}/bin" - done - - ''; - - meta = with stdenv.lib; { - homepage = "http://kafka.apache.org"; - description = "Apache Kafka"; - license = licenses.asl20; - maintainers = [ maintainers.boothead ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index bbe92bd1329b..d37a4ff5b709 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150202222550"; + rev = "20150311224711"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "0xrnyq85nxj6rddrhd19r2bz59pzxci6bnjh61j4z8hd6ryp8j2c"; + sha256 = "1nzzmlbiah7lpkm5n7yzxv1wmcxg8pszlzzsdvb7ccy0agpihxjg"; }; subPackages = [ "cmd/bosun" ]; diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index f7e5c99c91de..ba6b0f369b9d 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150202222550"; + rev = "20150311224711"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "0xrnyq85nxj6rddrhd19r2bz59pzxci6bnjh61j4z8hd6ryp8j2c"; + sha256 = "1nzzmlbiah7lpkm5n7yzxv1wmcxg8pszlzzsdvb7ccy0agpihxjg"; }; subPackages = [ "cmd/scollector" ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index b7dbdb893f1a..1e818a508d90 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.7.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "${version}"; - sha256 = "1vc9fydi6wra45khxsmfw5mx2qyggi7cg6kgajzw518rqa52ivmg"; + sha256 = "0k0qfhw755k3ripsfkhml0ixaglhy64hdzxrjvlmbgc50s3j37vh"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix new file mode 100644 index 000000000000..4ef870bfcf93 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-alertmanager-${version}"; + version = "0.1.0"; + goPackagePath = "github.com/prometheus/alertmanager"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "alertmanager"; + rev = "942cd35dea6dc406b106d7a57ffe7adbb3b978a5"; + sha256 = "1c14vgn9s0dn322ss8fs5b47blw1g8cxy9w4yjn0f7x2sdwplx1i"; + }; + + buildInputs = [ + goPackages.glog + goPackages.protobuf + goPackages.fsnotify + goPackages.httprouter + goPackages.prometheus.client_golang + goPackages.pushover + protobuf + vim + ]; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion go} + ''; + + preBuild = '' + ( + cd "go/src/$goPackagePath" + protoc --proto_path=./config \ + --go_out=./config/generated/ \ + ./config/config.proto + cd web + ${stdenv.shell} blob/embed-static.sh static templates \ + | gofmt > blob/files.go + ) + ''; + + meta = with lib; { + description = "Alerting dispather for the Prometheus monitoring system"; + homepage = "https://github.com/prometheus/alertmanager"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix new file mode 100644 index 000000000000..f1f5ef9975c5 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cli/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-cli-0.2.0"; + goPackagePath = "github.com/prometheus/prometheus_cli"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "prometheus_cli"; + rev = "b36c21d2301cf686bff81953573a29a6d5a0a883"; + sha256 = "190dlc6fyrfgxab4xj3gaz4jwx33jhzg57d8h36xjx56gbvp7iyk"; + }; + + buildInputs = [ + goPackages.prometheus.client_model + goPackages.prometheus.client_golang + ]; + + meta = with lib; { + description = "Command line tool for querying the Prometheus HTTP API"; + homepage = https://github.com/prometheus/prometheus_cli; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix new file mode 100644 index 000000000000..6e181c6ec9e4 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-${version}"; + version = "0.12.0"; + goPackagePath = "github.com/prometheus/prometheus"; + rev = "55dcb55498b43bafe94915a4de7907d6d66b4427"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb"; + }; + + buildInputs = [ + dns glog goleveldb prometheus.client_golang + goPackages.protobuf + protobuf # the non-golang package, for protoc + vim # for xxd, used in embed-static.sh + ]; + + # Metadata that gets embedded into the binary + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildRevision ${builtins.substring 0 6 rev} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion go} + ''; + + preBuild = '' + ( + cd "go/src/$goPackagePath" + protoc --proto_path=./config \ + --go_out=./config/generated/ \ + ./config/config.proto + + cd web + ${stdenv.shell} ../utility/embed-static.sh static templates \ + | gofmt > blob/files.go + ) + ''; + + meta = with lib; { + description = "Service monitoring system and time series database"; + homepage = http://prometheus.github.io; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix new file mode 100644 index 000000000000..63c421cd8a28 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, goPackages, fetchFromGitHub, }: + +goPackages.buildGoPackage rec { + name = "prometheus-haproxy-exporter-0.4.0"; + goPackagePath = "github.com/prometheus/haproxy_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "haproxy_exporter"; + rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d"; + sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr"; + }; + + buildInputs = [ goPackages.prometheus.client_golang ]; + + meta = with lib; { + description = "HAProxy Exporter for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/haproxy_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix new file mode 100644 index 000000000000..c8793e17abb7 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-mesos-exporter-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "a4a6638d6db6b5137e130cd4903b30dd82b78e9a"; + goPackagePath = "github.com/prometheus/mesos_exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "mesos_exporter"; + sha256 = "1h4yxfcr8l9i2m1s5ygk3slhxdrs4mvmpn3sq8m5s205abvp891q"; + }; + + buildInputs = [ goPackages.mesos-stats ]; + + meta = with lib; { + description = "Export Mesos metrics to Prometheus"; + homepage = https://github.com/prometheus/mesos_exporter; + licenses = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix new file mode 100644 index 000000000000..97169a0e298b --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-node-exporter-0.8.0"; + goPackagePath = "github.com/prometheus/node_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "node_exporter"; + rev = "aaf01e52e25883671fd67234b415df7abd0e4eac"; + sha256 = "0j1qvgsc2hcv50l9lyfivkzsyjkjp3w1yyqvd1gzfybk7hi59dya"; + }; + + buildInputs = [ + glog + go-runit + ntp + prometheus.client_golang + prometheus.client_model + protobuf + ]; + + meta = with lib; { + description = "Prometheus exporter for machine metrics"; + homepage = https://github.com/prometheus/node_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix new file mode 100644 index 000000000000..db66e963208e --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +with goPackages; + +buildGoPackage rec { + name = "prometheus-pushgateway-${version}"; + version = "0.1.0"; + goPackagePath = "github.com/prometheus/pushgateway"; + rev = "3f1d42dade342ddb88381607358bae61a0a6b6c7"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "pushgateway"; + sha256 = "1wqxbl9rlnxszp9ylvdbx6f5lyj2z0if3x099fnjahbqmz8yhnf4"; + }; + + buildInputs = [ + go-bindata + protobuf + httprouter + golang_protobuf_extensions + prometheus.client_golang + ]; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildRev ${rev} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion go} + ''; + + preBuild = '' + ( + cd "go/src/$goPackagePath" + go-bindata ./resources/ + ) + ''; + + meta = with lib; { + description = + "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + homepage = https://github.com/prometheus/pushgateway; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix new file mode 100644 index 000000000000..231aa31802c8 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-statsd-bridge-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "9715b183150c7bed8a10affb23d33fb55c597180"; + goPackagePath = "github.com/prometheus/statsd_bridge"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "statsd_bridge"; + sha256 = "119024xb08qjwbhplpl5d94bjdfhn92w4ffn4kxr7aviri1gynfz"; + }; + + buildInputs = with goPackages; [ + fsnotify + prometheus.client_golang + ]; + + meta = with lib; { + description = "Receives StatsD-style metrics and exports them to Prometheus"; + homepage = https://github.com/prometheus/statsd_bridge; + licenses = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index d46b87d2dc1a..8c4db178e78a 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "2.12.1"; + version = "2.13.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "0jvk538hlwab7gy5150av4whfsm54kkx3q8r2ypjf7rwhy5aggav"; + sha256 = "0fb5f2rv7rgi60r4b80r1wzap1rngmajv378mdkcyhm7bj4ba31d"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix new file mode 100644 index 000000000000..a67afd45f39d --- /dev/null +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, jre +, python +, makeWrapper +, gawk +, bash +, getopt +}: + +let + + version = "2.0.13"; + sha256 = "125yga0h055fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; + +in + +stdenv.mkDerivation rec { + name = "cassandra-${version}"; + + src = fetchurl { + inherit sha256; + url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir $out + mv * $out + + for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade + do wrapProgram $out/bin/$cmd \ + --set JAVA_HOME ${jre} \ + --prefix PATH : ${bash}/bin \ + --prefix PATH : ${getopt}/bin \ + --prefix PATH : ${gawk}/bin + done + + wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin + ''; + + meta = with stdenv.lib; { + homepage = http://cassandra.apache.org/; + description = "A massively scalable open source NoSQL database"; + platforms = with platforms; all; + license = with licenses; asl20; + maintainers = with maintainers; [ nckx rushmorem ]; + }; +} diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 635861ab9efa..99292e2f4426 100644 --- a/pkgs/servers/nosql/cassandra/default.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -8,13 +8,19 @@ , getopt }: -let version = "2.1.3"; -in stdenv.mkDerivation rec { +let + + version = "2.1.3"; + sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz"; + +in + +stdenv.mkDerivation rec { name = "cassandra-${version}"; src = fetchurl { + inherit sha256; url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; - sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz"; }; buildInputs = [ makeWrapper ]; @@ -39,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; license = with licenses; asl20; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 03a3a9cd43af..92b1b73d0a0f 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -4,14 +4,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "influxdb-${version}"; - version = "0.8.2"; + version = "0.8.3"; arch = if stdenv.system == "x86_64-linux" then "amd64" else "386"; src = fetchurl { url = "http://s3.amazonaws.com/influxdb/${name}.${arch}.tar.gz"; sha256 = if arch == "amd64" then - "0m27agjf9v76w5xms8w3z91k4hxw832nxqr030qzqxynwbxj0vg6" else - "0bdjpdq4yhfsmvl756xhkd1d8565d19g66l5rlymksc71ps8kbj6"; + "e625902d403434c799f9d9ffc2592a3880f82d435423fde7174e5e4fe0f41148" else + "5abe9f432553e66c8aff86c4311eba16b874678d04b52bfe9e2019c01059ec78"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index d307915d2f50..dbfaf313d8ab 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let version = "2.6.7"; +let version = "2.6.8"; system-libraries = [ "pcre" "boost" @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1jbbvpp9xisxm7rpx8mm25413b01rrssqcl03349rwgamp8m88ji"; + sha256 = "01hs65xswggy628hxka2f63qvwz5rfhqlkb05kr20wz1kl6zd5qr"; }; nativeBuildInputs = [ scons ]; @@ -41,6 +41,9 @@ in stdenv.mkDerivation rec { # bug #482576 sed -i -e "/-Werror/d" src/third_party/v8/SConscript + # fix inclusion of std::swap + sed -i '1i #include <algorithm>' src/mongo/shell/linenoise_utf8.h + # fix environment variable reading substituteInPlace SConstruct \ --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" diff --git a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch new file mode 100644 index 000000000000..12fcdb4fd02c --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch @@ -0,0 +1,13 @@ +diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp +index d14d8d9..c64d7fd 100644 +--- a/extractor/extractor_options.cpp ++++ b/extractor/extractor_options.cpp +@@ -50,7 +50,7 @@ bool ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &e + boost::program_options::options_description config_options("Configuration"); + config_options.add_options()("profile,p", + boost::program_options::value<boost::filesystem::path>( +- &extractor_config.profile_path)->default_value("profile.lua"), ++ &extractor_config.profile_path)->default_value("@out@/profiles/car.lua"), + "Path to LUA routing profile")( + "threads,t", + boost::program_options::value<unsigned int>(&extractor_config.requested_num_threads) diff --git a/pkgs/servers/osrm-backend/4.5.0-openmp.patch b/pkgs/servers/osrm-backend/4.5.0-openmp.patch new file mode 100644 index 000000000000..f4010131f602 --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-openmp.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6a40f9..87ca301 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,9 +261,10 @@ target_link_libraries(OSRM ${STXXL_LIBRARY}) + target_link_libraries(osrm-extract ${STXXL_LIBRARY}) + target_link_libraries(osrm-prepare ${STXXL_LIBRARY}) + +-if(MINGW) +- # STXXL needs OpenMP library +- target_link_libraries(osrm-extract gomp) ++find_package(OpenMP) ++if (OPENMP_FOUND) ++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + + find_package( OSMPBF REQUIRED ) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix new file mode 100644 index 000000000000..37d3650f6833 --- /dev/null +++ b/pkgs/servers/osrm-backend/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}: + +stdenv.mkDerivation rec { + name = "osrm-backend-4.5.0"; + + src = fetchurl { + url = "https://github.com/Project-OSRM/osrm-backend/archive/v4.5.0.tar.gz"; + sha256 = "af61e883051f2ecb73520ace6f17cc6da30edc413208ff7cf3d87992eca0756c"; + }; + + patches = [ + ./4.5.0-openmp.patch + (substituteAll { + src = ./4.5.0-default-profile-path.template.patch; + }) + ]; + + buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; + + postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; + + meta = { + homepage = https://github.com/Project-OSRM/osrm-backend/wiki; + description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project."; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix index f2152b65df3c..e53690ebc113 100644 --- a/pkgs/servers/portmap/default.nix +++ b/pkgs/servers/portmap/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = http://neil.brown.name/portmap/; license = "BSD"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index ca0a331e3212..39a7460674eb 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.26.0"; + version = "0.27.3-sp2"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; - rev = "0.26.2"; - sha256 = "06hcc3nnzp9f6j00890f41rrn4djwlcwkzmqnw4yra74sswgji5y"; + rev = version; + sha256 = "1q4i87cc7yks9slpgrfnlimngm45n3h035ssjvywmfwhhh7r9m3y"; }; postPatch = '' @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { buildPhase = "scons build/rippled"; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin cp build/rippled $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = https://ripple.com; - maintainers = [ stdenv.lib.maintainers.emery ]; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.emery maintainers.offline ]; + license = licenses.isc; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index ad8a6de6729b..e2818a1f6484 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.24"; + name = "samba-3.6.25"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i"; + sha256 = "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"; }; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] diff --git a/pkgs/servers/samba/4.x-heimdal-compat.patch b/pkgs/servers/samba/4.x-heimdal-compat.patch new file mode 100644 index 000000000000..35f01e4001ec --- /dev/null +++ b/pkgs/servers/samba/4.x-heimdal-compat.patch @@ -0,0 +1,16 @@ +diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c +index bb476e1..0a407a4 100644 +--- a/source4/kdc/kdc.c ++++ b/source4/kdc/kdc.c +@@ -967,9 +967,9 @@ static void kdc_task_init(struct task_server *task) + * The old behavior in the _kdc_get_preferred_key() + * function is use_strongest_server_key=TRUE. + */ +- kdc->config->as_use_strongest_session_key = false; ++ kdc->config->tgt_use_strongest_session_key = false; ++ kdc->config->svc_use_strongest_session_key = false; + kdc->config->preauth_use_strongest_session_key = false; +- kdc->config->tgs_use_strongest_session_key = false; + kdc->config->use_strongest_server_key = true; + + /* Register hdb-samba4 hooks for use as a keytab */ diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch index 68d0cf76aa55..c3e013f7862b 100644 --- a/pkgs/servers/samba/4.x-no-persistent-install.patch +++ b/pkgs/servers/samba/4.x-no-persistent-install.patch @@ -16,3 +16,45 @@ index aa4e66e..d53f433 100755 # these might be on non persistent storage - bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") + #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") +diff --git a/ctdb/wscript b/ctdb/wscript +index 3e2a992..1b93a4d 100755 +--- a/ctdb/wscript ++++ b/ctdb/wscript +@@ -473,10 +473,10 @@ def build(bld): + for t in etc_subdirs: + files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir) + for fmode in files: +- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0], ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0], + destname=fmode[0], chmod=fmode[1]) + +- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions', + destname='functions') + + etc_scripts = [ +@@ -489,18 +489,18 @@ def build(bld): + ] + + for t in etc_scripts: +- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t, ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t, + destname=t, chmod=0755) + +- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers', + destname='ctdb') + +- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', + destname='README') + +- bld.install_dir(bld.env.CTDB_LOGDIR) +- bld.install_dir(bld.env.CTDB_RUNDIR) +- bld.install_dir(bld.env.CTDB_VARDIR) ++ #bld.install_dir(bld.env.CTDB_LOGDIR) ++ #bld.install_dir(bld.env.CTDB_RUNDIR) ++ #bld.install_dir(bld.env.CTDB_VARDIR) + + sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION + t = bld.SAMBA_GENERATOR('ctdb-pc', diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c290f75cd0dc..2cc3cc69d3f0 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns , docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser -, pythonPackages, libbsd +, pythonPackages, libbsd, nss_wrapper, socket_wrapper, uid_wrapper, libarchive # source3/wscript optionals -, heimdal ? null # Samba only supports heimdal for kerberos although mit-krb5 is being worked on +, kerberos ? null , openldap ? null , cups ? null , pam ? null @@ -11,7 +11,6 @@ , acl ? null , libaio ? null , fam ? null -, ctdb ? null , ceph ? null , glusterfs ? null @@ -31,21 +30,24 @@ }: stdenv.mkDerivation rec { - name = "samba-4.1.16"; + name = "samba-4.2.0"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0yx840qg5q6syq81439v3pbwawacm7nwnnvph85za9gsgcb9r80j"; + sha256 = "03s9pjdgq6nlv2lcnlmxlhhj8m5drgv6z4xy9zkgwwd92mw0b9k6"; }; - patches = [ ./4.x-no-persistent-install.patch ]; + patches = [ + ./4.x-no-persistent-install.patch + ./4.x-heimdal-compat.patch + ]; buildInputs = [ python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42 readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit - libbsd + libbsd nss_wrapper socket_wrapper uid_wrapper libarchive - heimdal openldap cups pam avahi acl libaio fam ctdb ceph glusterfs + kerberos openldap cups pam avahi acl libaio fam ceph glusterfs libiconv gettext @@ -54,6 +56,11 @@ stdenv.mkDerivation rec { zlib ncurses libcap ]; + postPatch = '' + # Removes absolute paths in scripts + sed -i 's,/sbin/,,g' ctdb/config/functions + ''; + enableParallelBuilding = true; configureFlags = [ @@ -61,7 +68,7 @@ stdenv.mkDerivation rec { "--with-static-modules=NONE" "--with-shared-modules=ALL" "--with-winbind" - ] ++ (if heimdal != null then [ "--with-ads" ] else [ "--without-ads" ]) + ] ++ (if kerberos != null then [ "--with-ads" ] else [ "--without-ads" ]) ++ (if openldap != null then [ "--with-ldap" ] else [ "--without-ldap" ]) ++ (if cups != null then [ "--enable-cups" ] else [ "--disable-cups" ]) ++ (if pam != null then [ "--with-pam" "--with-pam_smbpass" ] @@ -77,30 +84,51 @@ stdenv.mkDerivation rec { "--with-syslog" "--with-automount" ] ++ (if libaio != null then [ "--with-aio-support" ] else [ "--without-aio-support" ]) - ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ]) - ++ (if ctdb != null then [ "--with-cluster-support" "--with-ctdb-dir=${ctdb}" ] - else [ "--without-cluster-support" ]) - ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ]) + ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ]) ++ [ + "--with-cluster-support" + ] ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ]) ++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [ + # dynconfig/wscript options "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" # buildtools/wafsamba/wscript options - "--bundled-libraries=${if heimdal != null then "NONE" else "com_err"}" + "--bundled-libraries=${if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"}" "--private-libraries=NONE" "--builtin-libraries=replace" ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ]) ++ (if gettext != null then [ "--with-gettext=${gettext}" ] else [ "--without-gettext" ]) ++ [ + # source4/lib/tls/wscript options ] ++ (if gnutls != null && libgcrypt != null && libgpgerror != null then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [ + # wscript options - ] ++ stdenv.lib.optional (heimdal == null) "--without-ad-dc"; + ] ++ stdenv.lib.optional (kerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5" + ++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [ + + # ctdb/wscript + "--enable-infiniband" + "--enable-pmda" + ]; stripAllList = [ "bin" "sbin" ]; + postFixup = '' + export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" + read -r -d "" SCRIPT << EOF + [ -z "\$SAMBA_LIBS" ] && exit 1; + BIN='{}'; + OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')"; + ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')"; + patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; + patchelf --shrink-rpath "\$BIN"; + EOF + find $out -type f -exec $SHELL -c "$SCRIPT" \; + ''; + meta = with stdenv.lib; { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6280f2a82666..23a09f1d54e0 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,21 +1,55 @@ -{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }: +{ stdenv, fetchurl, cmake, ncurses, openssl, pcre, boost, judy, bison, libxml2 +, libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames +}: +with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.16"; + version = "10.0.17"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1r6dxzgzwl0qshw67168sjnzzwspmwb7kl618f23wkhp7rgll4s4"; + sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww"; }; - buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libaio - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ] + ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; - cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; + cmakeFlags = [ + "-DBUILD_CONFIG=mysql_release" + "-DDEFAULT_CHARSET=utf8" + "-DDEFAULT_COLLATION=utf8_general_ci" + "-DENABLED_LOCAL_INFILE=ON" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + "-DWITH_READLINE=ON" + "-DWITH_ZLIB=system" + "-DWITH_SSL=system" + "-DWITH_PCRE=system" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_EXTRA_CHARSETS=complex" + "-DWITH_EMBEDDED_SERVER=ON" + "-DWITH_ARCHIVE_STORAGE_ENGINE=1" + "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" + "-DWITH_INNOBASE_STORAGE_ENGINE=1" + "-DWITH_PARTITION_STORAGE_ENGINE=1" + "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" + "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; @@ -30,13 +64,13 @@ stdenv.mkDerivation rec { --replace basedir=\"\" basedir=\"$out\" ''; - passthru.mysqlVersion = "5.5"; + passthru.mysqlVersion = "5.6"; - meta = { + meta = with stdenv.lib; { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 194f4b2bcb34..c0b8403a9bc3 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, postgresql }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.0"; + name = "pgpool-II-3.4.1"; src = fetchurl { url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "1aind5rbdld5ip92xlh4f6dgvdc4zxzgzi5n33xbvdrsrvagbc4j"; + sha256 = "11fy4lvh2n04zmywy4vhp229yxdw8fbirrlvz44j1vnarkb664pd"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index b4611a4bb10c..d77a539cb5d9 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses, readline }: +{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: let version = "8.4.22"; in @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - buildInputs = [ zlib ncurses readline ]; + buildInputs = [ zlib ncurses readline openssl ]; LC_ALL = "C"; + configureFlags = [ "--with-openssl" ]; + patches = [ ./less-is-more.patch ]; passthru = { inherit readline; }; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 85c14931eedc..340307c01f90 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.0.18"; in +let version = "9.0.19"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003"; + sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline openssl ]; LC_ALL = "C"; + configureFlags = [ "--with-openssl" ]; + patches = [ ./less-is-more.patch ]; passthru = { diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index ef335a77ab6f..5b0774d6229c 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.1.14"; in +let version = "9.1.15"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522"; + sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline openssl ]; enableParallelBuilding = true; LC_ALL = "C"; + configureFlags = [ "--with-openssl" ]; + patches = [ ./less-is-more.patch ]; postInstall = diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index fdfb5a17b54f..d09cde5b995f 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, zlib, readline }: +{ stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.2.9"; in +let version = "9.2.10"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197"; + sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; }; - buildInputs = [ zlib readline ]; + buildInputs = [ zlib readline openssl ]; enableParallelBuilding = true; makeFlags = [ "world" ]; + configureFlags = [ "--with-openssl" ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 40f07d8ffe15..6467ce80af1e 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid }: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}: with stdenv.lib; -let version = "9.3.5"; in +let version = "9.3.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0"; + sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; }; - buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + buildInputs = [ zlib readline openssl ] + ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; - configureFlags = optional (!stdenv.isDarwin) - '' - --with-ossp-uuid - ''; + configureFlags = [ "--with-openssl" ] + ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 4e2d77ac6da4..6649975d7902 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid }: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: with stdenv.lib; -let version = "9.4.0"; in +let version = "9.4.1"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "7a35c3cb77532f7b15702e474d7ef02f0f419527ee80a4ca6036fffb551625a5"; + sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; }; - buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + buildInputs = [ zlib readline openssl ] + ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; - configureFlags = optional (!stdenv.isDarwin) - '' - --with-ossp-uuid - ''; + configureFlags = [ "--with-openssl" ] + ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix new file mode 100644 index 000000000000..dc855294fbd3 --- /dev/null +++ b/pkgs/servers/u9fs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchhg }: + +stdenv.mkDerivation { + name = "u9fs-20110513"; + src = fetchhg { + url = https://code.google.com/p/u9fs; + rev = "9474edb23b11"; + sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6"; + }; + + installPhase = + '' + mkdir -p $out/bin $out/share/man4 + cp u9fs $out/bin; cp u9fs.man $out/share/man4 + ''; + + meta = with stdenv.lib; + { description = "Serve 9P from Unix"; + homepage = https://code.google.com/p/u9fs; + license = licenses.free; + maintainers = [ maintainers.emery ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index da537c5c453a..2a1fb67b4cb6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -25,11 +25,11 @@ let }) // {inherit ;}; bdftopcf = (mkDerivation "bdftopcf" { - name = "bdftopcf-1.0.4"; + name = "bdftopcf-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2; - sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga"; + url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; + sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; buildInputs = [pkgconfig libXfont ]; }) // {inherit libXfont ;}; @@ -515,11 +515,11 @@ let }) // {inherit ;}; iceauth = (mkDerivation "iceauth" { - name = "iceauth-1.0.6"; + name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2; - sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx"; + url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; + sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; buildInputs = [pkgconfig libICE xproto ]; }) // {inherit libICE xproto ;}; @@ -705,11 +705,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.5.0"; + name = "libXfont-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2; - sha256 = "0py2c498lrq6wrj9al6nj57v2ypid9cz0zzhc0hjndgrmp254g1s"; + url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2; + sha256 = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -895,11 +895,11 @@ let }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.2"; + name = "libpciaccess-0.13.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2; - sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb"; + url = mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2; + sha256 = "1qy2i776jb7912dxqylv59p41sa0hw8lmn7asd3ywvp0wk56rmvc"; }; buildInputs = [pkgconfig zlib ]; }) // {inherit zlib ;}; @@ -935,11 +935,11 @@ let }) // {inherit kbproto libX11 ;}; libxshmfence = (mkDerivation "libxshmfence" { - name = "libxshmfence-1.1"; + name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2; - sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv"; + url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; + sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -985,11 +985,11 @@ let }) // {inherit ;}; mkfontscale = (mkDerivation "mkfontscale" { - name = "mkfontscale-1.1.1"; + name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2; - sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14"; + url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; + sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1065,11 +1065,11 @@ let }) // {inherit ;}; sessreg = (mkDerivation "sessreg" { - name = "sessreg-1.0.8"; + name = "sessreg-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2; - sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf"; + url = mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2; + sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -1561,8 +1561,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -1765,11 +1765,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.0.2"; + name = "xf86-video-vmware-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2; - sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; + sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; @@ -2025,11 +2025,11 @@ let }) // {inherit libX11 xproto ;}; xproto = (mkDerivation "xproto" { - name = "xproto-7.0.26"; + name = "xproto-7.0.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2; - sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3"; + url = mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2; + sha256 = "030ix881p0crnd4bc01nz6cs0afmfv6ivsyyhf0h1j1mnak26vr4"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c91f0c32c3cd..bf1242828762 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -61,6 +61,15 @@ in preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; + mkfontscale = attrs: attrs // { + patches = lib.singleton (args.fetchpatch { + name = "mkfontscale-fix-sig11.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=113951"; + sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim"; + }); + patchFlags = [ "-p0" ]; + }; + libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb"; @@ -221,11 +230,6 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker - patches = [( args.fetchpatch { - url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/patch/" - + "?id=4664412d7a5266d2b392957406b34abc5db95e48"; - sha256 = "1gix83f1is91iq1zd66nj4k72jm24jjjd9s9l0bzpzhgc8smqdk2"; - })]; }; xf86videoqxl = attrs: attrs // { @@ -241,7 +245,7 @@ in }; xkbcomp = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\""; + configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; }; xkeyboardconfig = attrs: attrs // { @@ -298,6 +302,7 @@ in ]; patches = commonPatches; configureFlags = [ + "--enable-kdrive" # not built by default "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index bb1c5b9291fd..1e16bbef97f2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -1,5 +1,5 @@ mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2 +mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 @@ -47,16 +47,16 @@ mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 -mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2 +mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 -mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2 @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 @@ -88,13 +88,13 @@ mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2 +mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 @@ -154,7 +154,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2 mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index cc3108841b61..af51ab4e7665 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 823867abc0fe..d7d69c00c5fe 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924"; + sha256 = "1pgnz5lapm4qk48a13k9698jaswybzlbz2nyc621d852ldf0vhn6"; }; buildInputs = [ ncurses libiconv ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 2502882123eb..c415a297d845 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -50,10 +50,9 @@ rec { stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" xargsFlags=" " export MACOSX_DEPLOYMENT_TARGET=10.7 - export SDKROOT= - export SDKROOT_X=/ # FIXME: impure! - export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT_X/usr/include -F$SDKROOT_X/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" - export NIX_LDFLAGS_AFTER+=" -L$SDKROOT_X/usr/lib" + export SDKROOT=$(/usr/bin/xcrun --sdk macosx$(/usr/bin/xcrun --show-sdk-version) --show-sdk-path 2> /dev/null || echo /) + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" export CMAKE_OSX_ARCHITECTURES=x86_64 ''; diff --git a/pkgs/stdenv/darwin/prehook.nix b/pkgs/stdenv/darwin/prehook.nix deleted file mode 100644 index f38cd517f00e..000000000000 --- a/pkgs/stdenv/darwin/prehook.nix +++ /dev/null @@ -1,9 +0,0 @@ -'' - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - export MACOSX_DEPLOYMENT_TARGET=10.9 - export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || true) - export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" - export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" -'' diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 086c0b45706f..751366e38d23 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -200,14 +200,9 @@ let isCygwin = system == "i686-cygwin" || system == "x86_64-cygwin"; isFreeBSD = system == "i686-freebsd" - || system == "x86_64-freebsd"; + || system == "x86_64-freebsd"; isOpenBSD = system == "i686-openbsd" - || system == "x86_64-openbsd"; - isBSD = system == "i686-freebsd" - || system == "x86_64-freebsd" - || system == "i686-openbsd" - || system == "x86_64-openbsd" - || system == "x86_64-darwin"; + || system == "x86_64-openbsd"; isi686 = system == "i686-linux" || system == "i686-gnu" || system == "i686-freebsd" diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3838f3e12d24..d432206a9e13 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -288,8 +288,6 @@ rec { ]; overrides = pkgs: { - inherit cc; - gcc = cc; inherit (stage4.pkgs) @@ -298,8 +296,8 @@ rec { attr acl paxctl zlib pcre; }; }; - - + + testBootstrapTools = let defaultPkgs = allPackages { inherit system platform; }; in derivation { @@ -310,7 +308,7 @@ rec { buildCommand = '' export PATH=${bootstrapTools}/bin - + ls -l mkdir $out mkdir $out/bin diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 925b90c964f2..935af7d4c36b 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -18,13 +18,6 @@ rec { export NIX_ENFORCE_PURITY= ''; - prehookDarwin = '' - ${prehookBase} - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - ${import ../darwin/prehook.nix} - ''; - prehookFreeBSD = '' ${prehookBase} @@ -77,7 +70,6 @@ rec { import ../generic { preHook = - if system == "x86_64-darwin" then prehookDarwin else if system == "i686-freebsd" then prehookFreeBSD else if system == "x86_64-freebsd" then prehookFreeBSD else if system == "i686-openbsd" then prehookOpenBSD else diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 684713bebb1a..c5c0e3ce7809 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -14,12 +14,7 @@ let ldPath = makeLibraryPath ([primusLib] ++ optional (primusLib_i686 != null) primusLib_i686); primusrun = writeScript "primusrun" '' - export LD_LIBRARY_PATH=${ldPath}:\$LD_LIBRARY_PATH - # see: https://github.com/amonakov/primus/issues/138 - # On my system, as of 3.16.6, the intel driver dies when the pixel buffers try to read from the - # source memory directly. Setting PRIMUS_UPLOAD causes an indirection through textures which - # avoids this issue. - export PRIMUS_UPLOAD=1 + export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" ''; in diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix new file mode 100644 index 000000000000..62f6e65bc214 --- /dev/null +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libxcb }: + +stdenv.mkDerivation rec { + name = "wmutils-core-${version}"; + version = "1.0"; + + src = fetchurl { + url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; + sha256 = "10vn56rbrjykcrjr06ki4qc12sri1ywrcvm89nmxlqhkxx4i239p"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Set of window manipulation tools"; + homepage = https://github.com/wmutils/core; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 688c0e12d938..a18ee18668b7 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg, x264, libvpx, pil, libwebp }: +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, ffmpeg, x264, libvpx, pil, libwebp +, libfakeXinerama }: buildPythonPackage rec { - name = "xpra-0.11.6"; + name = "xpra-0.14.19"; namePrefix = ""; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.bz2"; - sha256 = "0n3lr8nrfmrll83lgi1nzalng902wv0dcmcyx4awnman848dxij0"; + url = "https://www.xpra.org/src/${name}.tar.xz"; + sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m"; }; buildInputs = [ @@ -18,25 +20,27 @@ buildPythonPackage rec { xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage - xorg.libXrandr + xorg.libXrandr xorg.libxkbfile pango cairo gdk_pixbuf atk gtk glib ffmpeg libvpx x264 libwebp + + makeWrapper ]; propagatedBuildInputs = [ pil pygtk pygobject ]; - # Even after i tried monkey patching, their tests just fail, looks like - # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177 - doCheck = false; + postPatch = '' + sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py + ''; preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" ''; - setupPyBuildFlags = ["--enable-Xdummy"]; + setupPyBuildFlags = ["--with-Xdummy"]; preInstall = '' # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix @@ -44,9 +48,26 @@ buildPythonPackage rec { sed -i '/ = data_files/d' setup.py ''; + postInstall = '' + wrapProgram $out/bin/xpra \ + --set XKB_BINDIR "${xkbcomp}/bin" \ + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + ''; + + #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though + #postFixup = '' + # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra + # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + #''; + + meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; }; } diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix new file mode 100644 index 000000000000..04bcd1195147 --- /dev/null +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, buildPythonPackage +, python, cython, pkgconfig +, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, ffmpeg, x264, libvpx, libwebp +, libfakeXinerama }: + +buildPythonPackage rec { + name = "xpra-0.14.19"; + namePrefix = ""; + + src = fetchurl { + url = "https://www.xpra.org/src/${name}.tar.xz"; + sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m"; + }; + + buildInputs = [ + pkgconfig + + xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto + xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto + xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage + xorg.libXrandr xorg.libxkbfile + + pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection + + ffmpeg libvpx x264 libwebp + + makeWrapper + ]; + + propagatedBuildInputs = [ + pygobject3 pycairo cython + ]; + + postPatch = '' + sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" + ''; + setupPyBuildFlags = [ "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; + + + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out + sed -i '/ = data_files/d' setup.py + ''; + + postInstall = '' + wrapProgram $out/bin/xpra \ + --set XKB_BINDIR "${xkbcomp}/bin" \ + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + ''; + + #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though + #postFixup = '' + # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra + # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + #''; + + + meta = { + homepage = http://xpra.org/; + description = "Persistent remote applications for X"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix new file mode 100644 index 000000000000..4ca509f8b936 --- /dev/null +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libX11, libXinerama }: + +stdenv.mkDerivation rec { + name = "libfakeXinerama-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://www.xpra.org/src/${name}.tar.bz2"; + sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; + }; + + buildInputs = [ libX11 libXinerama ]; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + gcc -O2 -Wall fakeXinerama.c -fPIC -o libfakeXinerama.so.1.0 -shared + ''; + + installPhase = '' + mkdir -p $out/lib + cp libfakeXinerama.so.1.0 $out/lib + ln -s libXinerama.so.1.0 $out/lib/libXinerama.so.1 + ln -s libXinerama.so.1 $out/lib/libXinerama.so + ''; + + meta = { + homepage = http://xpra.org/; + description = "fakeXinerama for Xpra"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix new file mode 100644 index 000000000000..8c973f0e53a3 --- /dev/null +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, autoconf, libxcomp }: + +let version = "3.5.0.31"; in +stdenv.mkDerivation { + name = "nxproxy-${version}"; + + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11"; + }; + + meta = with stdenv.lib; { + description = "NX compression proxy"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ autoconf libxcomp ]; + + preConfigure = '' + cd nxproxy/ + autoconf + ''; + + makeFlags = [ "exec_prefix=$(out)" ]; +} diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index a7ec73f55d73..cc341922ddb1 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4.3"; name = "tigervnc-${version}"; src = fetchurl { url = "https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz"; - sha256 = "161bhibic777g47lbjgdnvjhkkdzxrzmxz9rw9sim3q0gcbp0vz3"; + sha256 = "0938fmlll1vxccc65hdhzdxii7c1v65n2nbgizjddprj5gdh69hb"; }; inherit fontDirectories; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { tar xf ${xorgserver.src} cp -R xorg*/* unix/xserver pushd unix/xserver - for a in $xorgPatches ../xserver114.patch + for a in $xorgPatches ../xserver116.patch do patch -p1 < $a done diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 0bfa81cb9478..6a61ded4b198 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -18,6 +18,15 @@ stdenv.mkDerivation { }) ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; + postPatch = let pp = + fetchpatch { + name = "CVE-2015-1197.diff"; + url = "https://marc.info/?l=oss-security&m=142289947619786&w=2"; + sha256 = "0fr95bj416zfljv40fl1sh50059d18wdmfgaq8ad2fqi5cnbk859"; + }; + # one "<" and one "&" sign get mangled in the patch + in "cat ${pp} | sed 's/</</;s/&/\\&/' | patch -p1"; + meta = { homepage = http://www.gnu.org/software/cpio/; description = "A program to create or extract from cpio archives"; diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index f964aded2a42..6c9559f46e66 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }: stdenv.mkDerivation rec { - name = "dar-2.4.15"; + name = "dar-2.4.17"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "1x694g7yhach8swkjwbkdryp74r3rh0d2lrsa8mnf0azp0mrj1ln"; + sha256 = "0g43g6a633j6ipgwdvgwngnrnzhfwkhl2iwih1314xwbd4wir1jx"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt ] diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 0d56e79d0248..146f9bea87a0 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { '' # Fix for building on Glibc 2.16. Won't be needed once the # gnulib in sharutils is updated. - sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h + sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h ''; # GNU Gettext is needed on non-GNU platforms. @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "Tools for remote synchronization and `shell archives'"; - longDescription = '' GNU shar makes so-called shell archives out of many files, preparing them for transmission by electronic mail services. A shell archive @@ -43,11 +42,8 @@ stdenv.mkDerivation rec { by a copy of the shell. unshar may also process files containing concatenated shell archives. ''; - homepage = http://www.gnu.org/software/sharutils/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/pkgs/tools/archivers/unzip/CVE-2014-9636.diff index aeaf3e70de6e..d4c7f752975e 100644 --- a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff +++ b/pkgs/tools/archivers/unzip/CVE-2014-9636.diff @@ -1,6 +1,6 @@ -From a9bfab5b52d08879bbc5e0991684b700127ddcff Mon Sep 17 00:00:00 2001 +From 190040ebfcf5395a6ccedede2cc9343d34f0a108 Mon Sep 17 00:00:00 2001 From: mancha <mancha1 AT zoho DOT com> -Date: Mon, 3 Nov 2014 +Date: Wed, 11 Feb 2015 Subject: Info-ZIP UnZip buffer overflow By carefully crafting a corrupt ZIP archive with "extra fields" that @@ -26,12 +26,13 @@ This patch ensures that when extra fields use STORED mode, the if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ -@@ -2226,6 +2227,12 @@ static int test_compr_eb(__G__ eb, eb_si +@@ -2226,6 +2227,13 @@ static int test_compr_eb(__G__ eb, eb_si eb_size <= (compr_offset + EB_CMPRHEADLEN))) return IZ_EF_TRUNC; /* no compressed data! */ + method = makeword(eb + (EB_HEADSIZE + compr_offset)); -+ if ((method == STORED) && (eb_size - compr_offset != eb_ucsize)) ++ if ((method == STORED) && ++ (eb_size - compr_offset - EB_CMPRHEADLEN != eb_ucsize)) + return PK_ERR; /* compressed & uncompressed + * should match in STORED + * method */ diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 405264c6f663..5f8a03e2d67b 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: let s = # Generated upstream information rec { baseName="zpaq"; - version="700"; + version="704"; name="${baseName}-${version}"; - hash="1scn7xly1bmx3xr17mn32mqvpvpp53niryrqm7h0xkksmc623z9c"; - url="http://mattmahoney.net/dc/zpaq700.zip"; - sha256="1scn7xly1bmx3xr17mn32mqvpvpp53niryrqm7h0xkksmc623z9c"; + hash="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91"; + url="http://mattmahoney.net/dc/zpaq704.zip"; + sha256="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91"; }; buildInputs = [ unzip ]; - isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD; + isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; isx86 = stdenv.isi686 || stdenv.isx86_64; compileFlags = "" + (stdenv.lib.optionalString isUnix " -Dunix -pthread ") diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index cfb76d2ff9bf..65f40f68f550 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: let s = # Generated upstream information rec { @@ -12,7 +12,7 @@ let buildInputs = [ unzip ]; - isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD; + isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; isx86 = stdenv.isi686 || stdenv.isx86_64; compileFlags = "" + (stdenv.lib.optionalString isUnix " -Dunix -pthread ") diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 30b608c5ba4d..d310d5017eda 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://liquidsoap.fm/; maintainers = with maintainers; [ emery ]; license = licenses.gpl2; - platform = ocaml.meta.platforms; + platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 92091c18df35..ea74d83ed9e2 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "volumeicon-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.0.tar.gz"; - sha256 = "10np3fvfzyxkjw0kfzg81a7kcxda1fz6nkqffkijbay5ksgigwg5"; + url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.1.tar.gz"; + sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14"; }; buildInputs = [ gtk3 pkgconfig intltool alsaLib ]; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 196fce0d98ac..44b121117ad5 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { is just a bonus. ''; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 51f61fcf239d..3846ec97d3b8 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: stdenv.mkDerivation rec { - version = "0.616"; + version = "0.621"; name = "lrzip-${version}"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2"; - sha256 = "1bimlbsfzjvippbma08ifm1grcy9i7avryrkdvnvrfyqnj6mlbcq"; + sha256 = "0szb1habydj9fwwrhgpjfws6v7hdphnqc5527i0vvc5rx2z6zhii"; }; buildInputs = [ zlib lzo bzip2 nasm perl ]; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index ba2c9eeb34de..b8db8d9e52ad 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.18.2"; in +let version = "3.19"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1v6zqac6c4xfkyd53wc3cfqqyb5w7zry3l2yl4rgspqy416xp3fx"; + sha256 = "1j1ni8baw6pgjh85jkdys8pzq870xy7z2n7ngn9r7g2f47bnafdj"; }; buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo + pkgconfig attr acl zlib libuuid e2fsprogs lzo asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c701e35c6837..89aca9c06c2c 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.92"; + version="0.93"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "0w5gkl2p4gdq5xppmrx0lnpfbhkird8v2wjx8grw8aja23lw7zcc"; + sha256 = "0fk6svs1c4ng3gwgj0albzz2hxny74ld44gq16cpgkgrdk4bsyi5"; }; patches = [ diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index ea96001a421b..4583dc1ba778 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,19 +1,30 @@ -{ stdenv, fetchurl, openssl, fuse, boost, rlog }: +{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl +, pkgconfig, rlog }: -stdenv.mkDerivation { - name = "encfs-1.7.4"; +let version = "1.8"; in +stdenv.mkDerivation rec { + name = "encfs-${version}"; - src = fetchurl { - url = "http://encfs.googlecode.com/files/encfs-1.7.4.tgz"; - sha256 = "1a3h47f4h0qdc0bf3vic1i8wrdw5nkx22mml4wsvmmrd9zqg0bi8"; + src = fetchFromGitHub { + sha256 = "1dp3558x9v5hqnjnrlnd0glrkcc23anl2mxhjirhhw8dyh1lzl5z"; + rev = "v${version}"; + repo = "encfs"; + owner = "vgough"; }; - buildInputs = [ boost fuse openssl rlog ]; + buildInputs = [ autoreconfHook boost fuse openssl perl pkgconfig rlog ]; - configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem"; + configureFlags = [ + "--with-boost-serialization=boost_wserialization" + "--with-boost-filesystem=boost_filesystem" + ]; - meta = { - homepage = http://www.arg0.net/encfs; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://vgough.github.io/encfs; description = "Provides an encrypted filesystem in user-space via FUSE"; + license = with licenses; lgpl2; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 9712721021ea..46ded088c696 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "IBM JFS utilities"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 3eee59d458d3..ebec72c6d0aa 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.2"; + version = "2.2.3"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "1w2i5wy290y03hg72lhkrnmfhap04ki0kkv5m8q60a2frbv6ydql"; + sha256 = "17s7d2rdb6fwrfvpif573c8n0i4f21m09pzqdsc0kyy1qqdgnc1v"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; diff --git a/pkgs/tools/graphics/graphviz/cve-2014-9157.patch b/pkgs/tools/graphics/graphviz/cve-2014-9157.patch new file mode 100644 index 000000000000..66ce496ca748 --- /dev/null +++ b/pkgs/tools/graphics/graphviz/cve-2014-9157.patch @@ -0,0 +1,24 @@ +From https://lists.debian.org/debian-qa-packages/2014/12/msg00048.html , which +seems to come from Ubuntu. + +Subject: Fix format string vulnerability (CVE-2014-9157) in yyerror() routine +Origin: https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081 +Author: Emden R. Gansner + +--- + lib/cgraph/scan.l | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/lib/cgraph/scan.l +=================================================================== +--- a/lib/cgraph/scan.l ++++ b/lib/cgraph/scan.l +@@ -225,7 +225,7 @@ + agxbput (&xb, buf); + agxbput (&xb, yytext); + agxbput (&xb,"'\n"); +- agerr(AGERR,agxbuse(&xb)); ++ agerr(AGERR, "%s", agxbuse(&xb)); + agxbfree(&xb); + } + /* must be here to see flex's macro defns */ diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 31945c9f232c..2fcea02519a5 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo +, flex }: stdenv.mkDerivation rec { @@ -11,10 +12,16 @@ stdenv.mkDerivation rec { sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"; }; - patches = [ ./0001-vimdot-lookup-vim-in-PATH.patch ]; + patches = + [ ./0001-vimdot-lookup-vim-in-PATH.patch + + # NOTE: Once this patch is removed, flex can probably be removed from + # buildInputs. + ./cve-2014-9157.patch + ]; buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 668f86b83332..f9b7ad8fe64b 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.82"; + name = "pngcrush-1.7.83"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1cxg0a6x7sq0dh9ia8isgx3awwx1db96wq4n22rs31sm3niiw0fl"; + sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj"; }; configurePhase = '' diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix new file mode 100644 index 000000000000..df0790877acd --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }: + +let version = "1.5.4"; +in stdenv.mkDerivation { + name = "ibus-anthy-${version}"; + + meta = with stdenv.lib; { + description = "IBus interface to the anthy input method"; + homepace = https://code.google.com/p/ibus/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; + }; + + buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ]; + + postFixup = '' + for file in "$out"/libexec/*; do + wrapProgram "$file" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0 + done + ''; + + src = fetchurl { + url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz"; + sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031"; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix new file mode 100644 index 000000000000..c538d36ec591 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-qt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: + +stdenv.mkDerivation rec { + name = "ibus-qt-${version}"; + version = "1.3.2"; + + src = fetchurl { + url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz"; + sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76"; + }; + + buildInputs = [ + ibus cmake pkgconfig qt4 icu doxygen + ]; + + cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/ibus/; + description = "Qt4 interface to the ibus input method"; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 6b426169a708..6b426169a708 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 1da552a46e2c..160efe2ded8f 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }: +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}: stdenv.mkDerivation rec { version = "1.8.6"; diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index e5db7f26ef6f..c4515fde5fc4 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,25 +3,24 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.2"; + name = "abduco-0.4"; meta = { homepage = http://brain-dump.org/projects/abduco; license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; + maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "04hrlxb02h2j8vxjnj263slyzxgkf7sncxfm0iwds5097f85mdy8"; + sha256 = "1fxwg2s5w183p0rwzsxizy9jdnilv5qqs647l3wl3khny6fp58xx"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = []; - installPhase = '' make PREFIX=$out install ''; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index a94ad14ca229..3bd44fb07b7e 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: -let - version = "21.6.9"; +let + version = "22.2.4"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,23 +9,22 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "0js6jp9l83zxhd9bn8hjn4yf8gydnldrlmafgvlg3rd4i1v82649"; + sha256 = "816badb0721f735e2b86bdfa8b333112f3867343c7c2263c569f75b4ec91f475"; }; buildInputs = [ python bash ]; dontBuild = true; installPhase = '' - # don't check shell support (we're running with bash anyway) - sed -i -e 150,153d install.sh - - bash ./install.sh -d $out -p "" + python ./install.py -d $out -p "" chmod +x $out/etc/profile.d/* mkdir -p "$out/etc/bash_completion.d" - cp -v $out/etc/profile.d/autojump.bash "$out/etc/bash_completion.d" + cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d" # FIXME: What's the right place for `autojump.zsh'? + # This can be used as a workaround in .zshrc: + # . $HOME/.nix-profile/share/autojump/autojump.zsh ''; meta = { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 28f45d972e2a..1dc5bfaccfb3 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -18,6 +18,11 @@ let sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc"; }; + # The test tends to fail on btrfs and maybe other unusual filesystems. + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh + ''; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -77,6 +82,8 @@ let license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; }; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 57bd21dff239..0ca95127f11f 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4"; + version = "2.4.1"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "0yl3ca31ck732f4551svxw6lx1lrjr7rhld5v09v0bgm3z07nnrx"; + sha256 = "0grj0swh1q3c3bj3yxji80yhxb09yz62x1n5h8z7c3azq4rrv2w1"; }; buildInputs = [ curl jansson ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix new file mode 100644 index 000000000000..2d5d10054b5b --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchurl +, intltool +, libtool +, autoconf +, automake110x +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +, ddccontrol-db +}: + +let version = "0.4.2"; in +stdenv.mkDerivation { + name = "ddccontrol-${version}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ + intltool + libtool + autoconf + automake110x + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ddccontrol-db + ]; + + prePatch = '' + newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + mv configure.ac configure.ac.old + oldPath="\$" + oldPath+="{datadir}\/ddccontrol-db" + sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac + rm configure.ac.old + ''; + preConfigure = '' + autoreconf --install + ''; + + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + homepage = "http://ddccontrol.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; + }; +} + diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index a6ea96b77db5..eb8c026ab0f7 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile new file mode 100644 index 000000000000..41c5bde1acc8 --- /dev/null +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'fluentd' +gem 'fluent-plugin-elasticsearch' diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock new file mode 100644 index 000000000000..ba4cc4bb4a80 --- /dev/null +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -0,0 +1,49 @@ +GEM + remote: https://rubygems.org/ + specs: + cool.io (1.3.0) + elasticsearch (1.0.8) + elasticsearch-api (= 1.0.7) + elasticsearch-transport (= 1.0.7) + elasticsearch-api (1.0.7) + multi_json + elasticsearch-transport (1.0.7) + faraday + multi_json + faraday (0.9.1) + multipart-post (>= 1.2, < 3) + fluent-plugin-elasticsearch (0.7.0) + elasticsearch + fluentd (>= 0.10.43) + patron (~> 0) + fluentd (0.12.6) + cool.io (>= 1.2.2, < 2.0.0) + http_parser.rb (>= 0.5.1, < 0.7.0) + json (>= 1.4.3) + msgpack (>= 0.5.11, < 0.6.0) + sigdump (~> 0.2.2) + string-scrub (>= 0.0.3) + tzinfo (>= 1.0.0) + tzinfo-data (>= 1.0.0) + yajl-ruby (~> 1.0) + http_parser.rb (0.6.0) + json (1.8.2) + msgpack (0.5.11) + multi_json (1.11.0) + multipart-post (2.0.0) + patron (0.4.20) + sigdump (0.2.2) + string-scrub (0.0.5) + thread_safe (0.3.5) + tzinfo (1.2.2) + thread_safe (~> 0.1) + tzinfo-data (1.2015.1) + tzinfo (>= 1.0.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + fluent-plugin-elasticsearch + fluentd diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix new file mode 100644 index 000000000000..b659dafddeb8 --- /dev/null +++ b/pkgs/tools/misc/fluentd/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby, curl }: + +bundlerEnv { + name = "fluentd-0.12.6"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Fluentd data collector."; + homepage = http://www.fluentd.org/; + license = with licenses; asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix new file mode 100644 index 000000000000..4d0072c6afea --- /dev/null +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -0,0 +1,171 @@ +{ + "cool.io" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1s3x0a32gbr6sg4lb0yk5irh48z4260my6g5ssifyl54rh4b6lzh"; + }; + }; + "elasticsearch" = { + version = "1.0.8"; + source = { + type = "gem"; + sha256 = "0kfiza9p98gchqgd0a64ryw77wgy42b7hhy89ba1s2jy2kcm3ahl"; + }; + dependencies = [ + "elasticsearch-api" + "elasticsearch-transport" + ]; + }; + "elasticsearch-api" = { + version = "1.0.7"; + source = { + type = "gem"; + sha256 = "0fb7pmzhfl48zxkbx3ayc61x1gv3qvvs4xcp4yf1rxflz1iw6ck9"; + }; + dependencies = [ + "multi_json" + ]; + }; + "elasticsearch-transport" = { + version = "1.0.7"; + source = { + type = "gem"; + sha256 = "0p5yzbvgpw84asfj8ifbqckw6qbssc6xrw086qfh58kxpfnin0zc"; + }; + dependencies = [ + "faraday" + "multi_json" + ]; + }; + "faraday" = { + version = "0.9.1"; + source = { + type = "gem"; + sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fluent-plugin-elasticsearch" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "1jav4lqf9j3w014ksgl3zr05kg62lkc58xnhjjriqp3c1412vwpy"; + }; + dependencies = [ + "elasticsearch" + "fluentd" + "patron" + ]; + }; + "fluentd" = { + version = "0.12.6"; + source = { + type = "gem"; + sha256 = "04lrr133ci6m3j85cj2rhhjkw3b1r12fxcymk943lsdlrip0brr1"; + }; + dependencies = [ + "cool.io" + "http_parser.rb" + "json" + "msgpack" + "sigdump" + "string-scrub" + "tzinfo" + "tzinfo-data" + "yajl-ruby" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "msgpack" = { + version = "0.5.11"; + source = { + type = "gem"; + sha256 = "1jmi0i3j8xfvidx6ivbcbdwpyf54r0d7dc4rrq1jbvhd1ffvr79w"; + }; + }; + "multi_json" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; + }; + }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; + "patron" = { + version = "0.4.20"; + source = { + type = "gem"; + sha256 = "0wdgjazzyllnajkzgdh55q60mlczq8h5jhwpzisrj2i8izrq45zb"; + }; + }; + "sigdump" = { + version = "0.2.2"; + source = { + type = "gem"; + sha256 = "1h4d4vfg1g3wbbmqahmk7khzhswk5mjv4hwbs7bhmp808h8mz973"; + }; + }; + "string-scrub" = { + version = "0.0.5"; + source = { + type = "gem"; + sha256 = "0fy4qby2az268qzmf00mb3p0hiqgshz9g6kvgl5vg76y90hl178g"; + }; + }; + "thread_safe" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + }; + }; + "tzinfo" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "tzinfo-data" = { + version = "1.2015.1"; + source = { + type = "gem"; + sha256 = "1x6fa8ayd2kal397d5gdsdg0fjqynfqv1n9n0q702mq839dw593h"; + }; + dependencies = [ + "tzinfo" + ]; + }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index b1e5e4dbd1ce..cb561e8172fe 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}: +{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}: stdenv.mkDerivation { name = "grub-0.97-patch-1.12"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # Autoconf/automake required for the splashimage patch. - buildInputs = [autoconf automake]; + buildInputs = [autoconf automake texinfo]; prePatch = '' unpackFile $gentooPatches @@ -47,8 +47,12 @@ stdenv.mkDerivation { preConfigure = '' autoreconf + automake --add-missing ''; passthru.grubTarget = ""; + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 835ceb32881e..925ea13780ac 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 2eb63f09216f..1ed6be071a59 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, makeWrapper, coreutils, openssh, gnupg +{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg , procps, gnugrep, gawk, findutils, gnused }: -stdenv.mkDerivation { - name = "keychain-2.7.1"; +stdenv.mkDerivation rec { + name = "keychain-${version}"; + version = "2.8.0"; - src = fetchurl { - url = mirror://gentoo/distfiles/keychain-2.7.1.tar.bz2; - sha256 = "14ai6wjwnj09xnl81ar2dlr5kwb8y1k5ck6nc549shpng0zzw1qi"; + src = fetchFromGitHub { + owner = "funtoo"; + repo = "keychain"; + rev = "1c8eaba53a7788d12d086b66ac3929810510f73a"; + sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; }; - phases = [ "unpackPhase" "buildPhase" ]; + phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; buildInputs = [ makeWrapper ]; + patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh"; + buildPhase = '' mkdir -p $out/bin - cp keychain $out/bin + cp keychain.sh $out/bin/keychain wrapProgram $out/bin/keychain \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${openssh}/bin" \ @@ -27,9 +32,9 @@ stdenv.mkDerivation { --prefix PATH ":" "${procps}/bin" ''; - meta = { + meta = { description = "Keychain management tool"; - homepage = "http://www.gentoo.org/proj/en/keychain/"; + homepage = "http://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/memtest86+/compile-fix.patch b/pkgs/tools/misc/memtest86+/compile-fix.patch new file mode 100644 index 000000000000..f178259f9e03 --- /dev/null +++ b/pkgs/tools/misc/memtest86+/compile-fix.patch @@ -0,0 +1,20 @@ +--- memtest86+-5.01/io.h~ 2013-08-10 02:01:58.000000000 +0000 ++++ memtest86+-5.01/io.h 2014-01-08 01:29:12.404465515 +0000 +@@ -31,7 +31,7 @@ + */ + + #define __OUT1(s,x) \ +-extern inline void __out##s(unsigned x value, unsigned short port) { ++static inline void __out##s(unsigned x value, unsigned short port) { + + #define __OUT2(s,s1,s2) \ + __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" +@@ -43,7 +43,7 @@ + __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } + + #define __IN1(s) \ +-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; ++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; + + #define __IN2(s,s1,s2) \ + __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff --git a/pkgs/tools/misc/memtest86+/crash-fix.patch b/pkgs/tools/misc/memtest86+/crash-fix.patch new file mode 100644 index 000000000000..de7c86bac353 --- /dev/null +++ b/pkgs/tools/misc/memtest86+/crash-fix.patch @@ -0,0 +1,99 @@ +diff --git a/controller.c b/controller.c +index f4f7371..183e9c3 100644 +--- a/controller.c ++++ b/controller.c +@@ -2,6 +2,8 @@ + * MemTest86+ V5 Specific code (GPL V2.0) + * By Samuel DEMEULEMEESTER, sdemeule@memtest.org + * http://www.canardpc.com - http://www.memtest.org ++ * ++ * Edited by David McInnis Oct 4, 2014 + */ + + //#include "defs.h" +@@ -292,7 +294,7 @@ static void setup_nhm(void) + + /* First, locate the PCI bus where the MCH is located */ + +- for(i = 0; i < sizeof(possible_nhm_bus); i++) { ++ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); + vid &= 0xFFFF; +@@ -327,7 +329,7 @@ static void setup_nhm32(void) + ctrl.mode = ECC_NONE; + + /* First, locate the PCI bus where the MCH is located */ +- for(i = 0; i < sizeof(possible_nhm_bus); i++) { ++ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); + vid &= 0xFFFF; +@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) { + unsigned long dramchr; + float clockratio; + double dramclock; +- unsigned int dummy[3]; ++ unsigned int dummy[4]; + int ram_type; + + float coef = 10; +@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) { + + static void poll_timings_i875(void) { + +- ulong dev6, dev62; ++ ulong dev6; + ulong temp; + float cas; + int rcd, rp, ras, chan; + long *ptr, *ptr2; + +- pci_conf_read( 0, 6, 0, 0x40, 4, &dev62); ++ pci_conf_read( 0, 6, 0, 0x40, 4, &dev6); + ptr2=(long*)(dev6+0x68); + + /* Read the MMR Base Address & Define the pointer */ +diff --git a/init.c b/init.c +index 754b8d7..5bd8b4f 100644 +--- a/init.c ++++ b/init.c +@@ -7,6 +7,8 @@ + * + * Released under version 2 of the Gnu Public License. + * By Chris Brady ++ * ++ * Edited by David McInnis October 4, 2014 + */ + + +@@ -914,7 +916,6 @@ void cpu_type(void) + default: + cprint(0, COL_MID, "Unknown Intel"); + break; +- break; + } + + } +diff --git a/main.c b/main.c +index 0bc7ca0..613f811 100644 +--- a/main.c ++++ b/main.c +@@ -422,7 +422,7 @@ void test_start(void) + //initialise_cpus(); + btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0); + /* Draw the screen and get system information */ +- init(); ++ init(); + + /* Set defaults and initialize variables */ + set_defaults(); +@@ -737,7 +737,7 @@ void test_start(void) + /* Do the same test for each CPU */ + if (++cpu_sel >= act_cpus) + { +- cpu_sel = 0; ++ cpu_sel = 0; + next_test(); + } else { + continue; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 500d7e815d26..dbd5a46e10ab 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l"; }; + # Patch incompatiblity with GCC. Source: http://koji.fedoraproject.org/koji/buildinfo?buildID=586907 + patches = [ ./compile-fix.patch ./crash-fix.patch ./no-optimization.patch ]; + preBuild = '' # Really dirty hack to get Memtest to build without needing a Glibc # with 32-bit libraries and headers. diff --git a/pkgs/tools/misc/memtest86+/no-optimization.patch b/pkgs/tools/misc/memtest86+/no-optimization.patch new file mode 100644 index 000000000000..76815a931704 --- /dev/null +++ b/pkgs/tools/misc/memtest86+/no-optimization.patch @@ -0,0 +1,11 @@ +--- memtest86+-5.01/Makefile~ 2014-01-08 01:30:11.355900076 +0000 ++++ memtest86+-5.01/Makefile 2014-01-08 01:31:19.387555469 +0000 +@@ -12,7 +12,7 @@ + AS=as -32 + CC=gcc + +-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ ++CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector + + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix new file mode 100644 index 000000000000..3b276a7117fe --- /dev/null +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: + +stdenv.mkDerivation rec { + name = "mpdscribble-${version}"; + version = "0.22"; + + src = fetchurl { + url = + "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + }; + + buildInputs = [ mpd_clientlib curl glib pkgconfig ]; + + preConfigure = '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; + + meta = with stdenv.lib; { + description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index 3e37009c723b..d1f76a10130c 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, gettext}: -stdenv.mkDerivation { - name = "ms-sys-2.1.3"; +stdenv.mkDerivation rec { + name = "ms-sys-${version}"; + version = "2.4.1"; src = fetchurl { - url = mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz; - sha256 = "05djdqp7gqfrfb4czrmbgxgd8qr0h3781gzqvsp3qhfx6ay37z0p"; + url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; + sha256 = "0qccv67fc2q97218b9wm6qpmx0nc0ssca391i0q15351y1na78nc"; }; buildInputs = [gettext]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 59f2f5d05eec..53b650405fe8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20150122"; + name = "parallel-20150222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "14g9pka59vln19rg6y8lyvrsc4nb3jk8y26hv3hdrf44rgwpds7d"; + sha256 = "1302snh0aac8978842ci1rvjjjwki7xgj8bd4hq3f2hxp3zdspv7"; }; patchPhase = diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 070efe69d4cd..b8182cff862b 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -3,13 +3,13 @@ }: let - wine_patches_version = "1.7.36"; - wine_hash = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1"; + wine_patches_version = "1.7.38"; + wine_hash = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq"; wine_patches = fetchgit { url = "git://github.com/compholio/wine-compholio.git"; rev = "refs/tags/v${wine_patches_version}"; - sha256 = "1nnwhd7m1wwipg72dzjhzhk9fgcf1ynknncj89ab0pabn4wmib2i"; + sha256 = "0lcagswy1lgqz6qlpf0ng7ksl2sbaqldrgnhf0n1278jj82rq80n"; }; wine_custom = diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix new file mode 100644 index 000000000000..903c8617128a --- /dev/null +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }: + +stdenv.mkDerivation rec { + version = "2.34"; + name = "profile-cleaner-${version}"; + + src = fetchFromGitHub { + owner = "graysky2"; + repo = "profile-cleaner"; + rev = "v${version}"; + sha256 = "17z73xyn31668f7vmbj7xs659fcrm0m0mnzja7hz6lipfaviqxrs"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + PREFIX=\"\" DESTDIR=$out make install + wrapProgram $out/bin/profile-cleaner \ + --prefix PATH : "${parallel}/bin:${sqlite}/bin" + ''; + + meta = { + description = "Reduces browser profile sizes by cleaning their sqlite databases"; + longDescription = '' + Use profile-cleaner to reduce the size of browser profiles by organizing + their sqlite databases using sqlite3's vacuum and reindex functions. The + term "browser" is used loosely since profile-cleaner happily works on + some email clients and newsreaders too. + ''; + homepage = https://github.com/graysky2/profile-cleaner; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index ee330c0bee53..86d81fd25856 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Readline wrapper for console programs"; homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/; license = stdenv.lib.licenses.gpl2Plus; - platform = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/tools/misc/t/Gemfile b/pkgs/tools/misc/t/Gemfile new file mode 100644 index 000000000000..3a31c54c5a78 --- /dev/null +++ b/pkgs/tools/misc/t/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 't' diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock new file mode 100644 index 000000000000..d85f5a1a7526 --- /dev/null +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -0,0 +1,52 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.3.7) + buftok (0.2.0) + equalizer (0.0.9) + faraday (0.9.1) + multipart-post (>= 1.2, < 3) + geokit (1.9.0) + multi_json (>= 1.3.2) + htmlentities (4.3.3) + http (0.6.3) + http_parser.rb (~> 0.6.0) + http_parser.rb (0.6.0) + json (1.8.2) + launchy (2.4.3) + addressable (~> 2.3) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + multi_json (1.11.0) + multipart-post (2.0.0) + naught (1.0.0) + oauth (0.4.7) + retryable (2.0.1) + simple_oauth (0.3.1) + t (2.9.0) + geokit (>= 1.8.3, < 2) + htmlentities (~> 4.3) + launchy (~> 2.4) + oauth (~> 0.4.7) + retryable (~> 2.0) + thor (>= 0.19.1, < 2) + twitter (~> 5.13) + thor (0.19.1) + thread_safe (0.3.5) + twitter (5.14.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.9) + faraday (~> 0.9.0) + http (~> 0.6.0) + http_parser.rb (~> 0.6.0) + json (~> 1.8) + memoizable (~> 0.4.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + t diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix new file mode 100644 index 000000000000..10db8764f89d --- /dev/null +++ b/pkgs/tools/misc/t/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "t-2.9.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A command-line power tool for Twitter."; + homepage = http://sferik.github.io/t/; + license = with licenses; asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix new file mode 100644 index 000000000000..6c721111c67e --- /dev/null +++ b/pkgs/tools/misc/t/gemset.nix @@ -0,0 +1,185 @@ +{ + "addressable" = { + version = "2.3.7"; + source = { + type = "gem"; + sha256 = "1x1401m59snw59c2bxr10jj10z1n4r4jvz8c55d0c3sh2smbl8kh"; + }; + }; + "buftok" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + }; + }; + "equalizer" = { + version = "0.0.9"; + source = { + type = "gem"; + sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; + }; + }; + "faraday" = { + version = "0.9.1"; + source = { + type = "gem"; + sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "geokit" = { + version = "1.9.0"; + source = { + type = "gem"; + sha256 = "1bpkjz2q8hm7i4mrrp1if51zq6fz3qkqj55qwlb7jh9jlgyvjmqy"; + }; + dependencies = [ + "multi_json" + ]; + }; + "htmlentities" = { + version = "4.3.3"; + source = { + type = "gem"; + sha256 = "0v4m2pn6q2h7iqdkxk9z3j4828harcjgk1h77v9i4x87avv5130p"; + }; + }; + "http" = { + version = "0.6.3"; + source = { + type = "gem"; + sha256 = "0wmj5i1l0f6ajhs8wi1h3sdwhrl00llrpsmh6xs9dwjm2amvdvxv"; + }; + dependencies = [ + "http_parser.rb" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "launchy" = { + version = "2.4.3"; + source = { + type = "gem"; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; + }; + dependencies = [ + "addressable" + ]; + }; + "memoizable" = { + version = "0.4.2"; + source = { + type = "gem"; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "multi_json" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; + }; + }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; + "naught" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "04m6hh63c96kcnzwy5mpl826yn6sm465zz1z87mmsig86gqi1izd"; + }; + }; + "oauth" = { + version = "0.4.7"; + source = { + type = "gem"; + sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w"; + }; + }; + "retryable" = { + version = "2.0.1"; + source = { + type = "gem"; + sha256 = "0wg4vh76cmhwzwrgd0k6kbx4dlp4r98l8yizr72lmzph187dg48f"; + }; + }; + "simple_oauth" = { + version = "0.3.1"; + source = { + type = "gem"; + sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; + }; + }; + "t" = { + version = "2.9.0"; + source = { + type = "gem"; + sha256 = "0qdsyblnnan2wcvql2mzg10jaj3gfv5pbfac54b1y7qkr56dc4dv"; + }; + dependencies = [ + "geokit" + "htmlentities" + "launchy" + "oauth" + "retryable" + "thor" + "twitter" + ]; + }; + "thor" = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + "thread_safe" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + }; + }; + "twitter" = { + version = "5.14.0"; + source = { + type = "gem"; + sha256 = "0vx7x3fmwgk3axqyw9hyf6yh99kx3ssdy14w2686hz7c4v3qwlc5"; + }; + dependencies = [ + "addressable" + "buftok" + "equalizer" + "faraday" + "http" + "http_parser.rb" + "json" + "memoizable" + "naught" + "simple_oauth" + ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 7a42ec48fb67..5312445563a6 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.4.2"; + version = "0.4.3"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { - url = https://github.com/untitaker/vdirsyncer/archive/0.4.2.tar.gz; - sha256 = "008181mglbrp5jsvpxr59b6w4mw26h4s4gwij152i47mfbrizsl4"; + url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz"; + sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai"; }; pythonPath = with pythonPackages; [ diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix new file mode 100644 index 000000000000..767a61c2bb50 --- /dev/null +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, perl}: + +stdenv.mkDerivation rec { + pname = "vmtouch"; + version = "git-20150310"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "hoytech"; + repo = "vmtouch"; + rev = "4e1b106e59942678c1e6e490e2c7ca7df50eb7a3"; + sha256 = "1m37gvlypyfizd33mfyfha4hhwiyfzsj8gb2h5im6wzis4j15d0y"; + }; + + buildInputs = [perl]; + + makeFlags = "PREFIX=$(out)"; + + meta = { + description = "Portable file system cache diagnostics and control"; + longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; + homepage = "http://hoytech.com/vmtouch/vmtouch.html"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b423aa301f9d..f6332874b3ac 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip, pandoc }: let - version = "2015.01.30.2"; + version = "2015.03.09"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "00ymx254qgic9ka7wb41cinv1w0ijq6l0f5k2cfspi958jqql9lm"; + sha256 = "0mxpm79xdzzckc5rysjx17pxm9bldk7s13im7l9xd4pjrhy411xz"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index f2821135cf6f..1f6db50a2dfd 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-0.1.2"; + name = "yubico-piv-tool-0.1.5"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "0sqakrlw4j60xhlmp2fq6ccj3lqf13kwvmahsrj3xr5qdi7h0fza"; + sha256 = "1zii90f0d1j9cinvxqlzs9h8w7a856ksd8ghgqz12jywmjz0blxq"; }; buildInputs = [ pkgconfig openssl pcsclite ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 37b2fcb7a757..e420b1705a13 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { "--with-backend=libusb-1.0" ]; + postInstall = '' + mkdir -p $out/lib/udev/rules.d/ + cp -v *.rules $out/lib/udev/rules.d/ + ''; + meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization; description = "a library and command line tool to personalize YubiKeys"; diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix new file mode 100644 index 000000000000..dd53234906dd --- /dev/null +++ b/pkgs/tools/networking/aiccu/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gnutls, iproute, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "aiccu-${version}"; + version = "20070115"; + + src = fetchurl { + url = "https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz"; + sha256 = "2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760"; + }; + + buildInputs = [ gnutls iproute makeWrapper ]; + + configureFlags = "--prefix=$out"; + installPhase = '' + install -D -m 755 unix-console/aiccu $out/bin/aiccu + install -D -m 644 doc/aiccu.sgml $out/doc/aiccu.sgml + install -D -m 644 doc/aiccu.1 $out/share/man/man1/aiccu.1 + wrapProgram "$out/bin/aiccu" \ + --prefix PATH : "${iproute}/bin" + ''; + + meta = with stdenv.lib; { + description = "Automatic IPv6 Connectivity Configuration Utility"; + homepage = "https://www.sixxs.net/tools/aiccu/"; + longDescription = '' + A TIC+ heartbeart client for the public dynamic-IPv4 IPv6 tunnel beta test from the SixXS tunnel service provider. + ''; + maintainers = with maintainers; [ edwtjo ]; + license = "SixXS"; + }; + +} diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index d235c241a058..73359cb36a9b 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.18.9"; + version = "1.18.10"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "1cn4g4mcrnw67y23970a9bngl8nf2x9hh82lc59gz3xyxn8wljz2"; + sha256 = "1vvc3pv1100xb4293bmgqpxvy3pdvivnz415b9q78n7190kag3a5"; }; buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index cb3e1445aa39..38514a5604be 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -1,28 +1,38 @@ { stdenv, fetchurl, python2, python2Packages, makeWrapper }: stdenv.mkDerivation rec { - version = "2.0.0-rc2"; + version = "2.0.0"; name = "ASynK-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz"; - sha256 = "14s53ijn9fpxr490ypnn92zk6h5rdadf7j3z98rah1h7l659qi1b"; + sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1"; }; - propagatedBuildInputs = with python2Packages; [ python2 makeWrapper tornado requests dateutil ]; + propagatedBuildInputs = with python2Packages; + [ python2 makeWrapper tornado requests dateutil + vobject gdata caldavclientlibrary-asynk ]; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/lib cp asynk.py $out/bin/ cp state.init.json $out/ cp -R config $out/ - cp -R lib $out/ + cp lib/*.py $out/lib # */ + cp -R lib/s $out/lib/ cp -R asynk $out/ substituteInPlace $out/bin/asynk.py \ --replace "ASYNK_BASE_DIR = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR = \"$out\"" + for file in `find $out/asynk -type f`; do + # Oh yeah, tab characters! + substituteInPlace $file \ + --replace 'from vobject import vobject' 'from vobject import *' \ + --replace 'from vobject import vobject' 'from vobject import *' + done + wrapProgram "$out/bin/asynk.py" \ --prefix PYTHONPATH : "$PYTHONPATH" ''; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 8c85d99f2173..5addf30c3224 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: -stdenv.mkDerivation { - name = "autossh-1.4d"; +stdenv.mkDerivation rec { + name = "autossh-1.4e"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4d.tgz"; - sha256 = "05nwvqfyk0kbalwabj4z3xx11i0qdqg6xadzk17ckr5xb3j8y000"; + url = "http://www.harding.motd.ca/autossh/${name}.tgz"; + sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly"; }; buildInputs = [ openssh ]; @@ -20,9 +20,10 @@ stdenv.mkDerivation { install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 6c090a7ec1f6..be87f383c0a2 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -1,11 +1,13 @@ -{stdenv, fetchurl, openssl, libpcap}: +{stdenv, fetchFromGitHub, openssl, libpcap}: stdenv.mkDerivation rec { name = "bully-${version}"; version = "1.0-22"; - src = fetchurl { - url = "https://github.com/bdpurcell/bully/archive/v${version}.tar.gz"; - sha256 = "72f568f659fdcf70455a17f91f25dde65a53431c67c796517d3d3c4a4703ab68"; + src = fetchFromGitHub { + sha256 = "0wk9jmcibd03gspnnr2qvfkw57rg94cwmi0kjpy1mgi05s6vlw1y"; + rev = "v${version}"; + repo = "bully"; + owner = "Lrs121"; }; buildInputs = [ openssl libpcap ]; @@ -21,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = https://github.com/bdpurcell/bully; + homepage = https://github.com/Lrs121/bully; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.gpl3; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 90f421f56ba4..c14770fb32be 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://zakalwe.fi/~shd/foss/cksfv/; description = "A tool for verifying files against a SFV checksum file"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index fa0a15ea044d..08c00fc4b342 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -12,11 +12,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.40.0"; + name = "curl-7.41.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1fizi07p0h76zaa3wxh4d9vr4hln97sgfpcr5y56pyh077mhk4c9"; + sha256 = "1slbbxp2k8m34mdzrl5qhafr5zhhcv7fgjhs2mcxjmswvimm92wz"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index c84a140d4bca..8c5896561fcd 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.6.6"; + name = "dhcpcd-6.6.7"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0893gixhz68ngqa1vcshmvkwy58kmlj3f1qvd877sgrir06bpg96"; + sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix new file mode 100644 index 000000000000..778cfc3b5ed6 --- /dev/null +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libpcap, perl }: + +stdenv.mkDerivation rec { + name = "dhcpdump-1.8"; + + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz"; + sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd"; + }; + + buildInputs = [libpcap perl]; + + installPhase = '' + mkdir -pv $out/bin + cp dhcpdump $out/bin + ''; + + meta = { + description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; + homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 818c764b1be0..bdd2c4a0c24e 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://dnscrypt.org/; license = with stdenv.lib.licenses; [ isc ]; maintainers = with stdenv.lib.maintainers; [ joachifm ]; - platform = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 8c9103790b9b..dbd3c631c29f 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - version = "4.46.0"; + version = "4.47.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "15rqmm25pq6ll8aaqh8h6pfdkpqs7y6yismb3h3w1bz8j292c8zl"; + sha256 = "0h25irimigral9xspkvjmplzddqphyn51n5fq221m7nps39wqnjb"; }; doCheck = false; diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index 54cb8b21aafa..85f94ccba105 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -1,24 +1,26 @@ { fetchurl, stdenv }: let version = "20000331"; in - stdenv.mkDerivation { - name = "host-${version}"; - src = fetchurl { - url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz"; - sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1"; - }; +stdenv.mkDerivation { + name = "host-${version}"; - preConfigure = '' - makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - mkdir -p "$out/bin" - mkdir -p "$out/share/man/man1" - ''; + src = fetchurl { + url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz"; + sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1"; + }; - installTargets = "install man"; + preConfigure = '' + makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" + ''; - meta = { - description = "DNS resolution utility"; - license = "BSD-style"; - }; - } + installTargets = "install man"; + + meta = { + description = "DNS resolution utility"; + license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c5cefb7a7cea..b8d2deb626b6 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { name = "i2pd-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { + name = "i2pd-src-${version}.tar.gz"; url = "https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"; - sha256 = "1fic1jxdr48b0jfaamwbfkldbfi7awfbrqga2k7gvpncq32v0aj6"; + sha256 = "1vw6s480lmxwhq0rx6d2lczb6d2j9f68hmv3ri9jwgp7bicy6ziz"; }; buildInputs = [ boost cryptopp ]; @@ -20,6 +21,6 @@ stdenv.mkDerivation rec { description = "Minimal I2P router written in C++"; licenses = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; - platform = platforms.linux; + platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 23c484e94798..6dcb6e7f317d 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1wdlyklqjvslcbvyx7ch4aziwvjbpj852k59m02gakisq9bywfcd"; + sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; buildInputs = [ geoip getopt openssl perl ]; diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 54d8acd32138..67b93a1fa901 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; license = "GPL"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index e9a0157b123c..e8436c040fdc 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchFromGitHub, bison, flex, geoip, libcli, libnet +{ stdenv, fetchFromGitHub, bison, flex, libcli, libnet , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl -, pkgconfig, which, zlib }: +, pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.5.9-rc4-40-g5107740"; + version = "0.5.9-rc4-49-g6f54288"; name = "netsniff-ng-${version}"; src = fetchFromGitHub rec { # Upstream recommends and supports git repo = "netsniff-ng"; owner = repo; - rev = "5107740603d10feed6104afd75042970cb392843"; - sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988"; + rev = "6f542884d002d55d517a50dd9892068e95400b25"; + sha256 = "0j7rqigfn9zazmzi8w3hapzi8028jr3q27lwyjw7k7lpnayj5iaa"; }; - buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack - libpcap libsodium liburcu ncurses perl pkgconfig which zlib ]; + buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack + libpcap libsodium liburcu ncurses perl pkgconfig zlib ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' patchShebangs configure + substituteInPlace configure --replace "which" "command -v" NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure ''; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix new file mode 100644 index 000000000000..bfd9b90b6b13 --- /dev/null +++ b/pkgs/tools/networking/noip/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "noip-2.1.9-1"; + + src = fetchurl { + url = http://www.noip.com/client/linux/noip-duc-linux.tar.gz; + sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; + }; + + makeFlags = [ "PREFIX=\${out}" ]; + installPhase = + '' + mkdir -p $out/bin + cp noip2 $out/bin + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Dynamic DNS daemon for no-ip accounts"; + homepage = http://noip.com/download?page=linux; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.iand675 ]; + }; +} diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 68b1aab2d89e..15c84a79a870 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.7p1"; + name = "openssh-6.8p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "01smf9pvn2sk5qs80gkmc9acj07ckawi1b3xxyysp3c5mr73ky5j"; + sha256 = "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz"; }; prePatch = stdenv.lib.optionalString hpnSupport diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 20446387f4ad..68f1f7632971 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { any kind of file. ''; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ muflax ]; - + maintainers = [ stdenv.lib.maintainers.muflax ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 039f9bc09139..2dba887adb8d 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,12 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.05"; + version = "5.11"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - # SHA256 provided by upstream. - sha256 = "c7e1653345150db7e48d00e1129cf571c7c85de8e7e1aa70b21cf1d76b1e31ef"; + sha256 = "137zxnavc7880fxfbmhlgw97lk4rj8if1bb70adm0d4fwlvvra3i"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 6744fb7c5515..179908a1007c 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.tcpdump.org/; license = "BSD-style"; maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index e14cd8191772..c0be126bdfda 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre4b2ddde"; + name = "tinc-1.1pre-2015-02-24"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 4ad9c7cebadc..bd580d28320b 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "urlwatch-1.17"; + name = "urlwatch-1.18"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "1xl8gi01bfbrg2mchns9cgagpxjjsig1x4kis3isqgfg4k0h8vq0"; + sha256 = "090qfgx249ks7103sap6w47f8302ix2k46wxhfssxwsqcqdl25vb"; }; patchPhase = '' diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index d4463b42ec64..55a99dd2729a 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; - buildInputs = [ python pythonPackages.Babel pythonPackages.urwid ]; + buildInputs = [ + python pythonPackages.Babel + pythonPackages.urwid pythonPackages.notify + ]; patches = [ ./no-var-install.patch @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 6ea1a68181a2..4e143bed5194 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixWebService-0.2"; + name = "DisnixWebService-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/19859888/download/4/DisnixWebService-0.2.tar.bz2; - sha256 = "1gcrgjscd8mkixi5js6j44yiiyyz2vg7bdn5qp42vr4r8rh9zgq4"; + url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2; + sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 0e522f466741..98213d9cf342 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre0d9af6829c047d9a6fb27bff38af02e9e75ce36f"; + name = "disnix-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/19868273/download/4/disnix-0.3pre0d9af6829c047d9a6fb27bff38af02e9e75ce36f.tar.gz; - sha256 = "1d4p913mk9dbs8vda5cv02rzcrsdj5klwnxp4ana6qss74lh9415"; + url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz; + sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - description = "A distributed deployment extension for Nix"; + description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index ba21ab557547..52312ca7191e 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2pred5b649fa44bd3a1003d6466431ccbd07e79fe50f"; + name = "disnixos-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/19868070/download/3/disnixos-0.2pred5b649fa44bd3a1003d6466431ccbd07e79fe50f.tar.gz; - sha256 = "0vkj5y8v734m3dmkg71d2jdk7bwgahn44yi62843a0mzjijngdzj"; + url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz; + sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index e5423ab8d643..6fa95f060d7b 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -9,6 +9,7 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , catalinaBaseDir ? "/var/tomcat" +, jobTemplate ? "systemd" , getopt }: @@ -19,24 +20,25 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre828145ee0bbfb72013a19c15db2947e26179f159"; + name = "dysnomia-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/19868062/download/1/dysnomia-0.3pre828145ee0bbfb72013a19c15db2947e26179f159.tar.gz; - sha256 = "0rxf6lhb952p7rwrbxhzj3fsqqbrxaksb60zmyqz3h19wjkpaiki"; + url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz; + sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - configureFlags = '' - ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} - ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} - ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} - ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} - ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} - ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} - ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} - ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"} - ''; + configureFlags = [ + (if enableApacheWebApplication then "--with-apache" else "--without-apache") + (if enableAxis2WebService then "--with-axis2" else "--without-axis2") + (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd") + (if enableMySQLDatabase then "--with-mysql" else "--without-mysql") + (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql") + (if enableSubversionRepository then "--with-subversion" else "--without-subversion") + (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") + (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") + "--with-job-template=${jobTemplate}" + ]; buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 8e893edbafa0..d39a13196a8d 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4045_bd91064"; + name = "nix-1.9pre4083_5114a07"; src = fetchurl { - url = "http://hydra.nixos.org/build/19776695/download/4/${name}.tar.xz"; - sha256 = "3a9d5750fa7cf4958a275516d5b7f3ab0036529a07a4ee16ade89a714fd55f7a"; + url = "http://hydra.nixos.org/build/20650421/download/4/${name}.tar.xz"; + sha256 = "971fdd36bcf39c7e6ce9ef12dbfe09c98d2be3275e482ca2dbacb2e668f0dff9"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 7997603a706c..0d537a1c30cb 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include"; NIX_CFLAGS_LINK = "-L${elfutils}/lib"; - + configureFlags = "--with-external-db --without-lua --enable-python"; meta = with stdenv.lib; { homepage = http://www.rpm.org/; license = licenses.gpl2; description = "The RPM Package Manager"; - maintainers = with maintainers; [ mornfall ]; + maintainers = [ maintainers.mornfall ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/afl/README.md b/pkgs/tools/security/afl/README.md new file mode 100644 index 000000000000..7d9544617739 --- /dev/null +++ b/pkgs/tools/security/afl/README.md @@ -0,0 +1,19 @@ +Updating the QEMU patches +========================= + +When updating to the latest American Fuzzy Lop, make sure to check for +any new patches to qemu for binary fuzzing support: + +https://github.com/mirrorer/afl/tree/master/qemu_mode + +Be sure to check the build script and make sure it's also using the +right QEMU version and options in `qemu.nix`: + +https://github.com/mirrorer/afl/blob/master/qemu_mode/build_qemu_support.sh + +`afl-config.h` and `afl-qemu-cpu-inl.h` are part of the afl source +code, and copied from `config.h` and `afl-qemu-cpu-inl.h` +appropriately. The QEMU patches need to be slightly adjusted to +`#include` these files (the patches try to otherwise include files +like `../../config.h` which causes the build to fail). See `qemu.nix` +for details. diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index f59e32853437..ed9b6d56edb4 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,16 +1,38 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, bash, callPackage, makeWrapper }: +let + afl-qemu = callPackage ./qemu.nix {}; + qemu-exe-name = if stdenv.system == "x86_64-linux" then "qemu-x86_64" + else if stdenv.system == "i686-linux" then "qemu-i386" + else throw "afl: no support for ${stdenv.system}!"; +in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.21b"; + version = "1.57b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1j3857947lyr0j6jjdrx1mrdqpgi7fnfysxlycxb61xyg4av0k30"; + sha256 = "05dwh2kgz31702y339bvbs0b3ffadxgxk8cqqhs2i0ggx5bnl5p4"; }; + buildInputs = [ makeWrapper ]; + buildPhase = "make PREFIX=$out"; - installPhase = "make install PREFIX=$out"; + installPhase = '' + # Do the normal installation + make install PREFIX=$out + + # Install the custom QEMU emulator for binary blob fuzzing. + cp ${afl-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace + + # Wrap every program with a custom $AFL_PATH; I believe there is a + # bug in afl which causes it to fail to find `afl-qemu-trace` + # relative to `afl-fuzz` or `afl-showmap`, so we instead set + # $AFL_PATH as a workaround, which allows it to be found. + for x in `ls $out/bin/afl-*`; do + wrapProgram $x --prefix AFL_PATH : "$out/bin" + done + ''; meta = { description = "Powerful fuzzer via genetic algorithms and instrumentation"; diff --git a/pkgs/tools/security/afl/qemu-patches/afl-config.h b/pkgs/tools/security/afl/qemu-patches/afl-config.h new file mode 100644 index 000000000000..051b38ffbca4 --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/afl-config.h @@ -0,0 +1,329 @@ +/* + american fuzzy lop - vaguely configurable bits + ---------------------------------------------- + + Written and maintained by Michal Zalewski <lcamtuf@google.com> + + Copyright 2013, 2014, 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + */ + +#ifndef _HAVE_CONFIG_H +#define _HAVE_CONFIG_H + +#include "afl-types.h" + +/****************************************************** + * * + * Settings that may be of interest to power users: * + * * + ******************************************************/ + +/* Comment out to disable terminal colors: */ + +#define USE_COLOR + +/* Comment out to disable fancy ANSI boxes and use poor man's 7-bit UI: */ + +#define FANCY_BOXES + +/* Default timeout for fuzzed code (milliseconds): */ + +#define EXEC_TIMEOUT 1000 + +/* Timeout rounding factor when auto-scaling (milliseconds): */ + +#define EXEC_TM_ROUND 20 + +/* Default memory limit for child process (MB): */ + +#ifndef __x86_64__ +# define MEM_LIMIT 25 +#else +# define MEM_LIMIT 50 +#endif /* ^!__x86_64__ */ + +/* Default memory limit when running in QEMU mode (MB): */ + +#define MEM_LIMIT_QEMU 200 + +/* Number of calibration cycles per every new test case (and for test + cases that show variable behavior): */ + +#define CAL_CYCLES 10 +#define CAL_CYCLES_LONG 40 + +/* The same, but when AFL_NO_VAR_CHECK is set in the environment: */ + +#define CAL_CYCLES_NO_VAR 4 + +/* Number of subsequent hangs before abandoning an input file: */ + +#define HANG_LIMIT 250 + +/* Maximum number of unique hangs or crashes to record: */ + +#define KEEP_UNIQUE_HANG 500 +#define KEEP_UNIQUE_CRASH 5000 + +/* Baseline number of random tweaks during a single 'havoc' stage: */ + +#define HAVOC_CYCLES 5000 + +/* Maximum multiplier for the above (should be a power of two, beware + of 32-bit int overflows): */ + +#define HAVOC_MAX_MULT 16 + +/* Absolute minimum number of havoc cycles (after all adjustments): */ + +#define HAVOC_MIN 10 + +/* Maximum stacking for havoc-stage tweaks. The actual value is calculated + like this: + + n = random between 0 and HAVOC_STACK_POW2 + stacking = 2^n + + In other words, the default (n = 7) produces 1, 2, 4, 8, 16, 32, 64, or + 128 stacked tweaks: */ + +#define HAVOC_STACK_POW2 7 + +/* Caps on block sizes for cloning and deletion operations. Each of these + ranges has a 33% probability of getting picked, except for the first + two cycles where smaller blocks are favored: */ + +#define HAVOC_BLK_SMALL 32 +#define HAVOC_BLK_MEDIUM 128 +#define HAVOC_BLK_LARGE 1500 + +/* Probabilities of skipping non-favored entries in the queue, expressed as + percentages: */ + +#define SKIP_TO_NEW_PROB 99 /* ...when there are new, pending favorites */ +#define SKIP_NFAV_OLD_PROB 95 /* ...no new favs, cur entry already fuzzed */ +#define SKIP_NFAV_NEW_PROB 75 /* ...no new favs, cur entry not fuzzed yet */ + +/* Splicing cycle count: */ + +#define SPLICE_CYCLES 20 + +/* Nominal per-splice havoc cycle length: */ + +#define SPLICE_HAVOC 500 + +/* Maximum offset for integer addition / subtraction stages: */ + +#define ARITH_MAX 35 + +/* Limits for the test case trimmer. The absolute minimum chunk size; and + the starting and ending divisors for chopping up the input file: */ + +#define TRIM_MIN_BYTES 4 +#define TRIM_START_STEPS 16 +#define TRIM_END_STEPS 1024 + +/* Maximum size of input file, in bytes (keep under 100MB): */ + +#define MAX_FILE (1 * 1024 * 1024) + +/* The same, for the test case minimizer: */ + +#define TMIN_MAX_FILE (10 * 1024 * 1024) + +/* Maximum dictionary token size (-x), in bytes: */ + +#define MAX_DICT_FILE 128 + +/* Length limits for auto-detected dictionary tokens: */ + +#define MIN_AUTO_EXTRA 3 +#define MAX_AUTO_EXTRA 32 + +/* Maximum number of user-specified dictionary tokens to use in deterministic + steps; past this point, the "extras/user" step will be still carried out, + but with proportionally lower odds: */ + +#define MAX_DET_EXTRAS 200 + +/* Maximum number of auto-extracted dictionary tokens to actually use in fuzzing + (first value), and to keep in memory as candidates. The latter should be much + higher than the former. */ + +#define USE_AUTO_EXTRAS 50 +#define MAX_AUTO_EXTRAS (USE_AUTO_EXTRAS * 10) + +/* Scaling factor for the effector map used to skip some of the more + expensive deterministic steps. The actual divisor is set to + 2^EFF_MAP_SCALE2 bytes: */ + +#define EFF_MAP_SCALE2 3 + +/* Minimum input file length at which the effector logic kicks in: */ + +#define EFF_MIN_LEN 128 + +/* Maximum effector density past which everything is just fuzzed + unconditionally (%): */ + +#define EFF_MAX_PERC 90 + +/* UI refresh frequency (Hz): */ + +#define UI_TARGET_HZ 5 + +/* Fuzzer stats file and plot update intervals (sec): */ + +#define STATS_UPDATE_SEC 60 +#define PLOT_UPDATE_SEC 5 + +/* Smoothing divisor for CPU load and exec speed stats (1 - no smoothing). */ + +#define AVG_SMOOTHING 16 + +/* Sync interval (every n havoc cycles): */ + +#define SYNC_INTERVAL 5 + +/* Output directory reuse grace period (minutes): */ + +#define OUTPUT_GRACE 25 + +/* Uncomment to use simple file names (id_NNNNNN): */ + +// #define SIMPLE_FILES + +/* List of interesting values to use in fuzzing. */ + +#define INTERESTING_8 \ + -128, /* Overflow signed 8-bit when decremented */ \ + -1, /* */ \ + 0, /* */ \ + 1, /* */ \ + 16, /* One-off with common buffer size */ \ + 32, /* One-off with common buffer size */ \ + 64, /* One-off with common buffer size */ \ + 100, /* One-off with common buffer size */ \ + 127 /* Overflow signed 8-bit when incremented */ + +#define INTERESTING_16 \ + -32768, /* Overflow signed 16-bit when decremented */ \ + -129, /* Overflow signed 8-bit */ \ + 128, /* Overflow signed 8-bit */ \ + 255, /* Overflow unsig 8-bit when incremented */ \ + 256, /* Overflow unsig 8-bit */ \ + 512, /* One-off with common buffer size */ \ + 1000, /* One-off with common buffer size */ \ + 1024, /* One-off with common buffer size */ \ + 4096, /* One-off with common buffer size */ \ + 32767 /* Overflow signed 16-bit when incremented */ + +#define INTERESTING_32 \ + -2147483648LL, /* Overflow signed 32-bit when decremented */ \ + -100663046, /* Large negative number (endian-agnostic) */ \ + -32769, /* Overflow signed 16-bit */ \ + 32768, /* Overflow signed 16-bit */ \ + 65535, /* Overflow unsig 16-bit when incremented */ \ + 65536, /* Overflow unsig 16 bit */ \ + 100663045, /* Large positive number (endian-agnostic) */ \ + 2147483647 /* Overflow signed 32-bit when incremented */ + +/*********************************************************** + * * + * Really exotic stuff you probably don't want to touch: * + * * + ***********************************************************/ + +/* Call count interval between reseeding the libc PRNG from /dev/urandom: */ + +#define RESEED_RNG 10000 + +/* Maximum line length passed from GCC to 'as': */ + +#define MAX_AS_LINE 8192 + +/* Environment variable used to pass SHM ID to the called program. */ + +#define SHM_ENV_VAR "__AFL_SHM_ID" + +/* Other less interesting, internal-only variables. */ + +#define CLANG_ENV_VAR "__AFL_CLANG_MODE" +#define AS_LOOP_ENV_VAR "__AFL_AS_LOOPCHECK" + +/* Distinctive bitmap signature used to indicate failed execution: */ + +#define EXEC_FAIL_SIG 0xfee1dead + +/* Distinctive exit code used to indicate MSAN trip condition: */ + +#define MSAN_ERROR 86 + +/* Designated file descriptors for forkserver commands (the application will + use FORKSRV_FD and FORKSRV_FD + 1): */ + +#define FORKSRV_FD 198 + +/* Fork server init timeout multiplier: we'll wait the user-selected + timeout plus this much for the fork server to spin up. */ + +#define FORK_WAIT_MULT 10 + +/* Calibration timeout adjustments, to be a bit more generous when resuming + fuzzing sessions or trying to calibrate already-added internal finds. + The first value is a percentage, the other is in milliseconds: */ + +#define CAL_TMOUT_PERC 125 +#define CAL_TMOUT_ADD 50 + +/* Number of chances to calibrate a case before giving up: */ + +#define CAL_CHANCES 3 + +/* Map size for the traced binary (2^MAP_SIZE_POW2). Must be greater than + 2; you probably want to keep it under 18 or so for performance reasons + (adjusting AFL_INST_RATIO when compiling is probably a better way to solve + problems with complex programs). You need to recompile the target binary + after changing this - otherwise, SEGVs may ensue. */ + +#define MAP_SIZE_POW2 16 +#define MAP_SIZE (1 << MAP_SIZE_POW2) + +/* Maximum allocator request size (keep well under INT_MAX): */ + +#define MAX_ALLOC 0x40000000 + +/* A made-up hashing seed: */ + +#define HASH_CONST 0xa5b35705 + +/* Constants for afl-gotcpu to control busy loop timing: */ + +#define CTEST_TARGET_MS 5000 +#define CTEST_BUSY_CYCLES (10 * 1000 * 1000) + +/* Uncomment this to use inferior block-coverage-based instrumentation. Note + that you need to recompile the target binary for this to have any effect: */ + +// #define COVERAGE_ONLY + +/* Uncomment this to ignore hit counts and output just one bit per tuple. + As with the previous setting, you will need to recompile the target + binary: */ + +// #define SKIP_COUNTS + +/* Uncomment this to use instrumentation data to record newly discovered paths, + but do not use them as seeds for fuzzing. This is useful for conveniently + measuring coverage that could be attained by a "dumb" fuzzing algorithm: */ + +// #define IGNORE_FINDS + +#endif /* ! _HAVE_CONFIG_H */ diff --git a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h new file mode 100644 index 000000000000..7d5a47669e49 --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h @@ -0,0 +1,287 @@ +/* + american fuzzy lop - high-performance binary-only instrumentation + ----------------------------------------------------------------- + + Written by Andrew Griffiths <agriffiths@google.com> and + Michal Zalewski <lcamtuf@google.com> + + Idea & design very much by Andrew Griffiths. + + Copyright 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + This code is a shim patched into the separately-distributed source + code of QEMU 2.2.0. It leverages the built-in QEMU tracing functionality + to implement AFL-style instrumentation and to take care of the remaining + parts of the AFL fork server logic. + + The resulting QEMU binary is essentially a standalone instrumentation + tool; for an example of how to leverage it for other purposes, you can + have a look at afl-showmap.c. + + */ + +#include <sys/shm.h> +#include "afl-config.h" + +/*************************** + * VARIOUS AUXILIARY STUFF * + ***************************/ + +/* A snippet patched into tb_find_slow to inform the parent process that + we have hit a new block that hasn't been translated yet, and to tell + it to translate within its own context, too (this avoids translation + overhead in the next forked-off copy). */ + +#define AFL_QEMU_CPU_SNIPPET1 do { \ + afl_request_tsl(pc, cs_base, flags); \ + } while (0) + +/* This snippet kicks in when the instruction pointer is positioned at + _start and does the usual forkserver stuff, not very different from + regular instrumentation injected via afl-as.h. */ + +#define AFL_QEMU_CPU_SNIPPET2 do { \ + if(tb->pc == afl_entry_point) { \ + afl_setup(); \ + afl_forkserver(env); \ + } \ + afl_maybe_log(tb->pc); \ + } while (0) + +/* We use one additional file descriptor to relay "needs translation" + messages between the child and the fork server. */ + +#define TSL_FD (FORKSRV_FD - 1) + +/* This is equivalent to afl-as.h: */ + +static unsigned char *afl_area_ptr; + +/* Exported variables populated by the code patched into elfload.c: */ + +abi_ulong afl_entry_point, /* ELF entry point (_start) */ + afl_start_code, /* .text start pointer */ + afl_end_code; /* .text end pointer */ + +/* Set on the child in forkserver mode: */ + +static unsigned char afl_fork_child; + +/* Instrumentation ratio: */ + +static unsigned int afl_inst_rms = MAP_SIZE; + +/* Function declarations. */ + +static void afl_setup(void); +static void afl_forkserver(CPUArchState*); +static inline void afl_maybe_log(abi_ulong); + +static void afl_wait_tsl(CPUArchState*, int); +static void afl_request_tsl(target_ulong, target_ulong, uint64_t); + +static TranslationBlock *tb_find_slow(CPUArchState*, target_ulong, + target_ulong, uint64_t); + + +/* Data structure passed around by the translate handlers: */ + +struct afl_tsl { + target_ulong pc; + target_ulong cs_base; + uint64_t flags; +}; + + +/************************* + * ACTUAL IMPLEMENTATION * + *************************/ + + +/* Set up SHM region and initialize other stuff. */ + +static void afl_setup(void) { + + char *id_str = getenv(SHM_ENV_VAR), + *inst_r = getenv("AFL_INST_RATIO"); + + int shm_id; + + if (inst_r) { + + unsigned int r; + + r = atoi(inst_r); + + if (r > 100) r = 100; + if (!r) r = 1; + + afl_inst_rms = MAP_SIZE * r / 100; + + } + + if (id_str) { + + shm_id = atoi(id_str); + afl_area_ptr = shmat(shm_id, NULL, 0); + + if (afl_area_ptr == (void*)-1) exit(1); + + } + + if (getenv("AFL_INST_LIBS")) { + + afl_start_code = 0; + afl_end_code = (abi_ulong)-1; + + } + +} + + +/* Fork server logic, invoked once we hit _start. */ + +static void afl_forkserver(CPUArchState *env) { + + static unsigned char tmp[4]; + + if (!afl_area_ptr) return; + + /* Tell the parent that we're alive. If the parent doesn't want + to talk, assume that we're not running in forkserver mode. */ + + if (write(FORKSRV_FD + 1, tmp, 4) != 4) return; + + /* All right, let's await orders... */ + + while (1) { + + pid_t child_pid; + int status, t_fd[2]; + + /* Whoops, parent dead? */ + + if (read(FORKSRV_FD, tmp, 4) != 4) exit(2); + + /* Establish a channel with child to grab translation commands. We'll + read from t_fd[0], child will write to TSL_FD. */ + + if (pipe(t_fd) || dup2(t_fd[1], TSL_FD) < 0) exit(3); + close(t_fd[1]); + + child_pid = fork(); + if (child_pid < 0) exit(4); + + if (!child_pid) { + + /* Child process. Close descriptors and run free. */ + + afl_fork_child = 1; + close(FORKSRV_FD); + close(FORKSRV_FD + 1); + close(t_fd[0]); + return; + + } + + /* Parent. */ + + close(TSL_FD); + + if (write(FORKSRV_FD + 1, &child_pid, 4) != 4) exit(5); + + /* Collect translation requests until child dies and closes the pipe. */ + + afl_wait_tsl(env, t_fd[0]); + + /* Get and relay exit status to parent. */ + + if (waitpid(child_pid, &status, WUNTRACED) < 0) exit(6); + if (write(FORKSRV_FD + 1, &status, 4) != 4) exit(7); + + } + +} + + +/* The equivalent of the tuple logging routine from afl-as.h. */ + +static inline void afl_maybe_log(abi_ulong cur_loc) { + + static abi_ulong prev_loc; + + /* Optimize for cur_loc > afl_end_code, which is the most likely case on + Linux systems. */ + + if (cur_loc > afl_end_code || cur_loc < afl_start_code || !afl_area_ptr) + return; + + /* Looks like QEMU always maps to fixed locations, so we can skip this: + cur_loc -= afl_start_code; */ + + /* Instruction addresses may be aligned. Let's mangle the value to get + something quasi-uniform. */ + + cur_loc = (cur_loc >> 4) ^ (cur_loc << 8); + cur_loc &= MAP_SIZE - 1; + + /* Implement probabilistic instrumentation by looking at scrambled block + address. This keeps the instrumented locations stable across runs. */ + + if (cur_loc >= afl_inst_rms) return; + + afl_area_ptr[cur_loc ^ prev_loc]++; + prev_loc = cur_loc >> 1; + +} + + +/* This code is invoked whenever QEMU decides that it doesn't have a + translation of a particular block and needs to compute it. When this happens, + we tell the parent to mirror the operation, so that the next fork() has a + cached copy. */ + +static void afl_request_tsl(target_ulong pc, target_ulong cb, uint64_t flags) { + + struct afl_tsl t; + + if (!afl_fork_child) return; + + t.pc = pc; + t.cs_base = cb; + t.flags = flags; + + if (write(TSL_FD, &t, sizeof(struct afl_tsl)) != sizeof(struct afl_tsl)) + return; + +} + + +/* This is the other side of the same channel. Since timeouts are handled by + afl-fuzz simply killing the child, we can just wait until the pipe breaks. */ + +static void afl_wait_tsl(CPUArchState *env, int fd) { + + struct afl_tsl t; + + while (1) { + + /* Broken pipe means it's time to return to the fork server routine. */ + + if (read(fd, &t, sizeof(struct afl_tsl)) != sizeof(struct afl_tsl)) + break; + + tb_find_slow(env, t.pc, t.cs_base, t.flags); + + } + + close(fd); + +} + diff --git a/pkgs/tools/security/afl/qemu-patches/afl-types.h b/pkgs/tools/security/afl/qemu-patches/afl-types.h new file mode 100644 index 000000000000..58d6be51e2d0 --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/afl-types.h @@ -0,0 +1,79 @@ +/* + american fuzzy lop - type definitions and minor macros + ------------------------------------------------------ + + Written and maintained by Michal Zalewski <lcamtuf@google.com> + + Copyright 2013, 2014, 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + */ + +#ifndef _HAVE_TYPES_H +#define _HAVE_TYPES_H + +#include <stdint.h> +#include <stdlib.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; + +/* + + Ugh. There is an unintended compiler / glibc #include glitch caused by + combining the u64 type an %llu in format strings, necessitating a workaround. + + In essence, the compiler is always looking for 'unsigned long long' for %llu. + On 32-bit systems, the u64 type (aliased to uint64_t) is expanded to + 'unsigned long long' in <bits/types.h>, so everything checks out. + + But on 64-bit systems, it is #ifdef'ed in the same file as 'unsigned long'. + Now, it only happens in circumstances where the type happens to have the + expected bit width, *but* the compiler does not know that... and complains + about 'unsigned long' being unsafe to pass to %llu. + + */ + +#ifdef __x86_64__ +typedef unsigned long long u64; +#else +typedef uint64_t u64; +#endif /* ^sizeof(...) */ + +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; +typedef int64_t s64; + +#ifndef MIN +# define MIN(_a,_b) ((_a) > (_b) ? (_b) : (_a)) +# define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b)) +#endif /* !MIN */ + +#define SWAP16(_x) ({ \ + u16 _ret = (_x); \ + (u16)((_ret << 8) | (_ret >> 8)); \ + }) + +#define SWAP32(_x) ({ \ + u32 _ret = (_x); \ + (u32)((_ret << 24) | (_ret >> 24) | \ + ((_ret << 8) & 0x00FF0000) | \ + ((_ret >> 8) & 0x0000FF00)); \ + }) + +#define R(x) (random() % (x)) + +#define STRINGIFY_INTERNAL(x) #x +#define STRINGIFY(x) STRINGIFY_INTERNAL(x) + +#define MEM_BARRIER() \ + asm volatile("" ::: "memory") + +#endif /* ! _HAVE_TYPES_H */ diff --git a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch new file mode 100644 index 000000000000..29b65e71b9ad --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch @@ -0,0 +1,33 @@ +--- qemu-2.2.0/cpu-exec.c.orig 2014-12-09 14:45:40.000000000 +0000 ++++ qemu-2.2.0/cpu-exec.c 2015-02-20 22:07:02.966000000 +0000 +@@ -25,6 +25,8 @@ + #include "sysemu/qtest.h" + #include "qemu/timer.h" + ++#include "afl-qemu-cpu-inl.h" ++ + /* -icount align implementation. */ + + typedef struct SyncClocks { +@@ -262,8 +264,11 @@ + } + not_found: + /* if no translated code available, then translate it now */ ++ + tb = tb_gen_code(cpu, pc, cs_base, flags, 0); + ++ AFL_QEMU_CPU_SNIPPET1; ++ + found: + /* Move the last found TB to the head of the list */ + if (likely(*ptb1)) { +@@ -455,6 +460,9 @@ + next_tb = 0; + tcg_ctx.tb_ctx.tb_invalidated_flag = 0; + } ++ ++ AFL_QEMU_CPU_SNIPPET2; ++ + if (qemu_loglevel_mask(CPU_LOG_EXEC)) { + qemu_log("Trace %p [" TARGET_FMT_lx "] %s\n", + tb->tc_ptr, tb->pc, lookup_symbol(tb->pc)); diff --git a/pkgs/tools/security/afl/qemu-patches/elfload.patch b/pkgs/tools/security/afl/qemu-patches/elfload.patch new file mode 100644 index 000000000000..65f1572e9a7b --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/elfload.patch @@ -0,0 +1,32 @@ +--- qemu-2.2.0/linux-user/elfload.c.orig 2014-12-09 14:45:42.000000000 +0000 ++++ qemu-2.2.0/linux-user/elfload.c 2015-01-28 02:51:23.719000000 +0000 +@@ -28,6 +28,8 @@ + + #define ELF_OSABI ELFOSABI_SYSV + ++extern abi_ulong afl_entry_point, afl_start_code, afl_end_code; ++ + /* from personality.h */ + + /* +@@ -1886,6 +1888,8 @@ + info->brk = 0; + info->elf_flags = ehdr->e_flags; + ++ if (!afl_entry_point) afl_entry_point = info->entry; ++ + for (i = 0; i < ehdr->e_phnum; i++) { + struct elf_phdr *eppnt = phdr + i; + if (eppnt->p_type == PT_LOAD) { +@@ -1919,9 +1923,11 @@ + if (elf_prot & PROT_EXEC) { + if (vaddr < info->start_code) { + info->start_code = vaddr; ++ if (!afl_start_code) afl_start_code = vaddr; + } + if (vaddr_ef > info->end_code) { + info->end_code = vaddr_ef; ++ if (!afl_end_code) afl_end_code = vaddr_ef; + } + } + if (elf_prot & PROT_WRITE) { diff --git a/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch b/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch new file mode 100644 index 000000000000..81d29feea3de --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 +--- a/Makefile ++++ b/Makefile +@@ -384,8 +384,7 @@ install-confdir: + install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" + +-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ +-install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir + ifneq ($(TOOLS),) + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) + endif diff --git a/pkgs/tools/security/afl/qemu-patches/translate-all.patch b/pkgs/tools/security/afl/qemu-patches/translate-all.patch new file mode 100644 index 000000000000..89163b607fdc --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/translate-all.patch @@ -0,0 +1,18 @@ +--- qemu-2.2.0/translate-all.c.orig 2014-12-09 14:45:46.000000000 +0000 ++++ qemu-2.2.0/translate-all.c 2015-01-28 22:37:42.383000000 +0000 +@@ -387,8 +387,13 @@ + /* We can't use g_malloc because it may recurse into a locked mutex. */ + # define ALLOC(P, SIZE) \ + do { \ +- P = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, \ +- MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); \ ++ void* _tmp = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, \ ++ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); \ ++ if (_tmp == (void*)-1) { \ ++ qemu_log(">>> Out of memory for stack, bailing out. <<<\n"); \ ++ exit(1); \ ++ } \ ++ (P) = _tmp; \ + } while (0) + #else + # define ALLOC(P, SIZE) \ diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix new file mode 100644 index 000000000000..929f9fba9a61 --- /dev/null +++ b/pkgs/tools/security/afl/qemu.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl +, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, libaio, libcap_ng, gnutls, pixman, autoconf +, writeText +}: + +with stdenv.lib; + +let + n = "qemu-2.2.0"; + + aflHeaderFile = writeText "afl-qemu-cpu-inl.h" + (builtins.readFile ./qemu-patches/afl-qemu-cpu-inl.h); + aflConfigFile = writeText "afl-config.h" + (builtins.readFile ./qemu-patches/afl-config.h); + aflTypesFile = writeText "afl-types.h" + (builtins.readFile ./qemu-patches/afl-types.h); + + cpuTarget = if stdenv.system == "x86_64-linux" then "x86_64-linux-user" + else if stdenv.system == "i686-linux" then "i386-linux-user" + else throw "afl: no support for ${stdenv.system}!"; +in +stdenv.mkDerivation rec { + name = "afl-${n}"; + + src = fetchurl { + url = "http://wiki.qemu.org/download/${n}.tar.bz2"; + sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + }; + + buildInputs = + [ python zlib pkgconfig glib pixman ncurses perl attr libcap + vde2 texinfo libuuid flex bison lzo snappy autoconf + libcap_ng gnutls + ] + ++ optionals (hasSuffix "linux" stdenv.system) [ libaio ]; + + enableParallelBuilding = true; + + patches = + [ ./qemu-patches/elfload.patch + ./qemu-patches/cpu-exec.patch + ./qemu-patches/no-etc-install.patch + ./qemu-patches/translate-all.patch + ]; + + preConfigure = '' + cp ${aflTypesFile} afl-types.h + cp ${aflConfigFile} afl-config.h + cp ${aflHeaderFile} afl-qemu-cpu-inl.h + ''; + + configureFlags = + [ "--disable-system" + "--enable-linux-user" + "--enable-guest-base" + "--disable-gtk" + "--disable-sdl" + "--disable-vnc" + "--target-list=${cpuTarget}" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + meta = with stdenv.lib; { + homepage = http://www.qemu.org/; + description = "Fork of QEMU with American Fuzzy Lop instrumentation support"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 13046aa0b2d1..239ad596bbbe 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, perl, keyutils, nss, nspr, python, pam -, intltool, makeWrapper, coreutils, gettext, cryptsetup, lvm2, rsync, which }: +{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam +, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }: stdenv.mkDerivation { name = "ecryptfs-104"; @@ -9,16 +9,33 @@ stdenv.mkDerivation { sha256 = "0f3lzpjw97vcdqzzgii03j3knd6pgwn1y0lpaaf46iidaiv0282a"; }; + #TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir; + preConfigure = '' + FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" + for file in $FILES; do + substituteInPlace "$file" \ + --replace /sbin/mount.ecryptfs_private /var/setuid-wrappers/mount.ecryptfs_private \ + --replace /sbin/umount.ecryptfs_private /var/setuid-wrappers/umount.ecryptfs_private \ + --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \ + --replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \ + --replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \ + --replace /usr/bin/ecryptfs-mount-private $out/bin/ecryptfs-mount-private \ + --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \ + --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \ + --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \ + --replace /bin/mount ${utillinux}/bin/mount \ + --replace /bin/umount ${utillinux}/bin/umount \ + --replace /sbin/unix_chkpwd /var/setuid-wrappers/unix_chkpwd \ + --replace /bin/bash ${bash}/bin/bash + done + ''; + buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ]; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; postInstall = '' - FILES="$(grep -r '/bin/sh' $out/bin | sed 's,:.*,,' | uniq)" + FILES="$(grep -r '/bin/sh' $out/bin -l)" for file in $FILES; do - sed -i $file -e "s,\(/sbin/u\?mount.ecryptfs\(_private\)\?\),$out\1," \ - -e "s,\(/sbin/cryptsetup\),${cryptsetup}\1," \ - -e "s,\(/sbin/dmsetup\),${lvm2}\1," \ - -e 's,/sbin/\(unix_chkpwd\),\1,' wrapProgram $file \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${gettext}/bin" \ @@ -32,6 +49,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enterprise-class stacked cryptographic filesystem"; license = licenses.gpl2Plus; + maintainers = [ maintainers.obadz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 3675c8bc390f..c5d2ca1349ce 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.18"; + name = "gnupg-1.4.19"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp"; + sha256 = "7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 0fcf334bee0b..cf11ecb82328 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, libiconv +, libksba, coreutils, libiconv, pcsclite # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null }: stdenv.mkDerivation rec { - name = "gnupg-2.0.26"; + name = "gnupg-2.0.27"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"; + sha256 = "1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p"; }; buildInputs @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + '' + stdenv.lib.optionalString stdenv.isLinux '' + sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' '' + '' diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b9f212de26b1..440d2294b0dd 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext +, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo +, pcsclite }: with stdenv.lib; @@ -14,10 +15,14 @@ stdenv.mkDerivation rec { patches = [ ./socket-activate-2.1.1.patch ]; + postPatch = stdenv.lib.optionalString stdenv.isLinux '' + sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; + buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 - autoreconfHook gettext + autoreconfHook gettext texinfo ]; configureFlags = diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f6e9a07b68fc..57cc9c242483 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "A free and open source utility for network discovery and security auditing"; homepage = http://www.nmap.org; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ mornfall thoughtpolice ]; }; } diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 31ad1108ddad..917c70f29a0a 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,36 +1,47 @@ -{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite -, libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412 +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl +, libiconv, pcsclite, libassuan1, libXt +, docbook_xsl, libxslt, docbook_xml_dtd_412 }: stdenv.mkDerivation rec { - name = "opensc-0.13.0"; + name = "opensc-${version}"; + version = "0.14.0"; - src = fetchurl { - url = "mirror://sourceforge/opensc/${name}.tar.gz"; - sha256 = "054v11yc2lqlfqs556liw18klhkx9zyjylqcwirk4axiafp4dpmb"; + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "OpenSC"; + rev = version; + sha256 = "02q3rndcfd7lga1ph0xcl556rgigzpp9bpwqyn42rfbx8lll7gzv"; }; - buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig + postPatch = '' + sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am + ''; + + buildInputs = [ + autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan1 libXt libxslt libiconv docbook_xml_dtd_412 ]; configureFlags = [ - "--enable-doc" - "--enable-man" + "--enable-zlib" + "--enable-readline" "--enable-openssl" "--enable-pcsc" - "--enable-readline" "--enable-sm" - "--enable-zlib" - "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" + "--enable-man" + "--enable-doc" + "--localstatedir=/var" + "--sysconfdir=/etc" "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" + "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so" ]; - meta = { + meta = with stdenv.lib; { description = "Set of libraries and utilities to access smart cards"; - homepage = "https://github.com/OpenSC/OpenSC/wiki"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = https://github.com/OpenSC/OpenSC/wiki; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ viric wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix new file mode 100644 index 000000000000..72e43f15fe62 --- /dev/null +++ b/pkgs/tools/security/pcsctools/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, pcsclite }: + +stdenv.mkDerivation rec { + name = "pcsc-tools-1.4.23"; + + src = fetchurl { + url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.23.tar.gz"; + sha256 = "1qjgvvvwhykmzn4js9s3rjnp9pbjc3sz4lb4d7i9kvr3xsv7pjk9"; + }; + + buildInputs = [ udev dbus_libs perl pcsclite ]; + + preBuild = '' + makeFlags=DESTDIR=$out + ''; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Tools used to test a PC/SC driver, card or reader"; + homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index db14a5b0e0c7..a109e9ca6a66 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "srm-" + version; - version = "1.2.14"; + version = "1.2.15"; src = fetchurl { - url = "mirror://sourceforge/project/srm/1.2.14/srm-1.2.14.tar.gz"; - sha256 = "1irwwpb7yhmii2v4vz1fjkmmhw7w7qd1ak9arn9zfg3mgcnwl32q"; + url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz"; + sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 783bd1ad7ff3..3a710d564065 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,20 +3,20 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.11p2"; + name = "sudo-1.8.12"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1bd1zf85q15z015268w9vchzwypzalc3v2dnddmwy67s32a88cw1"; + sha256 = "1c7kqhyps5hw38vl7a50f8gqz57mc4npi9l1clkikbg83n252fqn"; }; configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" - "--with-rundir=/run" + "--with-rundir=/run/sudo" "--with-vardir=/var/db/sudo" "--with-logpath=/var/log/sudo.log" "--with-sendmail=${sendmailPath}" @@ -61,5 +61,7 @@ stdenv.mkDerivation rec { license = http://www.sudo.ws/sudo/license.html; maintainers = [ stdenv.lib.maintainers.eelco ]; + + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 150cb49a9c4c..750ab3708729 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "0x2jch8v57z59inncvmq2nr12j0f5by10mgj7sv9cabysj07xb45" else - "07g78gh909gcg4bqdmj1ag1kkl3707qi6l4wa9cm81r364192hha"; + "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else + "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185"; }; patchPhase = '' diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index fd17cef8f1ca..c033814c6311 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.7.2"; + version = "1.8.4"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz"; - sha256 = "1b4qhh6a8z18q7lfa7laxb3p0f7sacvv7nlbr2lix0vznhbffz51"; + sha256 = "1hcy4f6l9c23aa05yi4mr0zbqp0c6v5zq4c3dim076yfmfrh8z6k"; }; prePatch = '' - sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py + sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py ''; doCheck = false; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 9a6e610389bb..9991adf40131 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; homepage = http://packages.qa.debian.org/at; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index e465b16b614a..998be45d9c64 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation { ''; preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; - + meta = { description = "Daemon for running commands at specific times (Vixie Cron)"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix new file mode 100644 index 000000000000..1c231e90db49 --- /dev/null +++ b/pkgs/tools/system/honcho/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip, pythonPackages, buildPythonPackage }: + +let honcho = buildPythonPackage rec { + name = "honcho-${version}"; + version = "0.6.6"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/nickstenning/honcho/archive/v${version}.tar.gz"; + md5 = "f5e6a7f6c1d0c167d410d7f601b4407e"; + }; + + buildInputs = with pythonPackages; [ nose mock jinja2 ]; + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python clone of Foreman, a tool for managing Procfile-based applications."; + license = licenses.mit; + homePage = https://github.com/nickstenning/honcho; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +}; + +in + +# Some of honcho's tests require that honcho be installed in the environment in +# order to work. This is a trick to build it without running tests, then pass +# it to itself as a buildInput so the tests work. +honcho.overrideDerivation (x: { buildInputs = [ honcho ]; doCheck = true; }) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 964ee217108d..771de9205a93 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gzip, popt }: stdenv.mkDerivation rec { - name = "logrotate-3.8.7"; + name = "logrotate-3.8.9"; src = fetchurl { url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; - sha256 = "0r1bs40gwi8awx6rjq3n4lw9fgws97ww2li7z87683p380gnkfpn"; + sha256 = "19yzs7gc8ixr6iqq22n5gbixmvzsgmwp96kp4jiwr8bjj37df3kh"; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index d18c2737854a..2f62ce31949d 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,23 +1,102 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}: +{ stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages +, krb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null +, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null +, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null +, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null +, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null +}: -stdenv.mkDerivation { - name = "rsyslog-7.6.3"; +with stdenv.lib; +let + mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; +in +stdenv.mkDerivation rec { + name = "rsyslog-8.8.0"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz; - sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1"; + url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; + sha256 = "1sx0j5icp172rzcpybjpfw53aj34w8j7k3f1ga0pmbv58r3pwyhl"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging]; + buildInputs = [ + pkgconfig libestr json_c zlib pythonPackages.docutils + krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka + libmongo-client czmq rabbitmq-c hiredis + ] ++ stdenv.lib.optional stdenv.isLinux systemd; - preConfigure = '' - export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" - ''; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + (mkFlag true "largefile") + (mkFlag true "regexp") + (mkFlag (krb5 != null) "gssapi-krb5") + (mkFlag true "klog") + (mkFlag true "kmsg") + (mkFlag (systemd != null) "imjournal") + (mkFlag true "inet") + (mkFlag (jemalloc != null) "jemalloc") + (mkFlag true "unlimited-select") + (mkFlag true "usertools") + (mkFlag (mysql != null) "mysql") + (mkFlag (postgresql != null) "pgsql") + (mkFlag (libdbi != null) "libdbi") + (mkFlag (net_snmp != null) "snmp") + (mkFlag (libuuid != null) "uuid") + (mkFlag (curl != null) "elasticsearch") + (mkFlag (gnutls != null) "gnutls") + (mkFlag (libgcrypt != null) "libgcrypt") + (mkFlag true "rsyslogrt") + (mkFlag true "rsyslogd") + (mkFlag true "mail") + (mkFlag (liblognorm != null) "mmnormalize") + (mkFlag true "mmjsonparse") + (mkFlag true "mmaudit") + (mkFlag true "mmanon") + (mkFlag true "mmutf8fix") + (mkFlag true "mmcount") + (mkFlag true "mmsequence") + (mkFlag true "mmfields") + (mkFlag true "mmpstrucdata") + (mkFlag (openssl != null) "mmrfc5424addhmac") + (mkFlag (librelp != null) "relp") + (mkFlag (libgt != null) "guardtime") + (mkFlag (liblogging != null) "liblogging-stdlog") + (mkFlag (liblogging != null) "rfc3195") + (mkFlag true "imfile") + (mkFlag false "imsolaris") + (mkFlag true "imptcp") + (mkFlag true "impstats") + (mkFlag true "omprog") + (mkFlag (libnet != null) "omudpspoof") + (mkFlag true "omstdout") + (mkFlag (systemd != null) "omjournal") + (mkFlag true "pmlastmsg") + (mkFlag true "pmcisconames") + (mkFlag true "pmciscoios") + (mkFlag true "pmaixforwardedfrom") + (mkFlag true "pmsnare") + (mkFlag true "omruleset") + (mkFlag true "omuxsock") + (mkFlag true "mmsnmptrapd") + (mkFlag (hadoop != null) "omhdfs") + (mkFlag (rdkafka != null) "omkafka") + (mkFlag (libmongo-client != null) "ommongodb") + (mkFlag (czmq != null) "imzmq3") + (mkFlag (czmq != null) "imczmq") + (mkFlag (czmq != null) "omzmq3") + (mkFlag (czmq != null) "omczmq") + (mkFlag (rabbitmq-c != null) "omrabbitmq") + (mkFlag (hiredis != null) "omhiredis") + (mkFlag true "generate-man-pages") + ]; meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index b5380d083cfe..46cbde74a032 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -let version = "0.03.18"; in +let version = "0.03.20"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "0v71h92zfr0n53ws413r4mn9xhh8mavcw9iwhdibxlsn33zhbb4p"; + sha256 = "0j1nppja56cgsd7vg3465y9kbxy3hl8mbyzc254qqm4z9ij1m3dg"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stress test a computer system"; longDescription = '' - Stress test a computer system in various selectable ways, by exercising - various physical subsystems of a computer as well as the various - operating system kernel interfaces. Stress-ng features: + Stress test a system in various selectable ways, exercising both various + physical subsystems and various operating system kernel interfaces: - over 60 different stress tests - over 50 CPU specific stress tests that exercise floating point, integer, bit manipulation and control flow diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index cec906e1f439..4fcc0680ada6 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; + sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; }; buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 165eb316a928..02834b70d629 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: let version = "1.7.0"; @@ -6,17 +6,17 @@ let # These settings are found in the Makefile, but there seems to be no # way to select one ore the other setting other than editing the file # manually, so we have to duplicate the know how here. - systemFlags = - if stdenv.isDarwin then '' + systemFlags = with stdenv; + if isDarwin then '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS= EXTRA_OBJS=strverscmp.o - '' else if stdenv.isCygwin then '' + '' else if isCygwin then '' CFLAGS="-O2 -Wall -fomit-frame-pointer -DCYGWIN" LDFLAGS=-s TREE_DEST=tree.exe EXTRA_OBJS=strverscmp.o - '' else if stdenv.isBSD then '' + '' else if (isFreeBSD || isOpenBSD) then '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS=-s EXTRA_OBJS=strverscmp.o diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index fc40cd4722bb..6662d90e8bd4 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -10,5 +10,6 @@ stdenv.mkDerivation { meta = { homepage = http://ftp.gnu.org/gnu/which/; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/text/gnugrep/cve-2015-1345.patch b/pkgs/tools/text/gnugrep/cve-2015-1345.patch new file mode 100644 index 000000000000..7156f475e7e8 --- /dev/null +++ b/pkgs/tools/text/gnugrep/cve-2015-1345.patch @@ -0,0 +1,60 @@ +From 83a95bd8c8561875b948cadd417c653dbe7ef2e2 Mon Sep 17 00:00:00 2001 +From: Yuliy Pisetsky <ypisetsky@fb.com> +Date: Thu, 01 Jan 2015 23:36:55 +0000 +Subject: grep -F: fix a heap buffer (read) overrun + +grep's read buffer is often filled to its full size, except when +reading the final buffer of a file. In that case, the number of +bytes read may be far less than the size of the buffer. However, for +certain unusual pattern/text combinations, grep -F would mistakenly +examine bytes in that uninitialized region of memory when searching +for a match. With carefully chosen inputs, one can cause grep -F to +read beyond the end of that buffer altogether. This problem arose via +commit v2.18-90-g73893ff with the introduction of a more efficient +heuristic using what is now the memchr_kwset function. The use of +that function in bmexec_trans could leave TP much larger than EP, +and the subsequent call to bm_delta2_search would mistakenly access +beyond end of the main input read buffer. + +* src/kwset.c (bmexec_trans): When TP reaches or exceeds EP, +do not call bm_delta2_search. +* tests/kwset-abuse: New file. +* tests/Makefile.am (TESTS): Add it. +* THANKS.in: Update. +* NEWS (Bug fixes): Mention it. + +Prior to this patch, this command would trigger a UMR: + + printf %0360db 0 | valgrind src/grep -F $(printf %019dXb 0) + + Use of uninitialised value of size 8 + at 0x4142BE: bmexec_trans (kwset.c:657) + by 0x4143CA: bmexec (kwset.c:678) + by 0x414973: kwsexec (kwset.c:848) + by 0x414DC4: Fexecute (kwsearch.c:128) + by 0x404E2E: grepbuf (grep.c:1238) + by 0x4054BF: grep (grep.c:1417) + by 0x405CEB: grepdesc (grep.c:1645) + by 0x405EC1: grep_command_line_arg (grep.c:1692) + by 0x4077D4: main (grep.c:2570) + +See the accompanying test for how to trigger the heap buffer overrun. + +Thanks to Nima Aghdaii for testing and finding numerous +ways to break early iterations of this patch. + +Nix: @vcunat restricted this to the runtime code only to avoid needing autoreconfiguration. +--- +diff --git a/src/kwset.c b/src/kwset.c +index 4003c8d..376f7c3 100644 +--- a/src/kwset.c ++++ b/src/kwset.c +@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) + if (! tp) + return -1; + tp++; ++ if (ep <= tp) ++ break; + } + } + } diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0380d2d2467b..e73458d0abae 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, pcre, libiconv }: -let version = "2.20"; in +let version = "2.21"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; + sha256 = "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"; }; + patches = [ ./cve-2015-1345.patch ]; + buildInputs = [ pcre libiconv ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix new file mode 100644 index 000000000000..da7799900a35 --- /dev/null +++ b/pkgs/tools/text/grin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "grin-1.2.1"; + namePrefix = ""; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz"; + sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz"; + }; + + buildInputs = with pythonPackages; [ nose ]; + propagatedBuildInputs = with pythonPackages; [ argparse ]; + + meta = { + homepage = https://pypi.python.org/pypi/grin; + description = "A grep program configured the way I like it."; + platform = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.sjagoe ]; + }; +} diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix new file mode 100644 index 000000000000..31d58fbccc37 --- /dev/null +++ b/pkgs/tools/text/nkf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "nkf-${version}"; + version = "2.1.3"; + + src = fetchurl { + url = "mirror://sourceforgejp/nkf/59912/${name}.tar.gz"; + sha256 = "8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2"; + }; + + makeFlags = "prefix=\${out}"; + + meta = { + description = "Tool for converting encoding of Japanese text"; + homepage = "http://sourceforge.jp/projects/nkf/"; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 21b35682e4e8..bf95125b208a 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,6 +1,6 @@ # XXX: this may need -liconv on non-glibc systems.. -{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex }: +{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex, texinfo }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - buildInputs = [ python perl autoconf automake libtool intltool flex ]; + nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo ]; preConfigure = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 173571eda23c..79f768a086d8 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { homepage = http://www.tug.org/tetex/; matintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index f7d8f1254c55..6cf9ac3e5ce4 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,13 +1,13 @@ args: with args; rec { - version = "0.7"; + version = "0.8"; name = "moderntimeline-${version}"; src = fetchurl { urls = [ "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" ]; - sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876"; + sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index a1eee51b34d5..49fe7dc681fe 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -3,10 +3,10 @@ , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.25"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0dp5nxq491gymq806za0dk4hngfmq65ysrqbn0ypajqbbl6vf71n"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' diff --git a/pkgs/tools/video/atomicparsley/casts.patch b/pkgs/tools/video/atomicparsley/casts.patch new file mode 100644 index 000000000000..b70a3cbcf854 --- /dev/null +++ b/pkgs/tools/video/atomicparsley/casts.patch @@ -0,0 +1,38 @@ +--- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig 2015-03-13 15:38:16.817904490 -0600 ++++ AtomicParsley-source-0.9.0/AtomicParsley.cpp 2015-03-13 15:48:07.595273416 -0600 +@@ -1447,7 +1447,7 @@ + uint32_t atom_offsets = 0; + char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path + if (output_path == NULL) { +- char* orig_suffix = strrchr(originating_file, '.'); ++ char* orig_suffix = strrchr((char*)originating_file, (int)'.'); + if (orig_suffix == NULL) { + fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n"); + path_len = strlen(originating_file); +@@ -4464,7 +4464,7 @@ + void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) { + char* suffix = NULL; + if (forced_suffix == NULL) { +- suffix = strrchr(filePath, '.'); ++ suffix = strrchr((char*)filePath, (int)'.'); + } else { + suffix = forced_suffix; + } +@@ -4480,7 +4480,7 @@ + memcpy(temp_path, filePath, base_len); + memcpy(temp_path + base_len, file_kind, strlen(file_kind)); + #else +- char* file_name = strrchr(filePath, '/'); ++ char* file_name = strrchr((char*)filePath, (int)'/'); + size_t file_name_len = strlen(file_name); + memcpy(temp_path, filePath, filepath_len-file_name_len+1); + memcpy(temp_path + strlen(temp_path), ".", 1); +@@ -5006,7 +5006,7 @@ + free_modified_name = true; + if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension + uint16_t filename_len = strlen(m4aFile); +- char* suffix = strrchr(m4aFile, '.'); ++ char* suffix = strrchr((char*)m4aFile, (int)'.'); + memcpy(originating_file, m4aFile, filename_len+1 ); + memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 ); + } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix new file mode 100644 index 000000000000..d4b662c88f17 --- /dev/null +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -0,0 +1,29 @@ +{ stdenv, pkgs, fetchurl }: + +stdenv.mkDerivation rec { + name = "AtomicParsley"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://sourceforge/atomicparsley/${name}-source-${version}.zip"; + sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; + }; + + buildInputs = with pkgs; [ unzip ]; + patches = [ ./casts.patch ]; + setSourceRoot = "sourceRoot=${name}-source-${version}"; + buildPhase = "bash build"; + installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; + + meta = with stdenv.lib; { + description = '' + A lightweight command line program for reading, parsing and + setting metadata into MPEG-4 files + ''; + + homepage = http://atomicparsley.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 84dc7c3c0719..a87dd5683229 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchgit, which, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "euca2ools-2.1.3"; + name = "euca2ools-2.1.4"; namePrefix = ""; src = fetchgit { url = https://github.com/eucalyptus/euca2ools.git; - rev = "8ae2ecc"; - sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; + rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; + sha256 = "0f52jqw3s79w391lbzlh83lp55j73clvwmn2np4fy6kxc4j49da1"; }; pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; - doCheck = false; - meta = { homepage = http://open.eucalyptus.com/downloads; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2efc9ea27ad9..4bffb5aeb6ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -492,6 +492,8 @@ let ahcpd = callPackage ../tools/networking/ahcpd { }; + aiccu = callPackage ../tools/networking/aiccu { }; + aide = callPackage ../tools/security/aide { }; aircrackng = callPackage ../tools/networking/aircrack-ng { }; @@ -536,6 +538,8 @@ let }; }; + atomicparsley = callPackage ../tools/video/atomicparsley { }; + attic = callPackage ../tools/backup/attic { }; avfs = callPackage ../tools/filesystems/avfs { }; @@ -697,6 +701,10 @@ let cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + ceres-solver = callPackage ../development/libraries/ceres-solver { + google-gflags = null; # only required for examples/tests + }; + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; @@ -779,7 +787,37 @@ let syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; - rsyslog = callPackage ../tools/system/rsyslog { }; + rsyslog = callPackage ../tools/system/rsyslog { + libgcrypt = libgcrypt_1_6; + czmq = null; # Currently Broken + hadoop = null; # Currently Broken + }; + + rsyslog-light = callPackage ../tools/system/rsyslog { + krb5 = null; + systemd = null; + jemalloc = null; + mysql = null; + postgresql = null; + libdbi = null; + net_snmp = null; + libuuid = null; + curl = null; + gnutls = null; + libgcrypt = null; + liblognorm = null; + openssl = null; + librelp = null; + libgt = null; + liblogging = null; + libnet = null; + hadoop = null; + rdkafka = null; + libmongo-client = null; + czmq = null; + rabbitmq-c = null; + hiredis = null; + }; mcrypt = callPackage ../tools/misc/mcrypt { }; @@ -955,8 +993,16 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + ibus = callPackage ../tools/inputmethods/ibus { }; + + ibus-qt = callPackage ../tools/inputmethods/ibus-qt { }; + + ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; + checkbashism = callPackage ../development/tools/misc/checkbashisms { }; + clamav = callPackage ../tools/security/clamav { }; clex = callPackage ../tools/misc/clex { }; @@ -993,6 +1039,10 @@ let python = python26; }; + cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { + python = python26; + }; + cudatoolkit = cudatoolkit5; curl = callPackage ../tools/networking/curl rec { @@ -1039,6 +1089,10 @@ let detox = callPackage ../tools/misc/detox { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; + + ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -1063,6 +1117,8 @@ let dhcp = callPackage ../tools/networking/dhcp { }; + dhcpdump = callPackage ../tools/networking/dhcpdump { }; + dhcpcd = callPackage ../tools/networking/dhcpcd { }; di = callPackage ../tools/system/di { }; @@ -1181,7 +1237,7 @@ let ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; + euca2ools = callPackage ../tools/virtualization/euca2ools { }; evtest = callPackage ../applications/misc/evtest { }; @@ -1257,6 +1313,8 @@ let flpsed = callPackage ../applications/editors/flpsed { }; + fluentd = callPackage ../tools/misc/fluentd { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -1294,9 +1352,7 @@ let freeipmi = callPackage ../tools/system/freeipmi {}; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - automake = automake114x; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; @@ -1311,7 +1367,7 @@ let ftop = callPackage ../os-specific/linux/ftop { }; fuppes = callPackage ../tools/networking/fuppes { - ffmpeg = ffmpeg_0_6_90; + ffmpeg = ffmpeg_0_5; }; fsfs = callPackage ../tools/filesystems/fsfs { }; @@ -1354,7 +1410,6 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { - libiconv = libiconvOrLibc; ruby = ruby_2_1_3; }; @@ -1376,6 +1431,8 @@ let inherit (xorg) libXpm; }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; @@ -1455,6 +1512,8 @@ let */ graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; + grin = callPackage ../tools/text/grin { }; + grive = callPackage ../tools/filesystems/grive { json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable }; @@ -1465,10 +1524,12 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 }; trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 }; grub2 = grub2_full; @@ -1568,6 +1629,8 @@ let lua = lua5; }; + honcho = callPackage ../tools/system/honcho { }; + host = callPackage ../tools/networking/host { }; hping = callPackage ../tools/networking/hping { }; @@ -1604,7 +1667,7 @@ let ihaskell-with-packages = callPackage ../development/tools/haskell/ihaskell/ng-wrapper.nix { inherit (pythonPackages) ipython; inherit (haskellngPackages) ihaskell ghcWithPackages; - packages = self: []; + packages = self: config.ihaskell.packages or []; }; imapproxy = callPackage ../tools/networking/imapproxy { }; @@ -1707,7 +1770,7 @@ let makebootfat = callPackage ../tools/misc/makebootfat { }; minidlna = callPackage ../tools/networking/minidlna { - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; }; mmv = callPackage ../tools/misc/mmv { }; @@ -1727,16 +1790,12 @@ let nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; - nodePackages = recurseIntoAttrs ( - callPackage ./node-packages.nix { self = nodePackages; } - ); + nodePackages = callPackage ./node-packages.nix { self = nodePackages; }; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; }; iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; }; - iojsPackages = recurseIntoAttrs ( - callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; } - ); + iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; ldapvi = callPackage ../tools/misc/ldapvi { }; @@ -1754,8 +1813,12 @@ let libevdev = callPackage ../development/libraries/libevdev { }; + libevhtp = callPackage ../development/libraries/libevhtp { }; + liboauth = callPackage ../development/libraries/liboauth { }; + libtermkey = callPackage ../development/libraries/libtermkey { }; + libtidy = callPackage ../development/libraries/libtidy { }; libtirpc = callPackage ../development/libraries/ti-rpc { }; @@ -1768,6 +1831,8 @@ let libmbim = callPackage ../development/libraries/libmbim { }; + libmongo-client = callPackage ../development/libraries/libmongo-client { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; @@ -1776,6 +1841,8 @@ let libibverbs = callPackage ../development/libraries/libibverbs { }; + libxcomp = callPackage ../development/libraries/libxcomp { }; + librdmacm = callPackage ../development/libraries/librdmacm { }; limesurvey = callPackage ../servers/limesurvey { }; @@ -2014,6 +2081,8 @@ let ngrok = callPackage ../tools/misc/ngrok { }; + noip = callPackage ../tools/networking/noip { }; + mpack = callPackage ../tools/networking/mpack { }; pa_applet = callPackage ../tools/audio/pa-applet { }; @@ -2036,6 +2105,8 @@ let nitrogen = callPackage ../tools/X11/nitrogen {}; + nkf = callPackage ../tools/text/nkf {}; + nlopt = callPackage ../development/libraries/nlopt {}; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; @@ -2078,6 +2149,8 @@ let nylon = callPackage ../tools/networking/nylon { }; + nxproxy = callPackage ../tools/admin/nxproxy { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; @@ -2187,6 +2260,8 @@ let owncloudclient = callPackage ../applications/networking/owncloud-client { }; + p2pvc = callPackage ../applications/video/p2pvc {}; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; @@ -2203,7 +2278,9 @@ let panomatic = callPackage ../tools/graphics/panomatic { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { + automake = automake112x; # fails with 14 + }; parallel = callPackage ../tools/misc/parallel { }; @@ -2216,7 +2293,6 @@ let pitivi = callPackage ../applications/video/pitivi { gst = gst_all_1; clutter-gtk = clutter_gtk; - inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic; }; p0f = callPackage ../tools/security/p0f { }; @@ -2251,6 +2327,8 @@ let pcsclite = callPackage ../tools/security/pcsclite { }; + pcsctools = callPackage ../tools/security/pcsctools { }; + pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -2324,7 +2402,9 @@ let ponysay = callPackage ../tools/misc/ponysay { }; - povray = callPackage ../tools/graphics/povray { }; + povray = callPackage ../tools/graphics/povray { + automake = automake113x; # fails with 14 + }; ppl = callPackage ../development/libraries/ppl { }; @@ -2334,6 +2414,8 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; + profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; projectm = callPackage ../applications/audio/projectm { }; @@ -2380,6 +2462,10 @@ let openmpi = callPackage ../development/libraries/openmpi { }; + qarte = callPackage ../applications/video/qarte { + sip = pythonPackages.sip_4_16; + }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; @@ -2532,6 +2618,8 @@ let scrot = callPackage ../tools/graphics/scrot { }; + scrolls = callPackage ../games/scrolls { }; + scrypt = callPackage ../tools/security/scrypt { }; sdcv = callPackage ../applications/misc/sdcv { }; @@ -2608,7 +2696,7 @@ let storebrowse = callPackage ../tools/system/storebrowse { }; - fusesmb = callPackage ../tools/filesystems/fusesmb { }; + fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; sl = callPackage ../tools/misc/sl { }; @@ -2686,6 +2774,8 @@ let swaks = callPackage ../tools/networking/swaks { }; + t = callPackage ../tools/misc/t { }; + t1utils = callPackage ../tools/misc/t1utils { }; tarsnap = callPackage ../tools/backup/tarsnap { }; @@ -2700,9 +2790,8 @@ let tcpflow = callPackage ../tools/networking/tcpflow { }; - teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { }; + teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { }; - # Work In Progress: it doesn't start unless running a daemon as root teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { }); @@ -2779,6 +2868,8 @@ let txt2man = callPackage ../tools/misc/txt2man { }; + u9fs = callPackage ../servers/u9fs { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -2966,6 +3057,8 @@ let vlan = callPackage ../tools/networking/vlan { }; + vmtouch = callPackage ../tools/misc/vmtouch { }; + volumeicon = callPackage ../tools/audio/volumeicon { }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -3184,8 +3277,9 @@ let ccl = callPackage ../development/compilers/ccl { }; - clang = wrapCC llvmPackages.clang; + clang = llvmPackages.clang; + clang_36 = llvmPackages.clang; clang_35 = wrapCC llvmPackages_35.clang; clang_34 = wrapCC llvmPackages_34.clang; clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); @@ -3213,8 +3307,8 @@ let }; #Use this instead of stdenv to build with clang - clangStdenv = if stdenv.isDarwin then stdenv else lowPrio (stdenvAdapters.overrideCC stdenv clang); - libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang); + clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang-unwrapped); clean = callPackage ../development/compilers/clean { }; @@ -3496,6 +3590,12 @@ let regexCompat HsSyck random; }; + uhc = callPackage ../development/compilers/uhc/default.nix ({ + stdenv = clangStdenv; + ghcWithPackages = haskellngPackages.ghcWithPackages; + inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib; + }); + gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; @@ -3559,6 +3659,7 @@ let }; haxe = callPackage ../development/compilers/haxe { }; + hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; hhvm = callPackage ../development/compilers/hhvm { }; hiphopvm = hhvm; /* Compatibility alias */ @@ -3581,7 +3682,7 @@ let go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; - go_1_4 = callPackage ../development/compilers/go/1.4.nix { }; + go_1_4 = callPackage ../development/compilers/go/1.4.nix { inherit (darwin) Security; }; go = go_1_4; @@ -3716,12 +3817,14 @@ let llvm = llvmPackages.llvm; + llvm_36 = llvmPackages_36.llvm; + llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; llvm_v = path: callPackage path { }; - llvmPackages = llvmPackages_35; + llvmPackages = llvmPackages_36; llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit stdenv newScope fetchurl; @@ -3733,6 +3836,11 @@ let inherit pkgs stdenv newScope fetchurl isl; }; + llvmPackages_36 = import ../development/compilers/llvm/3.6 { + inherit pkgs stdenv newScope fetchurl isl wrapCC; + inherit (stdenvAdapters) overrideCC; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -3797,6 +3905,10 @@ let ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + + base64 = callPackage ../development/ocaml-modules/base64 { }; + bolt = callPackage ../development/ocaml-modules/bolt { }; camlidl = callPackage ../development/tools/ocaml/camlidl { }; @@ -3873,14 +3985,22 @@ let deriving = callPackage ../development/tools/ocaml/deriving { }; + dolog = callPackage ../development/ocaml-modules/dolog { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; eff = callPackage ../development/interpreters/eff { }; eliom = callPackage ../development/ocaml-modules/eliom { }; + enumerate = callPackage ../development/ocaml-modules/enumerate { + type_conv = ocaml_typeconv; + }; + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; + erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { lwt = ocaml_lwt; sexplib = ocaml_sexplib; @@ -3888,12 +4008,16 @@ let fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; + fileutils = callPackage ../development/ocaml-modules/fileutils { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; fix = callPackage ../development/ocaml-modules/fix { }; functory = callPackage ../development/ocaml-modules/functory { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; @@ -4056,6 +4180,10 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; + qtest = callPackage ../development/ocaml-modules/qtest { + oasis = ocaml_oasis; + }; + re = callPackage ../development/ocaml-modules/re { }; safepass = callPackage ../development/ocaml-modules/safepass { }; @@ -4085,13 +4213,17 @@ let xmlm = callPackage ../development/ocaml-modules/xmlm { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; zed = callPackage ../development/ocaml-modules/zed { }; - ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { }; + ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { + oasis = ocaml_oasis; + }; }; @@ -4119,8 +4251,7 @@ let opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { inherit (ocamlPackages_4_01_0) ocaml; }; - opam_1_2_0 = callPackage ../development/tools/ocaml/opam/1.2.0.nix { }; - opam = opam_1_2_0; + opam = callPackage ../development/tools/ocaml/opam { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; @@ -4129,8 +4260,10 @@ let ocaml = ocaml_3_08_0; }; - rustc = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {}; + rustcAlpha = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {}; + rustcAlpha2 = callPackage ../development/compilers/rustc/1.0.0-alpha2.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; + rustc = rustcAlpha2; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; @@ -4156,6 +4289,8 @@ let smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; @@ -4358,9 +4493,8 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; - automake = automake114x; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf2_5; }; mesos-dns = callPackage ../servers/dns/mesos-dns { }; @@ -4660,7 +4794,9 @@ let autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = automake112x; + automake = automake114x; + + automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -4748,6 +4884,10 @@ let cgdb = callPackage ../development/tools/misc/cgdb { }; + chefdk = callPackage ../development/tools/chefdk { + ruby = ruby_2_0_0; + }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; @@ -4773,6 +4913,9 @@ let ps = if stdenv.isDarwin then darwin.ps else null; }; + cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix { + jsoncpp = jsoncpp-1_6; + }; cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; @@ -4798,8 +4941,8 @@ let csslint = callPackage ../development/web/csslint { }; - libcxx = llvmPackages_35.libcxx; - libcxxabi = llvmPackages_35.libcxxabi; + libcxx = llvmPackages.libcxx; + libcxxabi = llvmPackages.libcxxabi; libsigrok = callPackage ../development/tools/libsigrok { }; @@ -4896,7 +5039,7 @@ let gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; - gnumake = gnumake382; + gnumake = gnumake41; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -4920,8 +5063,6 @@ let hyenae = callPackage ../tools/networking/hyenae { }; - ibus = callPackage ../development/libraries/ibus { }; - icmake = callPackage ../development/tools/build-managers/icmake { }; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { @@ -5207,9 +5348,7 @@ let adns = callPackage ../development/libraries/adns { }; - afflib = callPackage ../development/libraries/afflib { - automake = automake114x; - }; + afflib = callPackage ../development/libraries/afflib { }; agg = callPackage ../development/libraries/agg { }; @@ -5430,7 +5569,7 @@ let dssi = callPackage ../development/libraries/dssi {}; - dragonegg = llvmPackages.dragonegg; + dragonegg = llvmPackages_35.dragonegg; dxflib = callPackage ../development/libraries/dxflib {}; @@ -5476,26 +5615,17 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.x.nix { }; - - ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; - + ffmpeg_0_5 = callPackage ../development/libraries/ffmpeg/0.5.nix { }; + ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; + ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { }; + ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; + ffmpeg_2_5 = callPackage ../development/libraries/ffmpeg/2.5.nix { }; + ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; + # Aliases + ffmpeg_0 = ffmpeg_0_11; + ffmpeg_1 = ffmpeg_1_2; + ffmpeg_2 = ffmpeg_2_5; ffmpeg = ffmpeg_2; ffms = callPackage ../development/libraries/ffms { }; @@ -5596,7 +5726,7 @@ let giblib = callPackage ../development/libraries/giblib { }; - libgit2 = callPackage ../development/libraries/git2 { }; + libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; }; glew = callPackage ../development/libraries/glew { }; @@ -5641,11 +5771,6 @@ let libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; - eglibc = callPackage ../development/libraries/eglibc { - kernelHeaders = linuxHeaders; - installLocales = config.glibc.locales or false; - }; - # Only supported on Linux glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; @@ -5862,6 +5987,8 @@ let libusb = libusb1; }; + hiredis = callPackage ../development/libraries/hiredis { }; + hivex = callPackage ../development/libraries/hivex { inherit (perlPackages) IOStringy; }; @@ -5872,6 +5999,8 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; + hstr = callPackage ../applications/misc/hstr { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -5934,6 +6063,8 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; + jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; jetty_util = callPackage ../development/libraries/java/jetty-util { }; @@ -5946,6 +6077,7 @@ let json_c = callPackage ../development/libraries/json-c { }; jsoncpp = callPackage ../development/libraries/jsoncpp { }; + jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { }; libjson = callPackage ../development/libraries/libjson { }; @@ -6020,7 +6152,9 @@ let libassuan = callPackage ../development/libraries/libassuan { }; - libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; + libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { + automake = automake112x; # fails with 13 and 14 + }; libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; @@ -6079,6 +6213,8 @@ let libctemplate = callPackage ../development/libraries/libctemplate { }; + libctemplate_2_2 = callPackage ../development/libraries/libctemplate/2.2.nix { }; + libcouchbase = callPackage ../development/libraries/libcouchbase { }; libcue = callPackage ../development/libraries/libcue { }; @@ -6282,6 +6418,8 @@ let liblogging = callPackage ../development/libraries/liblogging { }; + liblognorm = callPackage ../development/libraries/liblognorm { }; + libltc = callPackage ../development/libraries/libltc { }; libmcrypt = callPackage ../development/libraries/libmcrypt {}; @@ -6295,6 +6433,7 @@ let libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libnatspec = callPackage ../development/libraries/libnatspec { }; @@ -6315,6 +6454,8 @@ let libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; + librelp = callPackage ../development/libraries/librelp { }; + libresample = callPackage ../development/libraries/libresample {}; librevenge = callPackage ../development/libraries/librevenge {}; @@ -6332,10 +6473,7 @@ let # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = - if stdenv.isGlibc - then stdenv.cc.libc - else callPackage ../development/libraries/libiconv { }; + libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; libiconvReal = callPackage ../development/libraries/libiconv { }; @@ -6352,7 +6490,9 @@ let inherit (gnome) gtkdoc; }; - libinput = callPackage ../development/libraries/libinput { }; + libinput = callPackage ../development/libraries/libinput { + graphviz = graphviz-nox; + }; libiptcdata = callPackage ../development/libraries/libiptcdata { }; @@ -6470,6 +6610,8 @@ let libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libosmpbf = callPackage ../development/libraries/libosmpbf {}; + libotr = callPackage ../development/libraries/libotr { libgcrypt = libgcrypt_1_6; }; @@ -6611,7 +6753,9 @@ let libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; - libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { }); + libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { + automake = automake113x; # fails with 14 + }); libv4l = lowPrio (v4l_utils.override { withQt4 = false; @@ -6731,6 +6875,10 @@ let loudmouth = callPackage ../development/libraries/loudmouth { }; + luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; + + luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; + lzo = callPackage ../development/libraries/lzo { }; matio = callPackage ../development/libraries/matio { }; @@ -6752,7 +6900,7 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; - llvm = llvm_34; + llvm = llvm_35; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( @@ -6878,6 +7026,8 @@ let nss = lowPrio (callPackage ../development/libraries/nss { }); + nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; + nssTools = callPackage ../development/libraries/nss { includeTools = true; }; @@ -6941,7 +7091,10 @@ let opal = callPackage ../development/libraries/opal {}; - openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; + openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; + openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { }; + openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; + openjpeg = openjpeg_2_1; openscenegraph = callPackage ../development/libraries/openscenegraph { giflib = giflib_4_1; @@ -6962,15 +7115,6 @@ let }; }; - # bitcoin 0.9.3 requires openssl 1.0.1j - openssl_1_0_1j = callPackage ../development/libraries/openssl/1.0.1j.nix { - fetchurl = fetchurlBoot; - cryptodevHeaders = linuxPackages.cryptodev.override { - fetchurl = fetchurlBoot; - onlyHeaders = true; - }; - }; - ortp = callPackage ../development/libraries/ortp { srtp = srtp_linphone; }; @@ -7023,7 +7167,7 @@ let poker-eval = callPackage ../development/libraries/poker-eval { }; polkit = callPackage ../development/libraries/polkit { - spidermonkey = spidermonkey_185; + spidermonkey = spidermonkey_17; }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { @@ -7244,6 +7388,8 @@ let SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; + SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf {}; @@ -7272,6 +7418,8 @@ let snappy = callPackage ../development/libraries/snappy { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; + sodium = callPackage ../development/libraries/sodium {}; sofia_sip = callPackage ../development/libraries/sofia-sip { }; @@ -7316,6 +7464,8 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; + stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); @@ -7407,6 +7557,10 @@ let tremor = callPackage ../development/libraries/tremor { }; + uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; + + unibilium = callPackage ../development/libraries/unibilium { }; + unicap = callPackage ../development/libraries/unicap {}; tsocks = callPackage ../development/libraries/tsocks { }; @@ -7543,9 +7697,7 @@ let xdo = callPackage ../tools/misc/xdo { }; - xineLib = callPackage ../development/libraries/xine-lib { - ffmpeg = ffmpeg_1; - }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -7598,6 +7750,7 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + zeromq = zeromq4; cppzmq = callPackage ../development/libraries/cppzmq {}; @@ -7771,6 +7924,13 @@ let planetary_annihilation = callPackage ../games/planetaryannihilation { }; + sqitchPg = callPackage ../development/tools/misc/sqitch { + inherit stdenv perl makeWrapper; + name = "sqitch-pg"; + databaseModule = perlPackages.DBDPg; + sqitchModule = perlPackages.AppSqitch; + }; + ### DEVELOPMENT / PYTHON MODULES # python function with default python interpreter @@ -7884,14 +8044,14 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - withRecommendedPackages = true; + withRecommendedPackages = false; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { - # Those packages are usually installed as part of the R build. - recommendedPackages = with rPackages; [ boot class cluster codetools - foreign KernSmooth lattice MASS Matrix mgcv nlme nnet rpart - spatial survival ]; + recommendedPackages = with rPackages; [ + boot class cluster codetools foreign KernSmooth lattice MASS + Matrix mgcv nlme nnet rpart spatial survival + ]; # Override this attribute to register additional libraries. packages = []; }; @@ -7942,7 +8102,9 @@ let cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra = callPackage ../servers/nosql/cassandra { }; + cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; + cassandra = cassandra_2_1; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; @@ -8000,12 +8162,11 @@ let erlang = erlangR16; }; - prosody = recurseIntoAttrs ( - callPackage ../servers/xmpp/prosody { - lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; - withLibevent = true; - }); + prosody = callPackage ../servers/xmpp/prosody { + lua5 = lua5_1; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; + withLibevent = true; + }; elasticmq = callPackage ../servers/elasticmq { }; @@ -8046,8 +8207,6 @@ let joseki = callPackage ../servers/http/joseki {}; - kafka = callPackage ../servers/kafka { }; - rdkafka = callPackage ../development/libraries/rdkafka { }; leafnode = callPackage ../servers/news/leafnode { }; @@ -8078,6 +8237,8 @@ let mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + mpdscribble = callPackage ../tools/misc/mpdscribble { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; @@ -8108,6 +8269,10 @@ let opensmtpd = callPackage ../servers/mail/opensmtpd { }; + osrm-backend = callPackage ../servers/osrm-backend { }; + + osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; }; + petidomo = callPackage ../servers/mail/petidomo { }; popa3d = callPackage ../servers/mail/popa3d { }; @@ -8148,7 +8313,6 @@ let mariadb = callPackage ../servers/sql/mariadb {}; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost156; sasl = cyrus_sasl; }; @@ -8167,7 +8331,7 @@ let mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; - mysql = mysql51; + mysql = mariadb; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -8206,6 +8370,10 @@ let postgresql = postgresql93; }; + pgpool94 = callPackage ../servers/sql/pgpool/default.nix { + postgresql = postgresql94; + }; + pgpool = pgpool92; postgresql = postgresql92; @@ -8224,6 +8392,22 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus-alertmanager = + callPackage ../servers/monitoring/prometheus/alertmanager { }; + prometheus-cli = + callPackage ../servers/monitoring/prometheus/cli { }; + prometheus-haproxy-exporter = + callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; + prometheus-mesos-exporter = + callPackage ../servers/monitoring/prometheus/mesos_exporter { }; + prometheus-node-exporter = + callPackage ../servers/monitoring/prometheus/node_exporter { }; + prometheus-pushgateway = + callPackage ../servers/monitoring/prometheus/pushgateway { }; + prometheus-statsd-bridge = + callPackage ../servers/monitoring/prometheus/statsd_bridge { }; + psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) { @@ -8265,11 +8449,9 @@ let samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { + libgcrypt = libgcrypt_1_6; python = python2; pythonPackages = python2Packages; - libiconv = if stdenv.isLinux then null else libiconv; - libgcrypt = libgcrypt_1_6; - glusterfs = null; # Broken in the current build }; samba = samba4; @@ -8289,7 +8471,7 @@ let samba4_light = lowPrio (samba4.override { # source3/wscript optionals - heimdal = null; + kerberos = null; openldap = null; cups = null; pam = null; @@ -8297,7 +8479,6 @@ let acl = null; libaio = null; fam = null; - ctdb = null; ceph = null; glusterfs = null; @@ -8324,6 +8505,8 @@ let shishi = callPackage ../servers/shishi { }; + sipcmd = callPackage ../applications/networking/sipcmd { }; + sipwitch = callPackage ../servers/sip/sipwitch { }; spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; @@ -8341,6 +8524,8 @@ let storm = callPackage ../servers/computing/storm { }; + slurm-llnl = callPackage ../servers/computing/slurm { }; + tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; @@ -8425,6 +8610,8 @@ let alienfx = callPackage ../os-specific/linux/alienfx { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; + alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { @@ -8446,6 +8633,13 @@ let perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; + apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; + libapparmor = apparmor_2_9.libapparmor; + apparmor-pam = apparmor_2_9.apparmor-pam; + apparmor-parser = apparmor_2_9.apparmor-parser; + apparmor-profiles = apparmor_2_9.apparmor-profiles; + apparmor-utils = apparmor_2_9.apparmor-utils; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -8505,7 +8699,7 @@ let cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; }; in apple-source-releases // rec { - cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { + cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { cross = assert crossSystem != null; crossSystem; inherit maloader; xctoolchain = xcode.toolchain; @@ -8719,7 +8913,7 @@ let ]; }; - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { + linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; @@ -8939,7 +9133,7 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); - linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; + linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); @@ -9066,18 +9260,12 @@ let pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; - pam_console = callPackage ../os-specific/linux/pam_console { - libtool = libtool_1_5; - }; - pam_devperm = callPackage ../os-specific/linux/pam_devperm { }; pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; - pam_login = callPackage ../os-specific/linux/pam_login { }; - pam_mount = callPackage ../os-specific/linux/pam_mount { }; pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; @@ -9093,9 +9281,9 @@ let config = config.pcmciaUtils.config or null; }; - plymouth = callPackage ../os-specific/linux/plymouth { - automake = automake113x; - }; + perf-tools = callPackage ../os-specific/linux/perf-tools { }; + + plymouth = callPackage ../os-specific/linux/plymouth { }; pmount = callPackage ../os-specific/linux/pmount { }; @@ -9493,6 +9681,10 @@ let nafees = callPackage ../data/fonts/nafees { }; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; + + numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; @@ -9640,6 +9832,8 @@ let inherit (gnome) libgnomecanvas libgnomecanvasmm; }); + ario = callPackage ../applications/audio/ario { }; + arora = callPackage ../applications/networking/browsers/arora { }; atom = callPackage ../applications/editors/atom { @@ -9709,6 +9903,8 @@ let batti = callPackage ../applications/misc/batti { }; + cbatticon = callPackage ../applications/misc/cbatticon { }; + bazaar = callPackage ../applications/version-management/bazaar { }; bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { @@ -9863,6 +10059,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + d4x = callPackage ../applications/misc/d4x { }; darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: { @@ -9941,6 +10139,8 @@ let ed = callPackage ../applications/editors/ed { }; + edbrowse = callPackage ../applications/editors/edbrowse { }; + ekho = callPackage ../applications/audio/ekho { }; electrum = callPackage ../applications/misc/electrum { }; @@ -9950,6 +10150,9 @@ let elvis = callPackage ../applications/editors/elvis { }; emacs = emacs24; + emacsPackages = emacs24Packages; + emacsPackagesNg = emacs24PackagesNg; + emacsMelpa = emacs24PackagesNg; # for backward compatibility emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features @@ -9972,14 +10175,7 @@ let }); emacs24Macport = self.emacs24Macport_24_4; - emacsMelpa = import ./emacs-melpa-packages.nix { - inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo; - external = { - inherit (haskellngPackages) ghc-mod structured-haskell-mode; - }; - }; - - emacsPackages = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -10134,7 +10330,27 @@ let cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); + + emacsPackagesNgGen = emacs: import ./emacs-packages.nix { + overrides = (config.emacsPackageOverrides or (p: {})) pkgs; + + inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs; + + trivialBuild = import ../build-support/emacs/trivial.nix { + inherit lib stdenv emacs texinfo; + }; + + melpaBuild = import ../build-support/emacs/melpa.nix { + inherit lib stdenv fetchurl emacs texinfo; + }; + + external = { + inherit (haskellngPackages) ghc-mod structured-haskell-mode Agda; + }; + }; + + emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); inherit (gnome3) empathy; @@ -10354,6 +10570,7 @@ let pythonSupport = false; }; gitSVN = gitAndTools.gitSVN; + git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27; @@ -10383,7 +10600,7 @@ let libart = gnome2.libart_lgpl; }; # latest version: gnome3.goffice - idea = recurseIntoAttrs (callPackage ../applications/editors/idea { }); + idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -10510,6 +10727,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -10532,6 +10751,8 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -10637,6 +10858,10 @@ let kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kf5 = kf57; qt5 = qt54; + pkgs = pkgs // { + cmake = cmake-3_2; + }; + kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; }); kdeApps_stable = kdeApps_14_12; kdeApps_latest = kdeApps_14_12; @@ -10653,6 +10878,10 @@ let keymon = callPackage ../applications/video/key-mon { }; + khal = callPackage ../applications/misc/khal { + pythonPackages = python3Packages; + }; + kid3 = callPackage ../applications/audio/kid3 { qt = qt4; }; @@ -10929,6 +11158,8 @@ let vaapiSupport = config.mpv.vaapiSupport or false; }; + mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; + mrxvt = callPackage ../applications/misc/mrxvt { }; mudlet = callPackage ../games/mudlet { @@ -10962,10 +11193,10 @@ let withSidebar = true; }; - panamax_api = callPackage ../applications/networking/cluster/panamax/api.nix { + panamax_api = callPackage ../applications/networking/cluster/panamax/api { ruby = ruby_2_1; }; - panamax_ui = callPackage ../applications/networking/cluster/panamax/ui.nix { + panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { ruby = ruby_2_1; }; @@ -10999,7 +11230,11 @@ let lua = lua5; }; - mupdf = callPackage ../applications/misc/mupdf { }; + maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; + + mupdf = callPackage ../applications/misc/mupdf { + openjpeg = openjpeg_2_0_1; + }; mypaint = callPackage ../applications/graphics/mypaint { }; @@ -11182,6 +11417,9 @@ let pulseview = callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; + puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; + + puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -11276,6 +11514,12 @@ let qt = qt4; }); + rofi = callPackage ../applications/misc/rofi { + automake = automake114x; + }; + + rstudio = callPackage ../applications/editors/rstudio { }; + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); @@ -11312,6 +11556,8 @@ let boost = boost155; }; + scim = callPackage ../applications/misc/scim { }; + scite = callPackage ../applications/editors/scite { }; scribus = callPackage ../applications/office/scribus { @@ -11378,11 +11624,18 @@ let copy-com = callPackage ../applications/networking/copy-com { }; - dropbox = callPackage ../applications/networking/dropbox { }; + dropbox = callPackage ../applications/networking/dropbox { + qt5 = qt54; + }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; - lightdm = callPackage ../applications/display-managers/lightdm { }; + lightdm = callPackage ../applications/display-managers/lightdm { + qt4 = null; + qt5 = null; + }; + + lightdm_qt = lightdm.override { qt5 = qt5; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; @@ -11394,11 +11647,14 @@ let printrun = callPackage ../applications/misc/printrun { }; + sddm = callPackage ../applications/display-managers/sddm { + qt5 = qt54; + }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; - smartgithg = callPackage ../applications/version-management/smartgithg { }; slimThemes = recurseIntoAttrs (import ../applications/display-managers/slim/themes.nix { @@ -11413,6 +11669,8 @@ let shntool = callPackage ../applications/audio/shntool { }; + sipp = callPackage ../development/tools/misc/sipp { }; + sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; @@ -11568,6 +11826,8 @@ let gtk = gtk3; }; + timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -11610,6 +11870,8 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; + twister = callPackage ../applications/networking/p2p/twister { }; twmn = callPackage ../applications/misc/twmn { }; @@ -11752,7 +12014,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2_2; + ffmpeg = ffmpeg_2; }; vlc_qt5 = vlc.override { @@ -11795,6 +12057,14 @@ let windowmaker = callPackage ../applications/window-managers/windowmaker { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; + + wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; + + wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; + + wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; + winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { @@ -11926,6 +12196,8 @@ let x11vnc = callPackage ../tools/X11/x11vnc { }; + x2goclient = callPackage ../applications/networking/remote/x2goclient { }; + x2vnc = callPackage ../tools/X11/x2vnc { }; xaos = builderDefsPackage (import ../applications/graphics/xaos) { @@ -12000,9 +12272,10 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { - stdenv = overrideCC stdenv gcc45; - }; + xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { }; + xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; + xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; + xen = xen_4_5_0; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; @@ -12040,6 +12313,8 @@ let xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { ghcWithPackages = haskellngPackages.ghcWithPackages; packages = self: []; @@ -12068,7 +12343,10 @@ let libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { }; + xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { inherit (xlibs) libXinerama; }; + #TODO: 'pil' is not available for python3, yet + xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; }; xrestop = callPackage ../tools/X11/xrestop { }; @@ -12137,6 +12415,8 @@ let zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + girara = callPackage ../applications/misc/girara { gtk = gtk3; stdenv = overrideCC stdenv gcc49; @@ -12454,7 +12734,7 @@ let ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastardx = callPackage ../games/ultrastardx { - ffmpeg = ffmpeg_0_6; + ffmpeg = ffmpeg_0_5; lua = lua5; }; @@ -12578,11 +12858,12 @@ let }) ../desktops/kde-4.14; kdePackagesFor = self: dir: - let callPackageOrig = callPackage; in + let callPackageOrig = newScope { cmake = cmake-3_2; }; in let - callPackage = newScope self; + callPackage = newScope (self // { cmake = cmake-3_2; }); kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; + kdelibs = kdeApps_stable.kdelibs; }; in kde4 // { inherit kde4; @@ -12601,6 +12882,8 @@ let calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; + choqok = callPackage ../applications/networking/instant-messengers/choqok { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; digikam = if builtins.compareVersions "4.9" kde4.release == 1 then @@ -12781,6 +13064,8 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; + numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; + plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { qt5 = qt54; kf5 = kf57; @@ -12790,8 +13075,8 @@ let kde5 = kf5_stable // plasma5_stable // kdeApps_stable; - xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + xfce = xfce4-12; + xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; @@ -13338,6 +13623,13 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; + # Remember to check the default lightdm wallpaper + nixos-artwork = fetchgit { + url = "git://github.com/NixOS/nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -13368,6 +13660,7 @@ let mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { lua = lua5_1; + libctemplate = libctemplate_2_2; inherit (pythonPackages) pexpect paramiko; }; @@ -13548,6 +13841,8 @@ let tup = callPackage ../development/tools/build-managers/tup { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; + vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; giflib = giflib_4_1; @@ -13601,6 +13896,8 @@ let inherit (gnome2) zenity; }; + wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; x2x = callPackage ../tools/X11/x2x { }; diff --git a/pkgs/top-level/emacs-melpa-packages.nix b/pkgs/top-level/emacs-packages.nix index e8f965a784a4..a5a087e16add 100644 --- a/pkgs/top-level/emacs-melpa-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1,27 +1,37 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, fetchgit -, emacs, texinfo - -# non-emacs packages -, external -}: - # package.el-based emacs packages - -## init.el +# +## add this at the start your init.el: # (require 'package) -# (setq package-archives nil -# package-user-dir "~/.nix-profile/share/emacs/site-lisp/elpa") +# +# ;; optional. makes unpure packages archives unavailable +# (setq package-archives nil) +# +# (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa") +# +# ;; optional. use this if you install emacs packages to user profiles (with nix-env) +# (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa") +# # (package-initialize) -with stdenv.lib.licences; +{ overrides -let - melpaBuild = import ../build-support/melpa { - inherit stdenv fetchurl emacs texinfo; - }; -in +, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub + +, emacs +, trivialBuild +, melpaBuild + +, external +}@args: + +with lib.licenses; + +let self = _self // overrides; + callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]); + _self = with self; { + + ## START HERE -rec { ac-haskell-process = melpaBuild rec { pname = "ac-haskell-process"; version = "0.5"; @@ -32,7 +42,7 @@ rec { sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm"; }; packageRequires = [ auto-complete haskell-mode ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; ace-jump-mode = melpaBuild rec { @@ -44,7 +54,10 @@ rec { rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac"; sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6"; }; - meta = { licence = gpl3Plus; }; + meta = { + description = "Advanced cursor movements mode for Emacs"; + license = gpl3Plus; + }; }; ag = melpaBuild rec { @@ -57,7 +70,87 @@ rec { sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k"; }; packageRequires = [ dash s ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + agda2-mode = with external; trivialBuild { + pname = "agda-mode"; + version = Agda.version; + + phases = [ "buildPhase" "installPhase" ]; + + # already byte-compiled by Agda builder + buildPhase = '' + agda=`${Agda}/bin/agda-mode locate` + cp `dirname $agda`/*.el* . + ''; + + meta = { + description = "Agda2-mode for Emacs extracted from Agda package"; + longDescription = '' + Wrapper packages that liberates init.el from `agda-mode locate` magic. + Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el. + ''; + homepage = Agda.meta.homepage; + license = Agda.meta.license; + }; + }; + + alert = melpaBuild rec { + pname = "alert"; + version = "1.2"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = pname; + rev = "v${version}"; + sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26"; + }; + packageRequires = [ gntp log4e ]; + meta = { license = gpl2Plus; }; + }; + + anzu = melpaBuild rec { + pname = "anzu"; + version = "0.52"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-anzu"; + rev = "f41db6225d8fb983324765aa42c94d3ee379a49f"; + sha256 = "1mn20swasrl8kr557r1850vr1q0gcnwlxxafnc6lq5g01kjfcdxd"; + }; + meta = { + description = "Show number of matches in Emacs mode-line while searching"; + longDescription = '' + anzu.el is an Emacs port of anzu.vim. anzu.el provides a minor + mode which displays current match and total matches information + in the mode-line in various search mode. + ''; + homepage = https://github.com/syohex/emacs-anzu/; + license = gpl3Plus; + }; + }; + + apel = melpaBuild rec { + pname = "apel"; + version = "10.8"; + src = fetchFromGitHub { + owner = "wanderlust"; + repo = pname; + rev = "8402e59eadb580f59969114557b331b4d9364f95"; + sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m"; + }; + files = [ + "alist.el" "apel-ver.el" "broken.el" "calist.el" + "emu.el" "filename.el" "install.el" "inv-23.el" "invisible.el" + "mcharset.el" "mcs-20.el" "mcs-e20.el" "mule-caesar.el" + "path-util.el" "pccl-20.el" "pccl.el" "pces-20.el" "pces-e20.el" + "pces.el" "pcustom.el" "poe.el" "poem-e20.el" "poem-e20_3.el" + "poem.el" "product.el" "pym.el" "richtext.el" "static.el" + ]; + meta = { + description = "A Portable Emacs Library"; + license = gpl3Plus; # probably + }; }; async = melpaBuild rec { @@ -69,7 +162,7 @@ rec { rev = "v${version}"; sha256 = "1j6mbvvbnm2m1gpsy9ipxiv76b684nn57yssbqdyiwyy499cma6q"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; auctex = melpaBuild rec { @@ -82,7 +175,7 @@ rec { buildPhase = '' cp $src ${pname}-${version}.tar ''; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; auto-complete = melpaBuild rec { @@ -95,26 +188,55 @@ rec { sha256 = "050lb8qjq7ra35mqp6j6qkwbvq5zj3yhz73aym5kf1vjd42rmjcw"; }; packageRequires = [ popup ]; - meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; license = gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; }; bind-key = melpaBuild { pname = "bind-key"; - version = "20141013"; + version = "20150317"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; - sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; + rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; + sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; }; files = [ "bind-key.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + browse-kill-ring = melpaBuild rec { + pname = "browse-kill-ring"; + version = "20140104"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "f81ca5f14479fa9e938f89bf8f6baa3c4bdfb755"; + sha256 = "149g4qs5dqy6yzdj5smb39id5f72bz64qfv5bjf3ssvhwl2rfba8"; + }; + meta = { + description = "Interactively insert items from Emacs kill-ring"; + homepage = https://github.com/browse-kill-ring/browse-kill-ring/; + license = gpl2Plus; + }; + }; + + caml = melpaBuild rec { + pname = "caml"; + version = "4.2.1"; # TODO: emacs doesn't seem to like 02 as a version component.. + src = fetchFromGitHub { + owner = "ocaml"; + repo = "ocaml"; + rev = "4.02.1"; + sha256 = "05lms9qhcnwgi7k034kiiic58c9da22r32mpak0ahmvp5fylvjpb"; + }; + fileSpecs = [ "emacs/*.el" ]; + configurePhase = "true"; + meta = { license = gpl2Plus; }; }; change-inner = melpaBuild rec { @@ -127,7 +249,7 @@ rec { sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq"; }; packageRequires = [ expand-region ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; circe = melpaBuild rec { @@ -141,7 +263,7 @@ rec { }; packageRequires = [ lcs lui ]; fileSpecs = [ "lisp/circe*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; company = melpaBuild rec { @@ -153,7 +275,7 @@ rec { rev = version; sha256 = "1xwxyqg5dan8m1qkdxyzm066ryf24h07karpdlm3s09izfdny33f"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; dash = melpaBuild rec { @@ -165,7 +287,30 @@ rec { rev = version; sha256 = "1lg31s8y6ljsz6ps765ia5px39wim626xy8fbc4jpk8fym1jh7ay"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + deferred = melpaBuild rec { + version = "0.3.2"; + pname = "deferred"; + + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-${pname}"; + rev = "896d4b53210289afe489e1ee7db4e12cb9248109"; + sha256 = "0ysahdyvlg240dynwn23kk2d9kb432zh2skr1gydm3rxwn6f18r0"; + }; + + meta = { + description = "Simple asynchronous functions for emacs-lisp"; + longDescription = '' + deferred.el provides facilities to manage asynchronous tasks. + The API and implementations were translated from JSDeferred (by cho45) + and Mochikit.Async (by Bob Ippolito) in JavaScript. + ''; + homepage = https://github.com/kiwanami/emacs-deferred; + license = gpl3Plus; + }; }; diminish = melpaBuild rec { @@ -177,7 +322,7 @@ rec { rev = version; sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; epl = melpaBuild rec { @@ -189,7 +334,7 @@ rec { rev = "63c78c08e345455f3d4daa844fdc551a2c18024e"; sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; evil-god-state = melpaBuild rec { @@ -202,7 +347,7 @@ rec { sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy"; }; packageRequires = [ evil god-mode ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; evil-surround = melpaBuild rec { @@ -215,19 +360,25 @@ rec { sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn"; }; packageRequires = [ evil ]; - meta = { licence = gpl3Plus; }; + meta = { + description = "surround.vim emulation for Emacs evil mode"; + license = gpl3Plus; + }; }; evil = melpaBuild { pname = "evil"; version = "20141020"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; packageRequires = [ goto-chg undo-tree ]; - meta = { licence = gpl3Plus; }; + meta = { + description = "Extensible vi layer for Emacs"; + license = gpl3Plus; + }; }; exec-path-from-shell = melpaBuild rec { @@ -239,7 +390,7 @@ rec { rev = "e4af0e9b44738e7474c89ed895200b42e6541515"; sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; expand-region = melpaBuild rec { @@ -251,7 +402,26 @@ rec { rev = "fa413e07c97997d950c92d6012f5442b5c3cee78"; sha256 = "04k0518wfy72wpzsswmncnhd372fxa0r8nbfhmbyfmns8n7sr045"; }; - meta = { licence = gpl3Plus; }; + meta = { + description = "Increases the selected region by semantic units in Emacs"; + license = gpl3Plus; + }; + }; + + flim = melpaBuild rec { + pname = "flim"; + version = "1.14.9"; # 20141216 + src = fetchFromGitHub { + owner = "wanderlust"; + repo = pname; + rev = "488a4d70fb4ae57bdd30dc75c2d75579894e28a2"; + sha256 = "178fhpbyffksr4v3m8jmx4rx2vqyz23qhbyvic5afabxi6lahjfs"; + }; + packageRequires = [ apel ]; + meta = { + description = "Email message encoding library for Emacs"; + license = gpl3Plus; # probably + }; }; flycheck-pos-tip = melpaBuild rec { @@ -264,7 +434,7 @@ rec { sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp"; }; packageRequires = [ flycheck popup ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; flycheck = melpaBuild rec { @@ -277,7 +447,7 @@ rec { sha256 = "0cq7y7ssm6phvx5pfv2yqq4j0yqmm0lhjav7v4a8ql7094cd790a"; }; packageRequires = [ dash pkg-info ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; ghc-mod = melpaBuild rec { @@ -285,7 +455,7 @@ rec { version = external.ghc-mod.version; src = external.ghc-mod.src; fileSpecs = [ "elisp/*.el" ]; - meta = { licence = bsd3; }; + meta = { license = bsd3; }; }; git-commit-mode = melpaBuild rec { @@ -298,7 +468,7 @@ rec { sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "git-commit-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; git-rebase-mode = melpaBuild rec { @@ -311,7 +481,7 @@ rec { sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "git-rebase-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gitattributes-mode = melpaBuild rec { @@ -324,7 +494,7 @@ rec { sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitattributes-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gitconfig-mode = melpaBuild rec { @@ -337,7 +507,7 @@ rec { sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitconfig-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gitignore-mode = melpaBuild rec { @@ -350,7 +520,19 @@ rec { sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitignore-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + gntp = melpaBuild rec { + pname = "gntp"; + version = "0.1"; + src = fetchFromGitHub { + owner = "tekai"; + repo = "${pname}.el"; + rev = "v${version}"; + sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a"; + }; + meta = { license = gpl2Plus; }; }; gnus = melpaBuild rec { @@ -365,7 +547,7 @@ rec { preBuild = '' (cd lisp && make gnus-load.el) ''; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; god-mode = melpaBuild rec { @@ -377,19 +559,19 @@ rec { rev = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6"; sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; goto-chg = melpaBuild rec { pname = "goto-chg"; version = "1.6"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; files = [ "lib/goto-chg.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; haskell-mode = melpaBuild rec { @@ -401,7 +583,7 @@ rec { rev = "0db5efaaeb3b22e5a3fdafa600729e14c1716ee2"; sha256 = "0d63cgzj579cr8zbrnl0inyy35b26sxinqxr7bgrjsngpmhm52an"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; helm-swoop = melpaBuild rec { @@ -414,7 +596,7 @@ rec { sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; }; packageRequires = [ helm ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; helm = melpaBuild rec { @@ -427,7 +609,7 @@ rec { sha256 = "0n2kr6pyzcsi8pq6faxz2y8kicz1gmvj98fzzlq3a107dqqp25ay"; }; packageRequires = [ async ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; hi2 = melpaBuild rec { @@ -439,7 +621,23 @@ rec { rev = version; sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + ido-ubiquitous = melpaBuild rec { + pname = "ido-ubiquitous"; + version = "2.17"; + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = pname; + rev = "323e4cddc05d5a4546c1b64132b2b1e9f8896452"; + sha256 = "0wdjz3cqzrxhrk68g5gyvc9j2rb6f4yw00xbjgw9ldwlhmkwy5ja"; + }; + meta = { + description = "Does what you expected ido-everywhere to do in Emacs"; + homepage = https://github.com/DarwinAwardWinner/ido-ubiquitous/; + license = gpl3Plus; + }; }; idris-mode = melpaBuild rec { @@ -452,7 +650,7 @@ rec { sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb"; }; packageRequires = [ flycheck ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; lcs = melpaBuild rec { @@ -465,7 +663,19 @@ rec { sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; fileSpecs = [ "lisp/lcs*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + log4e = melpaBuild rec { + pname = "log4e"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "aki2o"; + repo = pname; + rev = "v${version}"; + sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"; + }; + meta = { license = gpl2Plus; }; }; lui = melpaBuild rec { @@ -479,7 +689,7 @@ rec { }; packageRequires = [ tracking ]; fileSpecs = [ "lisp/lui*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; magit = melpaBuild rec { @@ -492,7 +702,7 @@ rec { sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; }; packageRequires = [ git-commit-mode git-rebase-mode ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; markdown-mode = melpaBuild rec { @@ -504,9 +714,23 @@ rec { rev = "v${version}"; sha256 = "1l2w0j9xl8pipz61426s79jq2yns42vjvysc6yjc29kbsnhalj29"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + monokai-theme = melpaBuild rec { + pname = "monokai-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "oneKelvinSmith"; + repo = "monokai-emacs"; + rev = "v${version}"; + sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz"; + }; + meta = { license = gpl3Plus; }; }; + nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; + org-plus-contrib = melpaBuild rec { pname = "org-plus-contrib"; version = "20141020"; @@ -517,7 +741,29 @@ rec { buildPhase = '' cp $src ${pname}-${version}.tar ''; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + org-trello = melpaBuild rec { + pname = "org-trello"; + version = "0.6.9.3"; + src = fetchFromGitHub { + owner = "org-trello"; + repo = pname; + rev = "f1e1401a373dd492eee49fb131b1cd66b3a9ac37"; + sha256 = "003gdh8rgdl3k8h20wgbciqyacyqr64w1wfdqvwm9qdz414q5yj3"; + }; + packageRequires = [ request-deferred deferred dash s ]; + files = [ "org-trello-*.el" ]; + meta = { + description = "Org minor mode - 2-way sync org & trello"; + longDescription = '' + Org-trello is an emacs minor mode that extends org-mode with + Trello abilities. + ''; + homepage = https://org-trello.github.io; + license = gpl3Plus; + }; }; pkg-info = melpaBuild rec { @@ -530,7 +776,7 @@ rec { sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p"; }; packageRequires = [ epl ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; popup = melpaBuild rec { @@ -542,7 +788,7 @@ rec { rev = "v${version}"; sha256 = "0836ayyz1syvd9ry97ya06l8mpr88c6xbgb4d98szj6iwbypcj7b"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; projectile = melpaBuild rec { @@ -555,7 +801,59 @@ rec { sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58"; }; packageRequires = [ dash helm s pkg-info epl ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + request = melpaBuild rec { + pname = "request"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-${pname}"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + + request-deferred = melpaBuild rec { + pname = "request-deferred"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-request"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + packageRequires = [ request deferred ]; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; }; rich-minority = melpaBuild rec { @@ -568,7 +866,7 @@ rec { sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k"; }; packageRequires = [ dash ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; s = melpaBuild rec { @@ -580,7 +878,23 @@ rec { rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + semi = melpaBuild rec { + pname = "semi"; + version = "1.14.7"; # 20150203 + src = fetchFromGitHub { + owner = "wanderlust"; + repo = pname; + rev = "9976269556c5bcc021e4edf1b0e1accd39929528"; + sha256 = "1g1xg57pz4msd3f998af5gq28qhmvi410faygzspra6y6ygaka68"; + }; + packageRequires = [ apel flim ]; + meta = { + description = "MIME library for Emacs"; + license = gpl3Plus; # probably + }; }; shorten = melpaBuild rec { @@ -593,7 +907,7 @@ rec { sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; fileSpecs = [ "lisp/shorten*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; smart-mode-line = melpaBuild rec { @@ -606,7 +920,7 @@ rec { sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6"; }; packageRequires = [ dash rich-minority ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; smartparens = melpaBuild rec { @@ -619,7 +933,23 @@ rec { sha256 = "16pzd740vd1r3qfmxia2ibiarinm6xpja0mjv3nni5dis5s4r9gc"; }; packageRequires = [ dash ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + smex = melpaBuild rec { + pname = "smex"; + version = "20141210"; + src = fetchFromGitHub { + owner = "nonsequitur"; + repo = pname; + rev = "aff8d4485139ac28f1c7e62912c0d0d480995831"; + sha256 = "0017f1ji7rxad2n49dhn5g0pmw6lmw80cqk6dynszizj46xpbqfp"; + }; + meta = { + description = "M-x enhancement for Emacs build on top of Ido"; + homepage = https://github.com/nonsequitur/smex/; + license = emacs.meta.license; # should be "same as Emacs" + }; }; structured-haskell-mode = melpaBuild rec { @@ -646,7 +976,7 @@ rec { rev = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5"; sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; tracking = melpaBuild rec { @@ -660,7 +990,20 @@ rec { }; packageRequires = [ shorten ]; fileSpecs = [ "lisp/tracking*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + tuareg = melpaBuild rec { + pname = "tuareg"; + version = "2.0.9"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = pname; + rev = version; + sha256 = "1j2smhqrwy0zydhbyjkpnwzq05fgfa85kc0d9kzwq0mppdndspp4"; + }; + packageRequires = [ caml ]; + meta = { license = gpl3Plus; }; }; undo-tree = melpaBuild rec { @@ -671,21 +1014,21 @@ rec { rev = "a3e81b682053a81e082139300ef0a913a7a610a2"; sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; use-package = melpaBuild rec { pname = "use-package"; - version = "20141013"; + version = "20150317"; src = fetchFromGitHub { owner = "jwiegley"; repo = pname; - rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; - sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; + rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; + sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; volatile-highlights = melpaBuild rec { @@ -697,7 +1040,28 @@ rec { rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"; sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + wanderlust = melpaBuild rec { + pname = "wanderlust"; + version = "2.15.9"; # 20150301 + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "13fb4f6519490d4ac7138f3bcf76707654348071"; + sha256 = "1l48xfcwkm205prspa1rns6lqfizik5gpdwmlfgyb5mabm9x53zn"; + }; + packageRequires = [ apel flim semi ]; + fileSpecs = [ + "doc/wl.texi" "doc/wl-ja.texi" + "elmo/*.el" "wl/*.el" + "etc/icons" + ]; + meta = { + description = "E-Mail client for Emacs"; + license = gpl3Plus; # probably + }; }; weechat = melpaBuild rec { @@ -709,11 +1073,11 @@ rec { rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706"; sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28"; }; - postPatch = stdenv.lib.optionalString (!stdenv.isLinux) '' + postPatch = lib.optionalString (!stdenv.isLinux) '' rm weechat-sauron.el weechat-secrets.el ''; packageRequires = [ s ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; wgrep = melpaBuild rec { @@ -725,6 +1089,20 @@ rec { rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; + }; + + zenburn-theme = melpaBuild rec { + pname = "zenburn-theme"; + version = "2.2"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = "zenburn-emacs"; + rev = "v${version}"; + sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv"; + }; + meta = { license = gpl3Plus; }; }; -} + + +}; in self diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 538506a5c1eb..4f9f6947c98d 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1,7 +1,7 @@ /* This file defines the composition for Go packages. */ { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb -, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr }: +, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }: let self = _self // overrides; _self = with self; { @@ -10,13 +10,26 @@ let self = _self // overrides; _self = with self; { ## OFFICIAL GO PACKAGES crypto = buildGoPackage rec { - rev = "31393df5baea"; + rev = "1351f936d976c60a0a48d728281922cf63eafb8d"; name = "go-crypto-${rev}"; - goPackagePath = "code.google.com/p/go.crypto"; - src = fetchhg { + goPackagePath = "golang.org/x/crypto"; + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; + owner = "golang"; + repo = "crypto"; + sha256 = "1vf4z97y7xnhzjizik0lghr7ip77hhdj9kbb35rr4c9sn108f20j"; + }; + }; + + glog = buildGoPackage rec { + rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; + name = "glog-${rev}"; + goPackagePath = "github.com/golang/glog"; + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "glog"; + sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; }; }; @@ -44,13 +57,14 @@ let self = _self // overrides; _self = with self; { }; protobuf = buildGoPackage rec { - rev = "36be16571e14"; - name = "goprotobuf-${rev}"; - goPackagePath = "code.google.com/p/goprotobuf"; - src = fetchhg { + rev = "5677a0e3d5e89854c9974e1256839ee23f8233ca"; + name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/golang/protobuf"; + src = fetchFromGitHub { inherit rev; - url = "https://code.google.com/p/goprotobuf"; - sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + owner = "golang"; + repo = "protobuf"; + sha256 = "18dzxmy0gfjnwa9x8k3hv9calvmydv0dnz1iibykkzd20gw4l85v"; }; subPackages = [ "proto" "protoc-gen-go" ]; }; @@ -81,6 +95,18 @@ let self = _self // overrides; _self = with self; { ## THIRD PARTY + asn1-ber = buildGoPackage rec { + rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047"; + name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/nmcclain/asn1-ber"; + src = fetchFromGitHub { + inherit rev; + owner = "nmcclain"; + repo = "asn1-ber"; + sha256 = "0a2d38k7zpcnf148zlxq2rm7s1s1hzybb3w5ygxilipz0m7qkdsb"; + }; + }; + binarydist = buildGoPackage rec { rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}"; @@ -189,6 +215,71 @@ let self = _self // overrides; _self = with self; { }; }; + fsnotify = buildGoPackage rec { + rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; + name = "fsnotify-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/howeyc/fsnotify"; + src = fetchFromGitHub { + inherit rev; + owner = "howeyc"; + repo = "fsnotify"; + sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; + }; + }; + + g2s = buildGoPackage rec { + rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; + name = "g2s-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/peterbourgon/g2s"; + src = fetchFromGitHub { + inherit rev; + owner = "peterbourgon"; + repo = "g2s"; + sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; + }; + }; + + ginkgo = buildGoPackage rec { + rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2"; + name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/onsi/ginkgo"; + src = fetchFromGitHub { + inherit rev; + owner = "onsi"; + repo = "ginkgo"; + sha256 = "0ghrx5qmgvgb8cbvsj53v1ir4j9agilg4wyhpk5ikqdv6mmqly4h"; + }; + subPackages = [ "./" ]; # don't try to build test fixtures + }; + + goamz = buildGoPackage rec { + rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; + name = "goamz-${rev}"; + goPackagePath = "github.com/goamz/goamz"; + src = fetchFromGitHub { + inherit rev; + owner = "goamz"; + repo = "goamz"; + sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; + }; + propagatedBuildInputs = [ go-ini ]; + + # These might need propagating too, but I haven't tested the entire library + buildInputs = [ sets go-simplejson check-v1 ]; + }; + + goautoneg = buildGoPackage rec { + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + name = "goautoneg-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "bitbucket.org/ww/goautoneg"; + + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + }; + gocheck = buildGoPackage rec { rev = "87"; name = "gocheck-${rev}"; @@ -213,6 +304,81 @@ let self = _self // overrides; _self = with self; { doCheck = false; # please check again }; + govers = buildGoPackage rec { + rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; + name = "govers-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/rogpeppe/govers"; + src = fetchFromGitHub { + inherit rev; + owner = "rogpeppe"; + repo = "govers"; + sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; + }; + }; + + golang_protobuf_extensions = buildGoPackage rec { + rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; + name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchFromGitHub { + inherit rev; + owner = "matttproud"; + repo = "golang_protobuf_extensions"; + sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; + }; + buildInputs = [ protobuf ]; + }; + + goleveldb = buildGoPackage rec { + rev = "e9e2c8f6d3b9c313fb4acaac5ab06285bcf30b04"; + name = "goleveldb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/syndtr/goleveldb"; + src = fetchFromGitHub { + inherit rev; + owner = "syndtr"; + repo = "goleveldb"; + sha256 = "0vg3pcrbdhbmanwkc5njxagi64f4k2ikfm173allcghxcjamrkwv"; + }; + propagatedBuildInputs = [ ginkgo gomega gosnappy ]; + }; + + gomega = buildGoPackage rec { + rev = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2"; + name = "gomega-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/onsi/gomega"; + src = fetchFromGitHub { + inherit rev; + owner = "onsi"; + repo = "gomega"; + sha256 = "1rf6cxn50d1pji3pv4q372s395r5nxwcgp405z2r2mfdkri4v3w4"; + }; + }; + + gosnappy = buildGoPackage rec { + rev = "ce8acff4829e0c2458a67ead32390ac0a381c862"; + name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/syndtr/gosnappy"; + src = fetchFromGitHub { + inherit rev; + owner = "syndtr"; + repo = "gosnappy"; + sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; + }; + }; + + gox = buildGoPackage rec { + rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549"; + name = "gox-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/gox"; + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "gox"; + sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; + }; + buildInputs = [ iochan ]; + }; + go-assert = buildGoPackage rec { rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; name = "assert-${stdenv.lib.strings.substring 0 7 rev}"; @@ -284,6 +450,18 @@ let self = _self // overrides; _self = with self; { subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ]; }; + go-homedir = buildGoPackage rec { + rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52"; + name = "go-homedir-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/go-homedir"; + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "go-homedir"; + sha256 = "1ixhwxnvq1qx53asq47yhg3l88ndwrnyw4fkkidcjg759dc86d0i"; + }; + }; + go-hostpool = buildGoPackage rec { rev = "fed86fae5cacdc77e7399937e2f8836563620a2e"; name = "go-hostpool-${stdenv.lib.strings.substring 0 7 rev}"; @@ -296,6 +474,18 @@ let self = _self // overrides; _self = with self; { }; }; + go-ini = buildGoPackage rec { + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + name = "go-ini-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/vaughan0/go-ini"; + src = fetchFromGitHub { + inherit rev; + owner = "vaughan0"; + repo = "go-ini"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + }; + rcrowley.go-metrics = buildGoPackage rec { rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df"; name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; @@ -359,6 +549,18 @@ let self = _self // overrides; _self = with self; { }; }; + go-runit = buildGoPackage rec { + rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; + name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/soundcloud/go-runit"; + src = fetchFromGitHub { + inherit rev; + owner = "soundcloud"; + repo = "go-runit"; + sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v"; + }; + }; + go-simplejson = buildGoPackage rec { rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; name = "go-simplejson-${stdenv.lib.strings.substring 0 7 rev}"; @@ -423,6 +625,48 @@ let self = _self // overrides; _self = with self; { }; }; + hologram = buildGoPackage rec { + rev = "6e81a11091f59a9392e424d8f1c42b4b813c4bff"; + name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/AdRoll/hologram"; + src = fetchFromGitHub { + inherit rev; + owner = "copumpkin"; + repo = "hologram"; + sha256 = "1rpnc8sv9mwm9r9yfh8h2zxczznmvlhasrz55bcifmk4sym4ywq7"; + }; + preBuild = '' + cd "go/src/$goPackagePath" + + govers -d -m code.google.com/p/goprotobuf github.com/golang/protobuf + + # Work around `go install` assuming containing directory is the executable name we want + for i in */bin; do + mv "$i" "$(dirname "$i")/$(dirname "$i")" + done + + # Generate protobuf definitions and static assets + sed -i '1s|^|SHELL = ${stdenv.shell}\n|' Makefile + make protocol/hologram.pb.go + make transport/remote/bindata.go + ''; + + buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata + go-homedir ldap g2s gox govers ]; + }; + + httprouter = buildGoPackage rec { + rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1"; + name = "httprouter-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/julienschmidt/httprouter"; + src = fetchFromGitHub { + inherit rev; + owner = "julienschmidt"; + repo = "httprouter"; + sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9"; + }; + }; + influxdb-go = buildGoPackage rec { rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7"; name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; @@ -458,6 +702,20 @@ let self = _self // overrides; _self = with self; { }; }; + ldap = buildGoPackage rec { + rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5"; + name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/nmcclain/ldap"; + src = fetchFromGitHub { + inherit rev; + owner = "nmcclain"; + repo = "ldap"; + sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk"; + }; + propagatedBuildInputs = [ asn1-ber ]; + subPackages = [ "./" ]; + }; + log4go = buildGoPackage rec { rev = "48"; name = "log4go-${rev}"; @@ -524,6 +782,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ go-codec armon.go-metrics ]; }; + mesos-stats = buildGoPackage rec { + rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; + name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/antonlindstrom/mesos_stats"; + src = fetchFromGitHub { + inherit rev; + owner = "antonlindstrom"; + repo = "mesos_stats"; + sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; + }; + + propagatedBuildInputs = [ prometheus.client_golang glog ]; + }; + mgo = buildGoPackage rec { rev = "2"; name = "mgo-${rev}"; @@ -559,6 +831,18 @@ let self = _self // overrides; _self = with self; { }; }; + ntp = buildGoPackage rec { + rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; + name = "ntp-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/beevik/ntp"; + src = fetchFromGitHub { + inherit rev; + owner = "beevik"; + repo = "ntp"; + sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24"; + }; + }; + oglematchers = buildGoPackage rec { rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e"; name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}"; @@ -622,6 +906,18 @@ let self = _self // overrides; _self = with self; { }; }; + beorn7.perks = buildGoPackage rec { + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/beorn7/perks"; + src = fetchFromGitHub { + inherit rev; + owner = "beorn7"; + repo = "perks"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + }; + pflag = buildGoPackage rec { date = "20131112"; rev = "94e98a55fb412fcbcfc302555cb990f5e1590627"; @@ -648,6 +944,51 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ kr.text ]; }; + prometheus.client_golang = buildGoPackage rec { + name = "prometheus-client-${version}"; + version = "0.3.2"; + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchFromGitHub { + owner = "prometheus"; + repo = "client_golang"; + rev = "${version}"; + sha256 = "1fn56zp420hxpm0prr76yyhh62zq3sqj3ppl2r4qxjc78f8ckbj4"; + }; + propagatedBuildInputs = [ + protobuf + golang_protobuf_extensions + prometheus.client_model + prometheus.procfs + beorn7.perks + goautoneg + ]; + }; + + prometheus.client_model = buildGoPackage rec { + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + name = "prometheus-client-model-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/prometheus/client_model"; + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "client_model"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + buildInputs = [ protobuf ]; + }; + + prometheus.procfs = buildGoPackage rec { + rev = "92faa308558161acab0ada1db048e9996ecec160"; + name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/prometheus/procfs"; + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "procfs"; + sha256 = "0kaw81z2yi45f6ll6n2clr2zz60bdgdxzqnxvd74flynz4sr0p1v"; + }; + }; + pty = buildGoPackage rec { rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; name = "pty-${stdenv.lib.strings.substring 0 7 rev}"; @@ -660,6 +1001,68 @@ let self = _self // overrides; _self = with self; { }; }; + pushover = buildGoPackage rec { + rev = "a8420a1935479cc266bda685cee558e86dad4b9f"; + name = "pushover-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/thorduri/pushover"; + src = fetchFromGitHub { + inherit rev; + owner = "thorduri"; + repo = "pushover"; + sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq"; + }; + }; + + raw = buildGoPackage rec { + rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4"; + name = "raw-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/feyeleanor/raw"; + src = fetchFromGitHub { + inherit rev; + owner = "feyeleanor"; + repo = "raw"; + sha256 = "0z4dcnadgk0fbxxd14dqa1wzzr0v3ksqlzd0swzs2mipim5wjgsz"; + }; + }; + + rgbterm = buildGoPackage rec { + rev = "9e3d038e1b8341ed7416c841a884cab4a3487941"; + name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/aybabtme/rgbterm"; + src = fetchFromGitHub { + inherit rev; + owner = "aybabtme"; + repo = "rgbterm"; + sha256 = "1pfg56pkm9clzd3c1s0czvydw1k35jggz9ydv8x2dbns3f7qn2ph"; + }; + }; + + sets = buildGoPackage rec { + rev = "6c54cb57ea406ff6354256a4847e37298194478f"; + name = "sets-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/feyeleanor/sets"; + src = fetchFromGitHub { + inherit rev; + owner = "feyeleanor"; + repo = "sets"; + sha256 = "1l3hyl8kmwb9k6qi8x4w54g2cmydap0g3cqvs47bhvm47rg1j1zc"; + }; + propagatedBuildInputs = [ slices ]; + }; + + slices = buildGoPackage rec { + rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea"; + name = "slices-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/feyeleanor/slices"; + src = fetchFromGitHub { + inherit rev; + owner = "feyeleanor"; + repo = "slices"; + sha256 = "1miqhzqgww41d8xbvmxfzx9rsfxgw742nqz96mhjkxpadrxg870v"; + }; + propagatedBuildInputs = [ raw ]; + }; + snappy-go = buildGoPackage rec { rev = "14"; name = "snappy-go-${rev}"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 25c790b8f3dd..3ed9123a3ac5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -295,6 +295,27 @@ let }; }; + cjson = buildLuaPackage rec { + name = "cjson-${version}"; + version = "2.1.0"; + src = fetchurl { + url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz"; + sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; + }; + preBuild = '' + sed -i "s|/usr/local|$out|" Makefile + ''; + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + postInstall = '' + rm -rf $out/share/lua/${lua.luaversion}/cjson/tests + ''; + installTargets = "install install-extra"; + meta = { + description = "Lua C extension module for JSON support"; + license = stdenv.lib.licenses.mit; + }; + }; + luaMessagePack = buildLuaPackage rec { name = "lua-MessagePack-${version}"; version = "0.3.1"; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 356368d137d3..c507acf8b1d1 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -50,7 +50,7 @@ releaseTools.sourceTarball rec { fi # 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 + for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking pkgs/top-level/all-packages.nix on $platform" NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 4b96ca505ca4..dd0614b3145d 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5,6 +5,7 @@ self.by-version."7f"."1.1.3"; by-version."7f"."1.1.3" = self.buildNodePackage { name = "7f-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/7f/-/7f-1.1.3.tgz"; @@ -14,13 +15,18 @@ deps = { "bits-0.1.1" = self.by-version."bits"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "7f" = self.by-version."7f"."1.1.3"; by-spec."Base64"."~0.2.0" = self.by-version."Base64"."0.2.1"; by-version."Base64"."0.2.1" = self.buildNodePackage { name = "Base64-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"; @@ -29,12 +35,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."CSSselect"."~0.4.0" = self.by-version."CSSselect"."0.4.1"; by-version."CSSselect"."0.4.1" = self.buildNodePackage { name = "CSSselect-0.4.1"; + version = "0.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; @@ -45,12 +56,17 @@ "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7"; "domutils-1.4.3" = self.by-version."domutils"."1.4.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."CSSwhat"."0.4" = self.by-version."CSSwhat"."0.4.7"; by-version."CSSwhat"."0.4.7" = self.buildNodePackage { name = "CSSwhat-0.4.7"; + version = "0.4.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; @@ -59,12 +75,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."JSONPath"."^0.10.0" = self.by-version."JSONPath"."0.10.0"; by-version."JSONPath"."0.10.0" = self.buildNodePackage { name = "JSONPath-0.10.0"; + version = "0.10.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/JSONPath/-/JSONPath-0.10.0.tgz"; @@ -72,14 +93,40 @@ sha1 = "44959bdd94e3641858e7f2147d93c732f3505b1c"; }; deps = { - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."JSONStream"."~0.10.0" = + self.by-version."JSONStream"."0.10.0"; + by-version."JSONStream"."0.10.0" = self.buildNodePackage { + name = "JSONStream-0.10.0"; + version = "0.10.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; + name = "JSONStream-0.10.0.tgz"; + sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; + }; + deps = { + "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."JSONStream"."~0.6.4" = self.by-version."JSONStream"."0.6.4"; by-version."JSONStream"."0.6.4" = self.buildNodePackage { name = "JSONStream-0.6.4"; + version = "0.6.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz"; @@ -90,12 +137,17 @@ "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5"; "through-2.2.7" = self.by-version."through"."2.2.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."JSONStream"."~0.7.1" = self.by-version."JSONStream"."0.7.4"; by-version."JSONStream"."0.7.4" = self.buildNodePackage { name = "JSONStream-0.7.4"; + version = "0.7.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz"; @@ -106,12 +158,17 @@ "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."JSONStream"."~0.8.3" = self.by-version."JSONStream"."0.8.4"; by-version."JSONStream"."0.8.4" = self.buildNodePackage { name = "JSONStream-0.8.4"; + version = "0.8.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; @@ -122,7 +179,11 @@ "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."JSONStream"."~0.8.4" = self.by-version."JSONStream"."0.8.4"; @@ -130,6 +191,7 @@ self.by-version."abbrev"."1.0.5"; by-version."abbrev"."1.0.5" = self.buildNodePackage { name = "abbrev-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; @@ -138,7 +200,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."abbrev"."1.0.x" = self.by-version."abbrev"."1.0.5"; @@ -150,6 +216,7 @@ self.by-version."accepts"."1.0.7"; by-version."accepts"."1.0.7" = self.buildNodePackage { name = "accepts-1.0.7"; + version = "1.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz"; @@ -160,7 +227,11 @@ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."accepts"."~1.0.7" = self.by-version."accepts"."1.0.7"; @@ -168,6 +239,7 @@ self.by-version."accepts"."1.1.4"; by-version."accepts"."1.1.4" = self.buildNodePackage { name = "accepts-1.1.4"; + version = "1.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; @@ -178,7 +250,11 @@ "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."accepts"."~1.1.2" = self.by-version."accepts"."1.1.4"; @@ -186,10 +262,11 @@ self.by-version."accepts"."1.1.4"; by-spec."accepts"."~1.1.4" = self.by-version."accepts"."1.1.4"; - by-spec."accepts"."~1.2.3" = + by-spec."accepts"."~1.2.4" = self.by-version."accepts"."1.2.4"; by-version."accepts"."1.2.4" = self.buildNodePackage { name = "accepts-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/accepts/-/accepts-1.2.4.tgz"; @@ -200,14 +277,17 @@ "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."accepts"."~1.2.4" = - self.by-version."accepts"."1.2.4"; by-spec."acorn"."^0.11.0" = self.by-version."acorn"."0.11.0"; by-version."acorn"."0.11.0" = self.buildNodePackage { name = "acorn-0.11.0"; + version = "0.11.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz"; @@ -216,12 +296,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."acorn"."~0.9.0" = self.by-version."acorn"."0.9.0"; by-version."acorn"."0.9.0" = self.buildNodePackage { name = "acorn-0.9.0"; + version = "0.9.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz"; @@ -230,12 +315,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."acorn-globals"."^1.0.0" = self.by-version."acorn-globals"."1.0.2"; by-version."acorn-globals"."1.0.2" = self.buildNodePackage { name = "acorn-globals-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.2.tgz"; @@ -245,7 +335,11 @@ deps = { "acorn-0.11.0" = self.by-version."acorn"."0.11.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."acorn-globals"."^1.0.1" = self.by-version."acorn-globals"."1.0.2"; @@ -253,6 +347,7 @@ self.by-version."active-x-obfuscator"."0.0.1"; by-version."active-x-obfuscator"."0.0.1" = self.buildNodePackage { name = "active-x-obfuscator-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; @@ -262,12 +357,17 @@ deps = { "zeparser-0.0.5" = self.by-version."zeparser"."0.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."addr-to-ip-port"."^1.0.0" = self.by-version."addr-to-ip-port"."1.4.0"; by-version."addr-to-ip-port"."1.4.0" = self.buildNodePackage { name = "addr-to-ip-port-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.0.tgz"; @@ -276,14 +376,38 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."addr-to-ip-port"."^1.0.1" = self.by-version."addr-to-ip-port"."1.4.0"; + by-spec."addressparser"."^0.3.1" = + self.by-version."addressparser"."0.3.2"; + by-version."addressparser"."0.3.2" = self.buildNodePackage { + name = "addressparser-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + name = "addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."addressparser"."~0.1.3" = self.by-version."addressparser"."0.1.3"; by-version."addressparser"."0.1.3" = self.buildNodePackage { name = "addressparser-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; @@ -292,26 +416,19 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."addressparser"."~0.2.1" = - self.by-version."addressparser"."0.2.1"; - by-version."addressparser"."0.2.1" = self.buildNodePackage { - name = "addressparser-0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; - name = "addressparser-0.2.1.tgz"; - sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."addressparser"."~0.3.2" = + self.by-version."addressparser"."0.3.2"; by-spec."adm-zip"."0.4.4" = self.by-version."adm-zip"."0.4.4"; by-version."adm-zip"."0.4.4" = self.buildNodePackage { name = "adm-zip-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"; @@ -320,12 +437,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."adm-zip"."~0.4.3" = self.by-version."adm-zip"."0.4.7"; by-version."adm-zip"."0.4.7" = self.buildNodePackage { name = "adm-zip-0.4.7"; + version = "0.4.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; @@ -334,12 +456,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."adm-zip"."~0.4.4" = + self.by-version."adm-zip"."0.4.7"; by-spec."after"."0.8.1" = self.by-version."after"."0.8.1"; by-version."after"."0.8.1" = self.buildNodePackage { name = "after-0.8.1"; + version = "0.8.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz"; @@ -348,12 +477,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."agent-base"."~1.0.1" = self.by-version."agent-base"."1.0.1"; by-version."agent-base"."1.0.1" = self.buildNodePackage { name = "agent-base-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz"; @@ -362,31 +496,38 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."airplay-js"."^0.2.0" = - self.by-version."airplay-js"."0.2.11"; - by-version."airplay-js"."0.2.11" = self.buildNodePackage { - name = "airplay-js-0.2.11"; + by-spec."airplay-js"."^0.2.5" = + self.by-version."airplay-js"."0.2.12"; + by-version."airplay-js"."0.2.12" = self.buildNodePackage { + name = "airplay-js-0.2.12"; + version = "0.2.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.11.tgz"; - name = "airplay-js-0.2.11.tgz"; - sha1 = "276dc149bb5ce19d13632d7cab7afd4e759e37cc"; + url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.12.tgz"; + name = "airplay-js-0.2.12.tgz"; + sha1 = "fcc1ea106b5541982c34367ac674ce3bfa8a99ec"; }; deps = { - "asyncblock-2.1.24" = self.by-version."asyncblock"."2.1.24"; "mdns-js-0.2.5" = self.by-version."mdns-js"."0.2.5"; "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."airplay-js"."^0.2.5" = - self.by-version."airplay-js"."0.2.11"; by-spec."alea"."~0.0.9" = self.by-version."alea"."0.0.9"; by-version."alea"."0.0.9" = self.buildNodePackage { name = "alea-0.0.9"; + version = "0.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/alea/-/alea-0.0.9.tgz"; @@ -395,12 +536,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."almond"."*" = self.by-version."almond"."0.3.0"; by-version."almond"."0.3.0" = self.buildNodePackage { name = "almond-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/almond/-/almond-0.3.0.tgz"; @@ -409,13 +555,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "almond" = self.by-version."almond"."0.3.0"; by-spec."alter"."~0.2.0" = self.by-version."alter"."0.2.0"; by-version."alter"."0.2.0" = self.buildNodePackage { name = "alter-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/alter/-/alter-0.2.0.tgz"; @@ -425,12 +576,17 @@ deps = { "stable-0.1.5" = self.by-version."stable"."0.1.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."amdefine"."*" = self.by-version."amdefine"."0.1.0"; by-version."amdefine"."0.1.0" = self.buildNodePackage { name = "amdefine-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; @@ -439,7 +595,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "amdefine" = self.by-version."amdefine"."0.1.0"; by-spec."amdefine".">=0.0.4" = @@ -448,6 +608,7 @@ self.by-version."amqp"."0.2.3"; by-version."amqp"."0.2.3" = self.buildNodePackage { name = "amqp-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/amqp/-/amqp-0.2.3.tgz"; @@ -457,12 +618,17 @@ deps = { "lodash-1.3.1" = self.by-version."lodash"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansi"."^0.3.0" = self.by-version."ansi"."0.3.0"; by-version."ansi"."0.3.0" = self.buildNodePackage { name = "ansi-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"; @@ -471,14 +637,38 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansi"."~0.3.0" = self.by-version."ansi"."0.3.0"; + by-spec."ansi-color"."0.2.1" = + self.by-version."ansi-color"."0.2.1"; + by-version."ansi-color"."0.2.1" = self.buildNodePackage { + name = "ansi-color-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz"; + name = "ansi-color-0.2.1.tgz"; + sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."ansi-regex"."^0.1.0" = self.by-version."ansi-regex"."0.1.0"; by-version."ansi-regex"."0.1.0" = self.buildNodePackage { name = "ansi-regex-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz"; @@ -487,12 +677,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansi-regex"."^0.2.0" = self.by-version."ansi-regex"."0.2.1"; by-version."ansi-regex"."0.2.1" = self.buildNodePackage { name = "ansi-regex-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; @@ -501,30 +696,40 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansi-regex"."^0.2.1" = self.by-version."ansi-regex"."0.2.1"; by-spec."ansi-regex"."^1.0.0" = - self.by-version."ansi-regex"."1.1.0"; - by-version."ansi-regex"."1.1.0" = self.buildNodePackage { - name = "ansi-regex-1.1.0"; + self.by-version."ansi-regex"."1.1.1"; + by-version."ansi-regex"."1.1.1" = self.buildNodePackage { + name = "ansi-regex-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz"; - name = "ansi-regex-1.1.0.tgz"; - sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357"; + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + name = "ansi-regex-1.1.1.tgz"; + sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansi-regex"."^1.1.0" = - self.by-version."ansi-regex"."1.1.0"; + self.by-version."ansi-regex"."1.1.1"; by-spec."ansi-remover"."*" = self.by-version."ansi-remover"."0.0.2"; by-version."ansi-remover"."0.0.2" = self.buildNodePackage { name = "ansi-remover-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz"; @@ -533,13 +738,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "ansi-remover" = self.by-version."ansi-remover"."0.0.2"; by-spec."ansi-styles"."^1.1.0" = self.by-version."ansi-styles"."1.1.0"; by-version."ansi-styles"."1.1.0" = self.buildNodePackage { name = "ansi-styles-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; @@ -548,12 +758,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansicolors"."~0.3.2" = self.by-version."ansicolors"."0.3.2"; by-version."ansicolors"."0.3.2" = self.buildNodePackage { name = "ansicolors-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; @@ -562,12 +777,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ansistyles"."~0.1.3" = self.by-version."ansistyles"."0.1.3"; by-version."ansistyles"."0.1.3" = self.buildNodePackage { name = "ansistyles-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; @@ -576,12 +796,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."anymatch"."^1.1.0" = self.by-version."anymatch"."1.1.0"; by-version."anymatch"."1.1.0" = self.buildNodePackage { name = "anymatch-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/anymatch/-/anymatch-1.1.0.tgz"; @@ -591,12 +816,17 @@ deps = { "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."apparatus".">= 0.0.6" = self.by-version."apparatus"."0.0.8"; by-version."apparatus"."0.0.8" = self.buildNodePackage { name = "apparatus-0.0.8"; + version = "0.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz"; @@ -606,12 +836,17 @@ deps = { "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."archiver"."~0.12.0" = self.by-version."archiver"."0.12.0"; by-version."archiver"."0.12.0" = self.buildNodePackage { name = "archiver-0.12.0"; + version = "0.12.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz"; @@ -628,12 +863,17 @@ "tar-stream-1.0.2" = self.by-version."tar-stream"."1.0.2"; "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."archy"."0" = self.by-version."archy"."0.0.2"; by-version."archy"."0.0.2" = self.buildNodePackage { name = "archy-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz"; @@ -642,7 +882,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."archy"."0.0.2" = self.by-version."archy"."0.0.2"; @@ -650,6 +894,7 @@ self.by-version."archy"."1.0.0"; by-version."archy"."1.0.0" = self.buildNodePackage { name = "archy-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; @@ -658,7 +903,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."archy"."~1.0.0" = self.by-version."archy"."1.0.0"; @@ -666,6 +915,7 @@ self.by-version."are-we-there-yet"."1.0.2"; by-version."are-we-there-yet"."1.0.2" = self.buildNodePackage { name = "are-we-there-yet-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz"; @@ -675,12 +925,17 @@ deps = { "delegates-0.1.0" = self.by-version."delegates"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; by-version."argparse"."0.1.15" = self.buildNodePackage { name = "argparse-0.1.15"; + version = "0.1.15"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; @@ -691,12 +946,17 @@ "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.16"; by-version."argparse"."0.1.16" = self.buildNodePackage { name = "argparse-0.1.16"; + version = "0.1.16"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; @@ -707,12 +967,38 @@ "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."~ 1.0.0" = + self.by-version."argparse"."1.0.1"; + by-version."argparse"."1.0.1" = self.buildNodePackage { + name = "argparse-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-1.0.1.tgz"; + name = "argparse-1.0.1.tgz"; + sha1 = "cb1010b8559920fc8aee521eb9e80e4851790923"; + }; + deps = { + "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; + "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-differ"."^1.0.0" = self.by-version."array-differ"."1.0.0"; by-version."array-differ"."1.0.0" = self.buildNodePackage { name = "array-differ-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; @@ -721,12 +1007,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-filter"."~0.0.0" = self.by-version."array-filter"."0.0.1"; by-version."array-filter"."0.0.1" = self.buildNodePackage { name = "array-filter-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; @@ -735,12 +1026,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-indexofobject"."~0.0.1" = self.by-version."array-indexofobject"."0.0.1"; by-version."array-indexofobject"."0.0.1" = self.buildNodePackage { name = "array-indexofobject-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz"; @@ -749,12 +1045,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-loop"."^1.0.0" = self.by-version."array-loop"."1.0.0"; by-version."array-loop"."1.0.0" = self.buildNodePackage { name = "array-loop-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz"; @@ -763,12 +1064,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-map"."~0.0.0" = self.by-version."array-map"."0.0.0"; by-version."array-map"."0.0.0" = self.buildNodePackage { name = "array-map-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; @@ -777,12 +1083,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-reduce"."~0.0.0" = self.by-version."array-reduce"."0.0.0"; by-version."array-reduce"."0.0.0" = self.buildNodePackage { name = "array-reduce-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; @@ -791,12 +1102,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."array-uniq"."^1.0.2" = self.by-version."array-uniq"."1.0.2"; by-version."array-uniq"."1.0.2" = self.buildNodePackage { name = "array-uniq-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"; @@ -805,12 +1121,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."arraybuffer.slice"."0.0.6" = self.by-version."arraybuffer.slice"."0.0.6"; by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage { name = "arraybuffer.slice-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; @@ -819,12 +1140,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."asap"."^1.0.0" = self.by-version."asap"."1.0.0"; by-version."asap"."1.0.0" = self.buildNodePackage { name = "asap-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; @@ -833,12 +1159,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."asap"."^2.0.0" = self.by-version."asap"."2.0.1"; by-version."asap"."2.0.1" = self.buildNodePackage { name = "asap-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/asap/-/asap-2.0.1.tgz"; @@ -847,7 +1178,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."asap"."~1.0.0" = self.by-version."asap"."1.0.0"; @@ -855,6 +1190,7 @@ self.by-version."ascii-json"."0.2.0"; by-version."ascii-json"."0.2.0" = self.buildNodePackage { name = "ascii-json-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz"; @@ -863,12 +1199,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ascli"."~0.3" = self.by-version."ascli"."0.3.0"; by-version."ascli"."0.3.0" = self.buildNodePackage { name = "ascli-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; @@ -879,12 +1220,17 @@ "colour-0.7.1" = self.by-version."colour"."0.7.1"; "optjs-3.2.1-boom" = self.by-version."optjs"."3.2.1-boom"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = self.buildNodePackage { name = "asn1-0.1.11"; + version = "0.1.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; @@ -893,12 +1239,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."asn1"."0.2.1" = self.by-version."asn1"."0.2.1"; by-version."asn1"."0.2.1" = self.buildNodePackage { name = "asn1-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz"; @@ -907,12 +1258,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."asn1.js".">=1.0.0-0 >=1.0.0-0 <2.0.0-0" = + by-spec."asn1.js".">=1.0.0 >=1.0.0 <2.0.0" = self.by-version."asn1.js"."1.0.3"; by-version."asn1.js"."1.0.3" = self.buildNodePackage { name = "asn1.js-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz"; @@ -922,9 +1278,13 @@ deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0"; + }; + optionalDependencies = { "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."asn1.js"."^1.0.0" = self.by-version."asn1.js"."1.0.3"; @@ -932,6 +1292,7 @@ self.by-version."asn1.js-rfc3280"."1.0.0"; by-version."asn1.js-rfc3280"."1.0.0" = self.buildNodePackage { name = "asn1.js-rfc3280-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz"; @@ -940,13 +1301,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."asn1.js"."1.0.3"]; + os = [ ]; + cpu = [ ]; }; by-spec."assert"."*" = self.by-version."assert"."1.3.0"; by-version."assert"."1.3.0" = self.buildNodePackage { name = "assert-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; @@ -956,13 +1322,20 @@ deps = { "util-0.10.3" = self.by-version."util"."0.10.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "assert" = self.by-version."assert"."1.3.0"; + by-spec."assert"."^1.1.1" = + self.by-version."assert"."1.3.0"; by-spec."assert"."~1.1.0" = self.by-version."assert"."1.1.2"; by-version."assert"."1.1.2" = self.buildNodePackage { name = "assert-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/assert/-/assert-1.1.2.tgz"; @@ -972,7 +1345,11 @@ deps = { "util-0.10.3" = self.by-version."util"."0.10.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."assert"."~1.3.0" = self.by-version."assert"."1.3.0"; @@ -980,6 +1357,7 @@ self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = self.buildNodePackage { name = "assert-plus-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; @@ -988,12 +1366,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."assert-plus"."0.1.3" = self.by-version."assert-plus"."0.1.3"; by-version."assert-plus"."0.1.3" = self.buildNodePackage { name = "assert-plus-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz"; @@ -1002,12 +1385,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."assert-plus"."0.1.5" = self.by-version."assert-plus"."0.1.5"; by-version."assert-plus"."0.1.5" = self.buildNodePackage { name = "assert-plus-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; @@ -1016,7 +1404,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."assert-plus"."^0.1.5" = self.by-version."assert-plus"."0.1.5"; @@ -1024,6 +1416,7 @@ self.by-version."assertion-error"."1.0.0"; by-version."assertion-error"."1.0.0" = self.buildNodePackage { name = "assertion-error-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; @@ -1032,12 +1425,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ast-traverse"."~0.1.1" = self.by-version."ast-traverse"."0.1.1"; by-version."ast-traverse"."0.1.1" = self.buildNodePackage { name = "ast-traverse-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz"; @@ -1046,12 +1444,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ast-types"."~0.3.22" = self.by-version."ast-types"."0.3.38"; by-version."ast-types"."0.3.38" = self.buildNodePackage { name = "ast-types-0.3.38"; + version = "0.3.38"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ast-types/-/ast-types-0.3.38.tgz"; @@ -1061,41 +1464,38 @@ deps = { "private-0.1.6" = self.by-version."private"."0.1.6"; }; - peerDependencies = []; - }; - by-spec."ast-types"."~0.4.7" = - self.by-version."ast-types"."0.4.13"; - by-version."ast-types"."0.4.13" = self.buildNodePackage { - name = "ast-types-0.4.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ast-types/-/ast-types-0.4.13.tgz"; - name = "ast-types-0.4.13.tgz"; - sha1 = "445bd0b0f235028f5dc5b532fca27dc7b19ed754"; - }; - deps = { - "depd-1.0.0" = self.by-version."depd"."1.0.0"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ast-types"."~0.6.1" = - self.by-version."ast-types"."0.6.12"; - by-version."ast-types"."0.6.12" = self.buildNodePackage { - name = "ast-types-0.6.12"; + self.by-version."ast-types"."0.6.14"; + by-version."ast-types"."0.6.14" = self.buildNodePackage { + name = "ast-types-0.6.14"; + version = "0.6.14"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.12.tgz"; - name = "ast-types-0.6.12.tgz"; - sha1 = "ea7e5b0750b6ebd9d3f492011c0f7e0c55e035b0"; + url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.14.tgz"; + name = "ast-types-0.6.14.tgz"; + sha1 = "ee2da2c2bdd4cb5c95d29c24d394f7a769a03efd"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."ast-types"."~0.6.12" = + self.by-version."ast-types"."0.6.14"; by-spec."astw"."~0.0.0" = self.by-version."astw"."0.0.0"; by-version."astw"."0.0.0" = self.buildNodePackage { name = "astw-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/astw/-/astw-0.0.0.tgz"; @@ -1105,12 +1505,17 @@ deps = { "esprima-1.0.2" = self.by-version."esprima"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."astw"."~0.1.0" = self.by-version."astw"."0.1.0"; by-version."astw"."0.1.0" = self.buildNodePackage { name = "astw-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz"; @@ -1120,12 +1525,17 @@ deps = { "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."astw"."~1.1.0" = self.by-version."astw"."1.1.0"; by-version."astw"."1.1.0" = self.buildNodePackage { name = "astw-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz"; @@ -1135,12 +1545,17 @@ deps = { "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."async"."*" = self.by-version."async"."0.9.0"; by-version."async"."0.9.0" = self.buildNodePackage { name = "async-0.9.0"; + version = "0.9.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; @@ -1149,13 +1564,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "async" = self.by-version."async"."0.9.0"; by-spec."async"."0.1.18" = self.by-version."async"."0.1.18"; by-version."async"."0.1.18" = self.buildNodePackage { name = "async-0.1.18"; + version = "0.1.18"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.18.tgz"; @@ -1164,12 +1584,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."async"."0.1.22" = self.by-version."async"."0.1.22"; by-version."async"."0.1.22" = self.buildNodePackage { name = "async-0.1.22"; + version = "0.1.22"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; @@ -1178,7 +1603,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."async"."0.1.x" = self.by-version."async"."0.1.22"; @@ -1186,6 +1615,7 @@ self.by-version."async"."0.2.9"; by-version."async"."0.2.9" = self.buildNodePackage { name = "async-0.2.9"; + version = "0.2.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; @@ -1194,12 +1624,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."async"."0.2.x" = self.by-version."async"."0.2.10"; by-version."async"."0.2.10" = self.buildNodePackage { name = "async-0.2.10"; + version = "0.2.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; @@ -1208,7 +1643,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."async"."0.9.0" = self.by-version."async"."0.9.0"; @@ -1240,6 +1679,7 @@ self.by-version."async-each"."0.1.6"; by-version."async-each"."0.1.6" = self.buildNodePackage { name = "async-each-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"; @@ -1248,12 +1688,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."async-each"."~0.1.5" = + self.by-version."async-each"."0.1.6"; by-spec."async-some"."~1.0.1" = self.by-version."async-some"."1.0.1"; by-version."async-some"."1.0.1" = self.buildNodePackage { name = "async-some-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz"; @@ -1263,45 +1710,39 @@ deps = { "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; }; - peerDependencies = []; - }; - by-spec."asyncblock"."^2.1.23" = - self.by-version."asyncblock"."2.1.24"; - by-version."asyncblock"."2.1.24" = self.buildNodePackage { - name = "asyncblock-2.1.24"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/asyncblock/-/asyncblock-2.1.24.tgz"; - name = "asyncblock-2.1.24.tgz"; - sha1 = "8f5c5f95cf5d1b50fead4595ae596f40f2c8d255"; - }; - deps = { - "fibers-1.0.5" = self.by-version."fibers"."1.0.5"; - "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.1.12"; - by-version."aws-sdk"."2.1.12" = self.buildNodePackage { - name = "aws-sdk-2.1.12"; + self.by-version."aws-sdk"."2.1.13"; + by-version."aws-sdk"."2.1.13" = self.buildNodePackage { + name = "aws-sdk-2.1.13"; + version = "2.1.13"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.12.tgz"; - name = "aws-sdk-2.1.12.tgz"; - sha1 = "639419d26dc653020cc5ebd760ef09e193206843"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.13.tgz"; + name = "aws-sdk-2.1.13.tgz"; + sha1 = "7ffbe7fa2a3fa97bd4a9924ca58e4220e92250f9"; }; deps = { "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6"; "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.1.12"; + "aws-sdk" = self.by-version."aws-sdk"."2.1.13"; by-spec."aws-sdk"."2.0.5" = self.by-version."aws-sdk"."2.0.5"; by-version."aws-sdk"."2.0.5" = self.buildNodePackage { name = "aws-sdk-2.0.5"; + version = "2.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.5.tgz"; @@ -1313,12 +1754,17 @@ "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6"; "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = self.buildNodePackage { name = "aws-sdk-1.18.0"; + version = "1.18.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; @@ -1329,12 +1775,17 @@ "xml2js-0.2.4" = self.by-version."xml2js"."0.2.4"; "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."aws-sdk-apis"."3.x" = self.by-version."aws-sdk-apis"."3.1.10"; by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage { name = "aws-sdk-apis-3.1.10"; + version = "3.1.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.10.tgz"; @@ -1343,12 +1794,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."aws-sign"."~0.2.0" = self.by-version."aws-sign"."0.2.0"; by-version."aws-sign"."0.2.0" = self.buildNodePackage { name = "aws-sign-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; @@ -1357,12 +1813,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."aws-sign"."~0.3.0" = self.by-version."aws-sign"."0.3.0"; by-version."aws-sign"."0.3.0" = self.buildNodePackage { name = "aws-sign-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"; @@ -1371,12 +1832,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = self.buildNodePackage { name = "aws-sign2-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; @@ -1385,12 +1851,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."backbone"."*" = self.by-version."backbone"."1.1.2"; by-version."backbone"."1.1.2" = self.buildNodePackage { name = "backbone-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz"; @@ -1398,15 +1869,20 @@ sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d"; }; deps = { - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "backbone" = self.by-version."backbone"."1.1.2"; by-spec."backoff"."2.1.0" = self.by-version."backoff"."2.1.0"; by-version."backoff"."2.1.0" = self.buildNodePackage { name = "backoff-2.1.0"; + version = "2.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz"; @@ -1415,12 +1891,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."backoff"."~2.3.0" = self.by-version."backoff"."2.3.0"; by-version."backoff"."2.3.0" = self.buildNodePackage { name = "backoff-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz"; @@ -1429,12 +1910,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."balanced-match"."^0.2.0" = self.by-version."balanced-match"."0.2.0"; by-version."balanced-match"."0.2.0" = self.buildNodePackage { name = "balanced-match-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; @@ -1443,12 +1929,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base-converter"."1.1.2" = self.by-version."base-converter"."1.1.2"; by-version."base-converter"."1.1.2" = self.buildNodePackage { name = "base-converter-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base-converter/-/base-converter-1.1.2.tgz"; @@ -1457,12 +1948,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base62"."0.1.1" = self.by-version."base62"."0.1.1"; by-version."base62"."0.1.1" = self.buildNodePackage { name = "base62-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; @@ -1471,12 +1967,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64-arraybuffer"."0.1.2" = self.by-version."base64-arraybuffer"."0.1.2"; by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage { name = "base64-arraybuffer-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; @@ -1485,12 +1986,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64-js"."0.0.6" = self.by-version."base64-js"."0.0.6"; by-version."base64-js"."0.0.6" = self.buildNodePackage { name = "base64-js-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; @@ -1499,12 +2005,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."base64-js"."0.0.7" = + self.by-version."base64-js"."0.0.7"; + by-version."base64-js"."0.0.7" = self.buildNodePackage { + name = "base64-js-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"; + name = "base64-js-0.0.7.tgz"; + sha1 = "54400dc91d696cec32a8a47902f971522fee8f48"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64-js"."0.0.8" = self.by-version."base64-js"."0.0.8"; by-version."base64-js"."0.0.8" = self.buildNodePackage { name = "base64-js-0.0.8"; + version = "0.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; @@ -1513,7 +2043,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64-js"."~0.0.4" = self.by-version."base64-js"."0.0.8"; @@ -1521,6 +2055,7 @@ self.by-version."base64-url"."1.2.1"; by-version."base64-url"."1.2.1" = self.buildNodePackage { name = "base64-url-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; @@ -1529,7 +2064,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64-url"."1.2.1" = self.by-version."base64-url"."1.2.1"; @@ -1537,6 +2076,7 @@ self.by-version."base64id"."0.1.0"; by-version."base64id"."0.1.0" = self.buildNodePackage { name = "base64id-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; @@ -1545,12 +2085,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64url"."0.0.3" = self.by-version."base64url"."0.0.3"; by-version."base64url"."0.0.3" = self.buildNodePackage { name = "base64url-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz"; @@ -1560,12 +2105,17 @@ deps = { "tap-0.3.3" = self.by-version."tap"."0.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64url"."0.0.6" = self.by-version."base64url"."0.0.6"; by-version."base64url"."0.0.6" = self.buildNodePackage { name = "base64url-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz"; @@ -1574,7 +2124,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."base64url"."~0.0.3" = self.by-version."base64url"."0.0.6"; @@ -1582,6 +2136,7 @@ self.by-version."basic-auth"."1.0.0"; by-version."basic-auth"."1.0.0" = self.buildNodePackage { name = "basic-auth-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"; @@ -1590,12 +2145,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."basic-auth-connect"."1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage { name = "basic-auth-connect-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; @@ -1604,12 +2164,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."batbelt"."0.0.2" = self.by-version."batbelt"."0.0.2"; by-version."batbelt"."0.0.2" = self.buildNodePackage { name = "batbelt-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/batbelt/-/batbelt-0.0.2.tgz"; @@ -1619,12 +2184,17 @@ deps = { "hashish-0.0.4" = self.by-version."hashish"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."batch"."0.5.0" = self.by-version."batch"."0.5.0"; by-version."batch"."0.5.0" = self.buildNodePackage { name = "batch-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; @@ -1633,12 +2203,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."batch"."0.5.1" = self.by-version."batch"."0.5.1"; by-version."batch"."0.5.1" = self.buildNodePackage { name = "batch-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz"; @@ -1647,12 +2222,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."batch"."0.5.2" = self.by-version."batch"."0.5.2"; by-version."batch"."0.5.2" = self.buildNodePackage { name = "batch-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz"; @@ -1661,12 +2241,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bcrypt"."*" = self.by-version."bcrypt"."0.8.1"; by-version."bcrypt"."0.8.1" = self.buildNodePackage { name = "bcrypt-0.8.1"; + version = "0.8.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.1.tgz"; @@ -1677,15 +2262,39 @@ "bindings-1.0.0" = self.by-version."bindings"."1.0.0"; "nan-1.5.0" = self.by-version."nan"."1.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bcrypt" = self.by-version."bcrypt"."0.8.1"; by-spec."bcrypt".">=0.5.0" = self.by-version."bcrypt"."0.8.1"; + by-spec."bcryptjs"."2.1.0" = + self.by-version."bcryptjs"."2.1.0"; + by-version."bcryptjs"."2.1.0" = self.buildNodePackage { + name = "bcryptjs-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bcryptjs/-/bcryptjs-2.1.0.tgz"; + name = "bcryptjs-2.1.0.tgz"; + sha1 = "5e6076196f6e3e957820aceb004410a7cf367042"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."beeper"."^1.0.0" = self.by-version."beeper"."1.0.0"; by-version."beeper"."1.0.0" = self.buildNodePackage { name = "beeper-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"; @@ -1694,12 +2303,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bencode"."^0.6.0" = self.by-version."bencode"."0.6.0"; by-version."bencode"."0.6.0" = self.buildNodePackage { name = "bencode-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz"; @@ -1708,12 +2322,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."better-assert"."~1.0.0" = self.by-version."better-assert"."1.0.2"; by-version."better-assert"."1.0.2" = self.buildNodePackage { name = "better-assert-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; @@ -1723,12 +2342,40 @@ deps = { "callsite-1.0.0" = self.by-version."callsite"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."biased-opener"."~0.2.2" = + self.by-version."biased-opener"."0.2.2"; + by-version."biased-opener"."0.2.2" = self.buildNodePackage { + name = "biased-opener-0.2.2"; + version = "0.2.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/biased-opener/-/biased-opener-0.2.2.tgz"; + name = "biased-opener-0.2.2.tgz"; + sha1 = "e02a8eb20a07b1e1b555a3bf1e56f51b43465d98"; + }; + deps = { + "browser-launcher2-0.4.4" = self.by-version."browser-launcher2"."0.4.4"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "opener-1.4.0" = self.by-version."opener"."1.4.0"; + "x-default-browser-0.3.0" = self.by-version."x-default-browser"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bigi"."^1.1.0" = self.by-version."bigi"."1.4.0"; by-version."bigi"."1.4.0" = self.buildNodePackage { name = "bigi-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bigi/-/bigi-1.4.0.tgz"; @@ -1737,12 +2384,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bignumber.js"."^1.3.0" = self.by-version."bignumber.js"."1.5.0"; by-version."bignumber.js"."1.5.0" = self.buildNodePackage { name = "bignumber.js-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz"; @@ -1751,12 +2403,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."binary"."~0.3.0" = self.by-version."binary"."0.3.0"; by-version."binary"."0.3.0" = self.buildNodePackage { name = "binary-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; @@ -1767,12 +2424,17 @@ "chainsaw-0.1.0" = self.by-version."chainsaw"."0.1.0"; "buffers-0.1.1" = self.by-version."buffers"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."binary-extensions"."^1.0.0" = self.by-version."binary-extensions"."1.3.0"; by-version."binary-extensions"."1.3.0" = self.buildNodePackage { name = "binary-extensions-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/binary-extensions/-/binary-extensions-1.3.0.tgz"; @@ -1781,12 +2443,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."binaryheap".">= 0.0.3" = self.by-version."binaryheap"."0.0.3"; by-version."binaryheap"."0.0.3" = self.buildNodePackage { name = "binaryheap-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; @@ -1795,12 +2462,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bindings"."*" = self.by-version."bindings"."1.2.1"; by-version."bindings"."1.2.1" = self.buildNodePackage { name = "bindings-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; @@ -1809,12 +2481,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bindings"."1.0.0" = self.by-version."bindings"."1.0.0"; by-version."bindings"."1.0.0" = self.buildNodePackage { name = "bindings-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz"; @@ -1823,12 +2500,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bindings"."1.1.0" = self.by-version."bindings"."1.1.0"; by-version."bindings"."1.1.0" = self.buildNodePackage { name = "bindings-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.1.0.tgz"; @@ -1837,12 +2519,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bindings"."1.1.1" = self.by-version."bindings"."1.1.1"; by-version."bindings"."1.1.1" = self.buildNodePackage { name = "bindings-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz"; @@ -1851,12 +2538,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bindings"."1.2.0" = self.by-version."bindings"."1.2.0"; by-version."bindings"."1.2.0" = self.buildNodePackage { name = "bindings-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz"; @@ -1865,8 +2557,14 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."bindings"."1.2.1" = + self.by-version."bindings"."1.2.1"; by-spec."bindings"."1.2.x" = self.by-version."bindings"."1.2.1"; by-spec."bindings".">=1.2.1" = @@ -1881,6 +2579,7 @@ self.by-version."bip-pod"."0.3.8"; by-version."bip-pod"."0.3.8" = self.buildNodePackage { name = "bip-pod-0.3.8"; + version = "0.3.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.8.tgz"; @@ -1900,15 +2599,20 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "request-2.53.0" = self.by-version."request"."2.53.0"; "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23"; - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; "validator-1.5.1" = self.by-version."validator"."1.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-alchemy"."*" = self.by-version."bip-pod-alchemy"."0.3.0"; by-version."bip-pod-alchemy"."0.3.0" = self.buildNodePackage { name = "bip-pod-alchemy-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.0.tgz"; @@ -1918,13 +2622,18 @@ deps = { "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-alchemy" = self.by-version."bip-pod-alchemy"."0.3.0"; by-spec."bip-pod-bitly"."*" = self.by-version."bip-pod-bitly"."0.3.0"; by-version."bip-pod-bitly"."0.3.0" = self.buildNodePackage { name = "bip-pod-bitly-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-bitly/-/bip-pod-bitly-0.3.0.tgz"; @@ -1936,13 +2645,18 @@ "passport-bitly-0.1.0" = self.by-version."passport-bitly"."0.1.0"; "request-2.29.0" = self.by-version."request"."2.29.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-bitly" = self.by-version."bip-pod-bitly"."0.3.0"; by-spec."bip-pod-chain"."*" = self.by-version."bip-pod-chain"."0.3.0"; by-version."bip-pod-chain"."0.3.0" = self.buildNodePackage { name = "bip-pod-chain-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.0.tgz"; @@ -1952,13 +2666,18 @@ deps = { "chain-node-3.1.0" = self.by-version."chain-node"."3.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-chain" = self.by-version."bip-pod-chain"."0.3.0"; by-spec."bip-pod-circonus"."*" = self.by-version."bip-pod-circonus"."0.3.0"; by-version."bip-pod-circonus"."0.3.0" = self.buildNodePackage { name = "bip-pod-circonus-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.0.tgz"; @@ -1967,13 +2686,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-circonus" = self.by-version."bip-pod-circonus"."0.3.0"; by-spec."bip-pod-coindesk"."*" = self.by-version."bip-pod-coindesk"."0.3.0"; by-version."bip-pod-coindesk"."0.3.0" = self.buildNodePackage { name = "bip-pod-coindesk-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.0.tgz"; @@ -1982,13 +2706,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.0"; by-spec."bip-pod-craigslist"."*" = self.by-version."bip-pod-craigslist"."0.3.0"; by-version."bip-pod-craigslist"."0.3.0" = self.buildNodePackage { name = "bip-pod-craigslist-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.0.tgz"; @@ -1998,13 +2727,18 @@ deps = { "node-craigslist-0.1.7" = self.by-version."node-craigslist"."0.1.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-craigslist" = self.by-version."bip-pod-craigslist"."0.3.0"; by-spec."bip-pod-crypto"."*" = self.by-version."bip-pod-crypto"."0.3.0"; by-version."bip-pod-crypto"."0.3.0" = self.buildNodePackage { name = "bip-pod-crypto-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.0.tgz"; @@ -2013,7 +2747,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-crypto" = self.by-version."bip-pod-crypto"."0.3.0"; by-spec."bip-pod-crypto".">=0.0.1" = @@ -2022,6 +2760,7 @@ self.by-version."bip-pod-dropbox"."0.3.0"; by-version."bip-pod-dropbox"."0.3.0" = self.buildNodePackage { name = "bip-pod-dropbox-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.0.tgz"; @@ -2034,13 +2773,18 @@ "passport-dropbox-0.1.2" = self.by-version."passport-dropbox"."0.1.2"; "dropbox-0.9.2" = self.by-version."dropbox"."0.9.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.0"; by-spec."bip-pod-email".">=0.0.1" = self.by-version."bip-pod-email"."0.3.3"; by-version."bip-pod-email"."0.3.3" = self.buildNodePackage { name = "bip-pod-email-0.3.3"; + version = "0.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.3.tgz"; @@ -2053,12 +2797,17 @@ "nodemailer-0.7.1" = self.by-version."nodemailer"."0.7.1"; "ejs-0.7.1" = self.by-version."ejs"."0.7.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-embedly"."*" = self.by-version."bip-pod-embedly"."0.3.0"; by-version."bip-pod-embedly"."0.3.0" = self.buildNodePackage { name = "bip-pod-embedly-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.0.tgz"; @@ -2069,13 +2818,18 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "embedly-1.0.4" = self.by-version."embedly"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-embedly" = self.by-version."bip-pod-embedly"."0.3.0"; by-spec."bip-pod-evernote"."*" = self.by-version."bip-pod-evernote"."0.3.1"; by-version."bip-pod-evernote"."0.3.1" = self.buildNodePackage { name = "bip-pod-evernote-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.1.tgz"; @@ -2085,16 +2839,21 @@ deps = { "evernote-1.25.4" = self.by-version."evernote"."1.25.4"; "passport-evernote-0.1.1" = self.by-version."passport-evernote"."0.1.1"; - "q-1.1.2" = self.by-version."q"."1.1.2"; + "q-1.2.0" = self.by-version."q"."1.2.0"; "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-evernote" = self.by-version."bip-pod-evernote"."0.3.1"; by-spec."bip-pod-facebook"."*" = self.by-version."bip-pod-facebook"."0.3.0"; by-version."bip-pod-facebook"."0.3.0" = self.buildNodePackage { name = "bip-pod-facebook-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.0.tgz"; @@ -2109,13 +2868,18 @@ "passport-facebook-1.0.3" = self.by-version."passport-facebook"."1.0.3"; "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.0"; by-spec."bip-pod-flickr"."*" = self.by-version."bip-pod-flickr"."0.3.1"; by-version."bip-pod-flickr"."0.3.1" = self.buildNodePackage { name = "bip-pod-flickr-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.1.tgz"; @@ -2126,13 +2890,18 @@ "passport-flickr-0.2.0" = self.by-version."passport-flickr"."0.2.0"; "flickrapi-0.3.28" = self.by-version."flickrapi"."0.3.28"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.1"; by-spec."bip-pod-flow".">=0.0.1" = self.by-version."bip-pod-flow"."0.3.1"; by-version."bip-pod-flow"."0.3.1" = self.buildNodePackage { name = "bip-pod-flow-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.1.tgz"; @@ -2142,16 +2911,21 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; - "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1"; + "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1"; "q-1.0.1" = self.by-version."q"."1.0.1"; "safe-regex-0.0.1" = self.by-version."safe-regex"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-github"."*" = self.by-version."bip-pod-github"."0.3.1"; by-version."bip-pod-github"."0.3.1" = self.buildNodePackage { name = "bip-pod-github-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.1.tgz"; @@ -2161,13 +2935,18 @@ deps = { "passport-github-0.1.5" = self.by-version."passport-github"."0.1.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-github" = self.by-version."bip-pod-github"."0.3.1"; by-spec."bip-pod-gmail"."*" = self.by-version."bip-pod-gmail"."0.3.1"; by-version."bip-pod-gmail"."0.3.1" = self.buildNodePackage { name = "bip-pod-gmail-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.1.tgz"; @@ -2179,13 +2958,18 @@ "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.1"; by-spec."bip-pod-google"."*" = self.by-version."bip-pod-google"."0.3.0"; by-version."bip-pod-google"."0.3.0" = self.buildNodePackage { name = "bip-pod-google-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.0.tgz"; @@ -2197,13 +2981,18 @@ "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "googleapis-0.8.0" = self.by-version."googleapis"."0.8.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-google" = self.by-version."bip-pod-google"."0.3.0"; by-spec."bip-pod-google-drive"."*" = self.by-version."bip-pod-google-drive"."0.3.0"; by-version."bip-pod-google-drive"."0.3.0" = self.buildNodePackage { name = "bip-pod-google-drive-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.0.tgz"; @@ -2215,13 +3004,18 @@ "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.0"; by-spec."bip-pod-html".">=0.0.1" = self.by-version."bip-pod-html"."0.3.1"; by-version."bip-pod-html"."0.3.1" = self.buildNodePackage { name = "bip-pod-html-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.1.tgz"; @@ -2232,12 +3026,17 @@ "favitest-1.0.7" = self.by-version."favitest"."1.0.7"; "jsdom-0.10.6" = self.by-version."jsdom"."0.10.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-http".">=0.0.1" = self.by-version."bip-pod-http"."0.3.0"; by-version."bip-pod-http"."0.3.0" = self.buildNodePackage { name = "bip-pod-http-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.0.tgz"; @@ -2247,12 +3046,17 @@ deps = { "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-imgur"."*" = self.by-version."bip-pod-imgur"."0.3.0"; by-version."bip-pod-imgur"."0.3.0" = self.buildNodePackage { name = "bip-pod-imgur-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.0.tgz"; @@ -2265,13 +3069,18 @@ "request-2.53.0" = self.by-version."request"."2.53.0"; "passport-imgur-0.0.2" = self.by-version."passport-imgur"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-imgur" = self.by-version."bip-pod-imgur"."0.3.0"; by-spec."bip-pod-instagram"."*" = self.by-version."bip-pod-instagram"."0.3.0"; by-version."bip-pod-instagram"."0.3.0" = self.buildNodePackage { name = "bip-pod-instagram-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.0.tgz"; @@ -2283,13 +3092,18 @@ "passport-instagram-0.1.2" = self.by-version."passport-instagram"."0.1.2"; "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.0"; by-spec."bip-pod-kato"."*" = self.by-version."bip-pod-kato"."0.3.0"; by-version."bip-pod-kato"."0.3.0" = self.buildNodePackage { name = "bip-pod-kato-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.0.tgz"; @@ -2298,13 +3112,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.0"; by-spec."bip-pod-keenio"."*" = self.by-version."bip-pod-keenio"."0.3.0"; by-version."bip-pod-keenio"."0.3.0" = self.buildNodePackage { name = "bip-pod-keenio-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.0.tgz"; @@ -2314,13 +3133,18 @@ deps = { "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.0"; by-spec."bip-pod-mailchimp"."*" = self.by-version."bip-pod-mailchimp"."0.3.1"; by-version."bip-pod-mailchimp"."0.3.1" = self.buildNodePackage { name = "bip-pod-mailchimp-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.1.tgz"; @@ -2331,13 +3155,18 @@ "passport-mailchimp-0.0.1" = self.by-version."passport-mailchimp"."0.0.1"; "mailchimp-1.1.0" = self.by-version."mailchimp"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.1"; by-spec."bip-pod-mailgun"."*" = self.by-version."bip-pod-mailgun"."0.3.0"; by-version."bip-pod-mailgun"."0.3.0" = self.buildNodePackage { name = "bip-pod-mailgun-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.0.tgz"; @@ -2347,13 +3176,18 @@ deps = { "mailgun-js-0.6.8" = self.by-version."mailgun-js"."0.6.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.0"; by-spec."bip-pod-math".">=0.0.1" = self.by-version."bip-pod-math"."0.3.2"; by-version."bip-pod-math"."0.3.2" = self.buildNodePackage { name = "bip-pod-math-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.2.tgz"; @@ -2363,12 +3197,17 @@ deps = { "mathjs-0.19.0" = self.by-version."mathjs"."0.19.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-mixcloud"."*" = self.by-version."bip-pod-mixcloud"."0.3.0"; by-version."bip-pod-mixcloud"."0.3.0" = self.buildNodePackage { name = "bip-pod-mixcloud-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.0.tgz"; @@ -2380,13 +3219,18 @@ "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2"; "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-mixcloud" = self.by-version."bip-pod-mixcloud"."0.3.0"; by-spec."bip-pod-mongodb"."*" = self.by-version."bip-pod-mongodb"."0.3.1"; by-version."bip-pod-mongodb"."0.3.1" = self.buildNodePackage { name = "bip-pod-mongodb-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.1.tgz"; @@ -2397,13 +3241,18 @@ "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16"; "assert-1.3.0" = self.by-version."assert"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.1"; by-spec."bip-pod-numerous"."*" = self.by-version."bip-pod-numerous"."0.3.0"; by-version."bip-pod-numerous"."0.3.0" = self.buildNodePackage { name = "bip-pod-numerous-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.0.tgz"; @@ -2413,13 +3262,18 @@ deps = { "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-numerous" = self.by-version."bip-pod-numerous"."0.3.0"; by-spec."bip-pod-pushbullet"."*" = self.by-version."bip-pod-pushbullet"."0.3.0"; by-version."bip-pod-pushbullet"."0.3.0" = self.buildNodePackage { name = "bip-pod-pushbullet-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.0.tgz"; @@ -2428,13 +3282,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.0"; by-spec."bip-pod-pusher"."*" = self.by-version."bip-pod-pusher"."0.3.0"; by-version."bip-pod-pusher"."0.3.0" = self.buildNodePackage { name = "bip-pod-pusher-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.0.tgz"; @@ -2444,13 +3303,18 @@ deps = { "pusher-1.0.4" = self.by-version."pusher"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-pusher" = self.by-version."bip-pod-pusher"."0.3.0"; by-spec."bip-pod-soundcloud"."*" = self.by-version."bip-pod-soundcloud"."0.3.0"; by-version."bip-pod-soundcloud"."0.3.0" = self.buildNodePackage { name = "bip-pod-soundcloud-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.0.tgz"; @@ -2462,13 +3326,18 @@ "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2"; "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.0"; by-spec."bip-pod-statuscake"."*" = self.by-version."bip-pod-statuscake"."0.3.0"; by-version."bip-pod-statuscake"."0.3.0" = self.buildNodePackage { name = "bip-pod-statuscake-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.0.tgz"; @@ -2477,13 +3346,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.0"; by-spec."bip-pod-syndication".">=0.0.1" = self.by-version."bip-pod-syndication"."0.3.5"; by-version."bip-pod-syndication"."0.3.5" = self.buildNodePackage { name = "bip-pod-syndication-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.5.tgz"; @@ -2491,7 +3365,7 @@ sha1 = "21874326672a82a56bc40702efabfb3cbfa66d49"; }; deps = { - "ejs-2.2.4" = self.by-version."ejs"."2.2.4"; + "ejs-2.3.1" = self.by-version."ejs"."2.3.1"; "favitest-1.0.7" = self.by-version."favitest"."1.0.7"; "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2"; "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; @@ -2504,12 +3378,17 @@ "send-0.9.3" = self.by-version."send"."0.9.3"; "validator-1.5.1" = self.by-version."validator"."1.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-templater".">=0.0.1" = self.by-version."bip-pod-templater"."0.3.0"; by-version."bip-pod-templater"."0.3.0" = self.buildNodePackage { name = "bip-pod-templater-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.0.tgz"; @@ -2522,12 +3401,17 @@ "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-time".">=0.0.1" = self.by-version."bip-pod-time"."0.3.1"; by-version."bip-pod-time"."0.3.1" = self.buildNodePackage { name = "bip-pod-time-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.1.tgz"; @@ -2539,12 +3423,17 @@ "moment-timezone-0.0.3" = self.by-version."moment-timezone"."0.0.3"; "sugar-1.4.1" = self.by-version."sugar"."1.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bip-pod-todoist"."*" = self.by-version."bip-pod-todoist"."0.3.0"; by-version."bip-pod-todoist"."0.3.0" = self.buildNodePackage { name = "bip-pod-todoist-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.0.tgz"; @@ -2553,13 +3442,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.0"; by-spec."bip-pod-trello"."*" = self.by-version."bip-pod-trello"."0.3.0"; by-version."bip-pod-trello"."0.3.0" = self.buildNodePackage { name = "bip-pod-trello-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.0.tgz"; @@ -2568,15 +3462,20 @@ }; deps = { "passport-trello-0.1.4" = self.by-version."passport-trello"."0.1.4"; - "q-1.1.2" = self.by-version."q"."1.1.2"; + "q-1.2.0" = self.by-version."q"."1.2.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.0"; by-spec."bip-pod-twilio"."*" = self.by-version."bip-pod-twilio"."0.3.1"; by-version."bip-pod-twilio"."0.3.1" = self.buildNodePackage { name = "bip-pod-twilio-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.1.tgz"; @@ -2586,20 +3485,25 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; - "twilio-1.10.0" = self.by-version."twilio"."1.10.0"; + "twilio-1.11.0" = self.by-version."twilio"."1.11.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.1"; by-spec."bip-pod-twitter"."*" = - self.by-version."bip-pod-twitter"."0.3.3"; - by-version."bip-pod-twitter"."0.3.3" = self.buildNodePackage { - name = "bip-pod-twitter-0.3.3"; + self.by-version."bip-pod-twitter"."0.3.4"; + by-version."bip-pod-twitter"."0.3.4" = self.buildNodePackage { + name = "bip-pod-twitter-0.3.4"; + version = "0.3.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.3.tgz"; - name = "bip-pod-twitter-0.3.3.tgz"; - sha1 = "3ecdaf0e54d1ec23fd0d9b478db5a215997b330b"; + url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.4.tgz"; + name = "bip-pod-twitter-0.3.4.tgz"; + sha1 = "77ce4dbf50a787c22bd2dfe73028d967c0948973"; }; deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; @@ -2607,13 +3511,18 @@ "ntwitter-0.5.0" = self.by-version."ntwitter"."0.5.0"; "passport-twitter-1.0.2" = self.by-version."passport-twitter"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.3"; + "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.4"; by-spec."bip-pod-witai"."*" = self.by-version."bip-pod-witai"."0.3.0"; by-version."bip-pod-witai"."0.3.0" = self.buildNodePackage { name = "bip-pod-witai-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.0.tgz"; @@ -2622,13 +3531,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-witai" = self.by-version."bip-pod-witai"."0.3.0"; by-spec."bip-pod-wordpress"."*" = self.by-version."bip-pod-wordpress"."0.3.0"; by-version."bip-pod-wordpress"."0.3.0" = self.buildNodePackage { name = "bip-pod-wordpress-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.0.tgz"; @@ -2640,13 +3554,18 @@ "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; "passport-wordpress-0.0.3" = self.by-version."passport-wordpress"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-wordpress" = self.by-version."bip-pod-wordpress"."0.3.0"; by-spec."bip-pod-zoho"."*" = self.by-version."bip-pod-zoho"."0.3.1"; by-version."bip-pod-zoho"."0.3.1" = self.buildNodePackage { name = "bip-pod-zoho-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bip-pod-zoho/-/bip-pod-zoho-0.3.1.tgz"; @@ -2656,20 +3575,25 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; - "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1"; + "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.1"; by-spec."bipio"."*" = - self.by-version."bipio"."0.3.18"; - by-version."bipio"."0.3.18" = self.buildNodePackage { - name = "bipio-0.3.18"; + self.by-version."bipio"."0.3.24"; + by-version."bipio"."0.3.24" = self.buildNodePackage { + name = "bipio-0.3.24"; + version = "0.3.24"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/bipio/-/bipio-0.3.18.tgz"; - name = "bipio-0.3.18.tgz"; - sha1 = "6d695785dac53ceb138f4e4a99499c0d846cd77d"; + url = "http://registry.npmjs.org/bipio/-/bipio-0.3.24.tgz"; + name = "bipio-0.3.24.tgz"; + sha1 = "cd828183d7e54ba488a9ffdf164ddc1327e21c3d"; }; deps = { "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0"; @@ -2696,10 +3620,10 @@ "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; "cron-1.0.6" = self.by-version."cron"."1.0.6"; "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3"; - "datejs-1.0.0-rc3" = self.by-version."datejs"."1.0.0-rc3"; + "datejs-0.0.2" = self.by-version."datejs"."0.0.2"; "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4"; "execSync-1.0.2" = self.by-version."execSync"."1.0.2"; - "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; + "express-4.12.0" = self.by-version."express"."4.12.0"; "express-session-1.10.3" = self.by-version."express-session"."1.10.3"; "extend-2.0.0" = self.by-version."extend"."2.0.0"; "favitest-1.0.7" = self.by-version."favitest"."1.0.7"; @@ -2712,6 +3636,7 @@ "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2"; "jsonwebtoken-1.3.0" = self.by-version."jsonwebtoken"."1.3.0"; "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1"; + "lodash-3.3.0" = self.by-version."lodash"."3.3.0"; "marked-0.3.3" = self.by-version."marked"."0.3.3"; "memwatch-0.2.2" = self.by-version."memwatch"."0.2.2"; "method-override-1.0.2" = self.by-version."method-override"."1.0.2"; @@ -2719,33 +3644,38 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "moment-2.9.0" = self.by-version."moment"."2.9.0"; "mongoose-3.9.7" = self.by-version."mongoose"."3.9.7"; - "multer-0.1.7" = self.by-version."multer"."0.1.7"; + "multer-0.1.8" = self.by-version."multer"."0.1.8"; "node-fs-0.1.7" = self.by-version."node-fs"."0.1.7"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0"; - "q-1.1.2" = self.by-version."q"."1.1.2"; + "q-1.2.0" = self.by-version."q"."1.2.0"; "request-2.53.0" = self.by-version."request"."2.53.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "sleep-1.2.0" = self.by-version."sleep"."1.2.0"; "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; - "ssl-root-cas-1.1.9-beta" = self.by-version."ssl-root-cas"."1.1.9-beta"; + "ssl-root-cas-1.1.7" = self.by-version."ssl-root-cas"."1.1.7"; "sugar-1.4.1" = self.by-version."sugar"."1.4.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; "time-0.11.1" = self.by-version."time"."0.11.1"; "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23"; - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; "validator-1.5.1" = self.by-version."validator"."1.5.1"; "webkit-devtools-agent-0.2.5" = self.by-version."webkit-devtools-agent"."0.2.5"; "winston-0.5.1" = self.by-version."winston"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "bipio" = self.by-version."bipio"."0.3.18"; + "bipio" = self.by-version."bipio"."0.3.24"; by-spec."bitcoinjs-lib"."1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0"; by-version."bitcoinjs-lib"."1.2.0" = self.buildNodePackage { name = "bitcoinjs-lib-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-1.2.0.tgz"; @@ -2758,12 +3688,17 @@ "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12"; "ecurve-1.0.0" = self.by-version."ecurve"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bitfield"."^0.1.0" = self.by-version."bitfield"."0.1.0"; by-version."bitfield"."0.1.0" = self.buildNodePackage { name = "bitfield-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; @@ -2772,12 +3707,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bits"."~0.1.1" = self.by-version."bits"."0.1.1"; by-version."bits"."0.1.1" = self.buildNodePackage { name = "bits-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bits/-/bits-0.1.1.tgz"; @@ -2786,12 +3726,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bittorrent-dht"."^1.0.0" = self.by-version."bittorrent-dht"."1.5.0"; by-version."bittorrent-dht"."1.5.0" = self.buildNodePackage { name = "bittorrent-dht-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-1.5.0.tgz"; @@ -2811,12 +3756,17 @@ "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."bittorrent-dht"."^2.1.1" = + by-spec."bittorrent-dht"."^2.6.4" = self.by-version."bittorrent-dht"."2.6.4"; by-version."bittorrent-dht"."2.6.4" = self.buildNodePackage { name = "bittorrent-dht-2.6.4"; + version = "2.6.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-2.6.4.tgz"; @@ -2837,14 +3787,17 @@ "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."bittorrent-dht"."^2.6.4" = - self.by-version."bittorrent-dht"."2.6.4"; by-spec."bittorrent-tracker"."^2.0.0" = self.by-version."bittorrent-tracker"."2.12.1"; by-version."bittorrent-tracker"."2.12.1" = self.buildNodePackage { name = "bittorrent-tracker-2.12.1"; + version = "2.12.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz"; @@ -2867,7 +3820,11 @@ "simple-get-1.3.0" = self.by-version."simple-get"."1.3.0"; "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bittorrent-tracker"."^2.6.0" = self.by-version."bittorrent-tracker"."2.12.1"; @@ -2875,6 +3832,7 @@ self.by-version."bl"."0.9.4"; by-version."bl"."0.9.4" = self.buildNodePackage { name = "bl-0.9.4"; + version = "0.9.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz"; @@ -2884,7 +3842,11 @@ deps = { "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bl"."~0.9.0" = self.by-version."bl"."0.9.4"; @@ -2892,6 +3854,7 @@ self.by-version."blob"."0.0.2"; by-version."blob"."0.0.2" = self.buildNodePackage { name = "blob-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; @@ -2900,12 +3863,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."block-stream"."*" = self.by-version."block-stream"."0.0.7"; by-version."block-stream"."0.0.7" = self.buildNodePackage { name = "block-stream-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; @@ -2915,28 +3883,38 @@ deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; by-spec."bluebird".">= 2.3.2" = - self.by-version."bluebird"."2.9.9"; - by-version."bluebird"."2.9.9" = self.buildNodePackage { - name = "bluebird-2.9.9"; + self.by-version."bluebird"."2.9.12"; + by-version."bluebird"."2.9.12" = self.buildNodePackage { + name = "bluebird-2.9.12"; + version = "2.9.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - name = "bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.12.tgz"; + name = "bluebird-2.9.12.tgz"; + sha1 = "b108b6d659a7bb0b88d08a8079c91bcfc43e15a6"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."blueimp-md5"."~1.1.0" = self.by-version."blueimp-md5"."1.1.0"; by-version."blueimp-md5"."1.1.0" = self.buildNodePackage { name = "blueimp-md5-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz"; @@ -2945,12 +3923,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bn.js"."^1.0.0" = self.by-version."bn.js"."1.3.0"; by-version."bn.js"."1.3.0" = self.buildNodePackage { name = "bn.js-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"; @@ -2959,12 +3942,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bncode"."^0.2.3" = self.by-version."bncode"."0.2.3"; by-version."bncode"."0.2.3" = self.buildNodePackage { name = "bncode-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; @@ -2973,12 +3961,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bncode"."^0.5.2" = self.by-version."bncode"."0.5.3"; by-version."bncode"."0.5.3" = self.buildNodePackage { name = "bncode-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; @@ -2987,12 +3980,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."body-parser"."1.5.0" = self.by-version."body-parser"."1.5.0"; by-version."body-parser"."1.5.0" = self.buildNodePackage { name = "body-parser-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/body-parser/-/body-parser-1.5.0.tgz"; @@ -3008,12 +4006,17 @@ "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; "type-is-1.3.2" = self.by-version."type-is"."1.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."body-parser"."^1.0.2" = self.by-version."body-parser"."1.12.0"; by-version."body-parser"."1.12.0" = self.buildNodePackage { name = "body-parser-1.12.0"; + version = "1.12.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.0.tgz"; @@ -3031,36 +4034,19 @@ "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3"; "type-is-1.6.0" = self.by-version."type-is"."1.6.0"; }; - peerDependencies = []; - }; - by-spec."body-parser"."~1.10.2" = - self.by-version."body-parser"."1.10.2"; - by-version."body-parser"."1.10.2" = self.buildNodePackage { - name = "body-parser-1.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.10.2.tgz"; - name = "body-parser-1.10.2.tgz"; - sha1 = "405d465fcd3ccf0ea8a35adbf1055f6e98316bd1"; - }; - deps = { - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2"; - "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."body-parser"."~1.12.0" = self.by-version."body-parser"."1.12.0"; - by-spec."body-parser"."~1.8.4" = + by-spec."body-parser"."~1.8.2" = self.by-version."body-parser"."1.8.4"; by-version."body-parser"."1.8.4" = self.buildNodePackage { name = "body-parser-1.8.4"; + version = "1.8.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz"; @@ -3077,12 +4063,19 @@ "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."body-parser"."~1.8.4" = + self.by-version."body-parser"."1.8.4"; by-spec."body-parser"."~1.9.3" = self.by-version."body-parser"."1.9.3"; by-version."body-parser"."1.9.3" = self.buildNodePackage { name = "body-parser-1.9.3"; + version = "1.9.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz"; @@ -3099,12 +4092,17 @@ "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1"; "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."boom"."0.3.x" = self.by-version."boom"."0.3.8"; by-version."boom"."0.3.8" = self.buildNodePackage { name = "boom-0.3.8"; + version = "0.3.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; @@ -3114,12 +4112,17 @@ deps = { "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = self.buildNodePackage { name = "boom-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; @@ -3129,12 +4132,17 @@ deps = { "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."boom"."2.x.x" = self.by-version."boom"."2.6.1"; by-version."boom"."2.6.1" = self.buildNodePackage { name = "boom-2.6.1"; + version = "2.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz"; @@ -3144,12 +4152,17 @@ deps = { "hoek-2.11.0" = self.by-version."hoek"."2.11.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower"."*" = self.by-version."bower"."1.3.12"; by-version."bower"."1.3.12" = self.buildNodePackage { name = "bower-1.3.12"; + version = "1.3.12"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/bower/-/bower-1.3.12.tgz"; @@ -3176,7 +4189,7 @@ "inquirer-0.7.1" = self.by-version."inquirer"."0.7.1"; "insight-0.4.3" = self.by-version."insight"."0.4.3"; "is-root-1.0.0" = self.by-version."is-root"."1.0.0"; - "junk-1.0.0" = self.by-version."junk"."1.0.0"; + "junk-1.0.1" = self.by-version."junk"."1.0.1"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; @@ -3199,7 +4212,11 @@ "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bower" = self.by-version."bower"."1.3.12"; by-spec."bower".">=1.2.8 <2" = @@ -3208,6 +4225,7 @@ self.by-version."bower-config"."0.5.2"; by-version."bower-config"."0.5.2" = self.buildNodePackage { name = "bower-config-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz"; @@ -3220,7 +4238,11 @@ "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower-config"."~0.5.2" = self.by-version."bower-config"."0.5.2"; @@ -3228,6 +4250,7 @@ self.by-version."bower-endpoint-parser"."0.2.1"; by-version."bower-endpoint-parser"."0.2.1" = self.buildNodePackage { name = "bower-endpoint-parser-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz"; @@ -3236,12 +4259,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower-endpoint-parser"."~0.2.2" = self.by-version."bower-endpoint-parser"."0.2.2"; by-version."bower-endpoint-parser"."0.2.2" = self.buildNodePackage { name = "bower-endpoint-parser-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz"; @@ -3250,12 +4278,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower-json"."0.4.0" = self.by-version."bower-json"."0.4.0"; by-version."bower-json"."0.4.0" = self.buildNodePackage { name = "bower-json-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz"; @@ -3267,7 +4300,11 @@ "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "intersect-0.0.3" = self.by-version."intersect"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower-json"."~0.4.0" = self.by-version."bower-json"."0.4.0"; @@ -3275,6 +4312,7 @@ self.by-version."bower-logger"."0.2.1"; by-version."bower-logger"."0.2.1" = self.buildNodePackage { name = "bower-logger-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz"; @@ -3283,12 +4321,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower-logger"."~0.2.2" = self.by-version."bower-logger"."0.2.2"; by-version."bower-logger"."0.2.2" = self.buildNodePackage { name = "bower-logger-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz"; @@ -3297,12 +4340,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower-registry-client"."~0.2.0" = self.by-version."bower-registry-client"."0.2.3"; by-version."bower-registry-client"."0.2.3" = self.buildNodePackage { name = "bower-registry-client-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.3.tgz"; @@ -3319,12 +4367,17 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bower2nix"."*" = self.by-version."bower2nix"."2.1.0"; by-version."bower2nix"."2.1.0" = self.buildNodePackage { name = "bower2nix-2.1.0"; + version = "2.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz"; @@ -3343,13 +4396,18 @@ "semver-2.3.2" = self.by-version."semver"."2.3.2"; "fetch-bower-2.0.0" = self.by-version."fetch-bower"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "bower2nix" = self.by-version."bower2nix"."2.1.0"; by-spec."bplist-parser"."0.0.6" = self.by-version."bplist-parser"."0.0.6"; by-version."bplist-parser"."0.0.6" = self.buildNodePackage { name = "bplist-parser-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; @@ -3358,12 +4416,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."brace-expansion"."^1.0.0" = self.by-version."brace-expansion"."1.1.0"; by-version."brace-expansion"."1.1.0" = self.buildNodePackage { name = "brace-expansion-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; @@ -3374,26 +4437,36 @@ "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."breakable"."~0.1.0" = - self.by-version."breakable"."0.1.0"; - by-version."breakable"."0.1.0" = self.buildNodePackage { - name = "breakable-0.1.0"; + by-spec."breakable"."~1.0.0" = + self.by-version."breakable"."1.0.0"; + by-version."breakable"."1.0.0" = self.buildNodePackage { + name = "breakable-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/breakable/-/breakable-0.1.0.tgz"; - name = "breakable-0.1.0.tgz"; - sha1 = "fe6325427b2662bd6e024009bf232f3e35fab7f5"; + url = "http://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz"; + name = "breakable-1.0.0.tgz"; + sha1 = "784a797915a38ead27bad456b5572cb4bbaa78c1"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."brfs"."0.0.8" = self.by-version."brfs"."0.0.8"; by-version."brfs"."0.0.8" = self.buildNodePackage { name = "brfs-0.0.8"; + version = "0.0.8"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/brfs/-/brfs-0.0.8.tgz"; @@ -3405,12 +4478,17 @@ "falafel-0.1.6" = self.by-version."falafel"."0.1.6"; "escodegen-0.0.17" = self.by-version."escodegen"."0.0.17"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."broadway"."0.2.x" = self.by-version."broadway"."0.2.10"; by-version."broadway"."0.2.10" = self.buildNodePackage { name = "broadway-0.2.10"; + version = "0.2.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz"; @@ -3424,12 +4502,17 @@ "winston-0.7.2" = self.by-version."winston"."0.7.2"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."broadway"."~0.3.2" = self.by-version."broadway"."0.3.6"; by-version."broadway"."0.3.6" = self.buildNodePackage { name = "broadway-0.3.6"; + version = "0.3.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz"; @@ -3443,7 +4526,11 @@ "winston-0.8.0" = self.by-version."winston"."0.8.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."broadway"."~0.3.6" = self.by-version."broadway"."0.3.6"; @@ -3451,6 +4538,7 @@ self.by-version."brorand"."1.0.5"; by-version."brorand"."1.0.5" = self.buildNodePackage { name = "brorand-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; @@ -3459,12 +4547,44 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."browser-launcher2"."0.4.4" = + self.by-version."browser-launcher2"."0.4.4"; + by-version."browser-launcher2"."0.4.4" = self.buildNodePackage { + name = "browser-launcher2-0.4.4"; + version = "0.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.4.tgz"; + name = "browser-launcher2-0.4.4.tgz"; + sha1 = "1e2b98ec9bc1c711084174d5b2c82598b5c0d1e4"; + }; + deps = { + "headless-0.1.7" = self.by-version."headless"."0.1.7"; + "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "plist-1.1.0" = self.by-version."plist"."1.1.0"; + "win-detect-browsers-0.0.2" = self.by-version."win-detect-browsers"."0.0.2"; + "uid-0.0.2" = self.by-version."uid"."0.0.2"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browser-pack"."^3.2.0" = self.by-version."browser-pack"."3.2.0"; by-version."browser-pack"."3.2.0" = self.buildNodePackage { name = "browser-pack-3.2.0"; + version = "3.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz"; @@ -3479,12 +4599,42 @@ "through2-0.5.1" = self.by-version."through2"."0.5.1"; "umd-2.1.0" = self.by-version."umd"."2.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."browser-pack"."^4.0.0" = + self.by-version."browser-pack"."4.0.0"; + by-version."browser-pack"."4.0.0" = self.buildNodePackage { + name = "browser-pack-4.0.0"; + version = "4.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-4.0.0.tgz"; + name = "browser-pack-4.0.0.tgz"; + sha1 = "172a63e45a7f5a1df83386cd861ca2d96ace2e77"; + }; + deps = { + "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; + "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0"; + "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; + "through2-0.5.1" = self.by-version."through2"."0.5.1"; + "umd-3.0.0" = self.by-version."umd"."3.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browser-pack"."~2.0.0" = self.by-version."browser-pack"."2.0.1"; by-version."browser-pack"."2.0.1" = self.buildNodePackage { name = "browser-pack-2.0.1"; + version = "2.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz"; @@ -3496,12 +4646,17 @@ "through-2.3.6" = self.by-version."through"."2.3.6"; "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browser-request".">= 0.2.0" = self.by-version."browser-request"."0.3.3"; by-version."browser-request"."0.3.3" = self.buildNodePackage { name = "browser-request-0.3.3"; + version = "0.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; @@ -3510,31 +4665,43 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browser-request"."~0.3.1" = self.by-version."browser-request"."0.3.3"; by-spec."browser-resolve"."^1.3.0" = - self.by-version."browser-resolve"."1.7.0"; - by-version."browser-resolve"."1.7.0" = self.buildNodePackage { - name = "browser-resolve-1.7.0"; + self.by-version."browser-resolve"."1.7.2"; + by-version."browser-resolve"."1.7.2" = self.buildNodePackage { + name = "browser-resolve-1.7.2"; + version = "1.7.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.7.0.tgz"; - name = "browser-resolve-1.7.0.tgz"; - sha1 = "b0efbb9b7da0b325328d3db9ceb7ee346939913e"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.7.2.tgz"; + name = "browser-resolve-1.7.2.tgz"; + sha1 = "b401695b615697856529389ae2bc1d0fab197bf4"; }; deps = { - "resolve-1.1.0" = self.by-version."resolve"."1.1.0"; + "resolve-1.1.5" = self.by-version."resolve"."1.1.5"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browser-resolve"."^1.7.0" = - self.by-version."browser-resolve"."1.7.0"; + self.by-version."browser-resolve"."1.7.2"; + by-spec."browser-resolve"."^1.7.1" = + self.by-version."browser-resolve"."1.7.2"; by-spec."browser-resolve"."~1.2.1" = self.by-version."browser-resolve"."1.2.4"; by-version."browser-resolve"."1.2.4" = self.buildNodePackage { name = "browser-resolve-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz"; @@ -3544,7 +4711,11 @@ deps = { "resolve-0.6.3" = self.by-version."resolve"."0.6.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browser-resolve"."~1.2.2" = self.by-version."browser-resolve"."1.2.4"; @@ -3552,6 +4723,7 @@ self.by-version."browserchannel"."2.0.0"; by-version."browserchannel"."2.0.0" = self.buildNodePackage { name = "browserchannel-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz"; @@ -3564,46 +4736,52 @@ "request-2.53.0" = self.by-version."request"."2.53.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."8.1.3"; - by-version."browserify"."8.1.3" = self.buildNodePackage { - name = "browserify-8.1.3"; + self.by-version."browserify"."9.0.3"; + by-version."browserify"."9.0.3" = self.buildNodePackage { + name = "browserify-9.0.3"; + version = "9.0.3"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz"; - name = "browserify-8.1.3.tgz"; - sha1 = "f33a549a3a6c368219b075fdcfe6df195e049a9a"; + url = "http://registry.npmjs.org/browserify/-/browserify-9.0.3.tgz"; + name = "browserify-9.0.3.tgz"; + sha1 = "f2f742b82ec5631c64b8c98a9788db0017c6517c"; }; deps = { - "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; + "JSONStream-0.10.0" = self.by-version."JSONStream"."0.10.0"; "assert-1.3.0" = self.by-version."assert"."1.3.0"; - "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0"; + "browser-pack-4.0.0" = self.by-version."browser-pack"."4.0.0"; + "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-3.0.2" = self.by-version."buffer"."3.0.2"; + "buffer-3.0.3" = self.by-version."buffer"."3.0.3"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12"; - "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; "glob-4.4.0" = self.by-version."glob"."4.4.0"; + "has-1.0.0" = self.by-version."has"."1.0.0"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.7.1" = self.by-version."module-deps"."3.7.1"; + "module-deps-3.7.2" = self.by-version."module-deps"."3.7.2"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-1.0.1" = self.by-version."parents"."1.0.1"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -3611,7 +4789,7 @@ "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "resolve-1.1.5" = self.by-version."resolve"."1.1.5"; "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; "shasum-1.0.1" = self.by-version."shasum"."1.0.1"; "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1"; @@ -3622,19 +4800,23 @@ "through2-1.1.1" = self.by-version."through2"."1.1.1"; "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0"; "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; - "umd-2.1.0" = self.by-version."umd"."2.1.0"; "url-0.10.2" = self.by-version."url"."0.10.2"; "util-0.10.3" = self.by-version."util"."0.10.3"; "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4"; "xtend-3.0.0" = self.by-version."xtend"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "browserify" = self.by-version."browserify"."8.1.3"; + "browserify" = self.by-version."browserify"."9.0.3"; by-spec."browserify"."7.1.0" = self.by-version."browserify"."7.1.0"; by-version."browserify"."7.1.0" = self.buildNodePackage { name = "browserify-7.1.0"; + version = "7.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz"; @@ -3645,9 +4827,9 @@ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.1.2" = self.by-version."assert"."1.1.2"; "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0"; + "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-3.0.2" = self.by-version."buffer"."3.0.2"; + "buffer-3.0.3" = self.by-version."buffer"."3.0.3"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; @@ -3667,7 +4849,7 @@ "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.7.1" = self.by-version."module-deps"."3.7.1"; + "module-deps-3.7.2" = self.by-version."module-deps"."3.7.2"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -3692,12 +4874,17 @@ "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4"; "xtend-3.0.0" = self.by-version."xtend"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify"."~3.19.1" = self.by-version."browserify"."3.19.1"; by-version."browserify"."3.19.1" = self.buildNodePackage { name = "browserify-3.19.1"; + version = "3.19.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/browserify/-/browserify-3.19.1.tgz"; @@ -3745,12 +4932,17 @@ "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify"."~3.24.1" = self.by-version."browserify"."3.24.13"; by-version."browserify"."3.24.13" = self.buildNodePackage { name = "browserify-3.24.13"; + version = "3.24.13"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/browserify/-/browserify-3.24.13.tgz"; @@ -3801,12 +4993,37 @@ "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."browserify-aes"."0.4.0" = + self.by-version."browserify-aes"."0.4.0"; + by-version."browserify-aes"."0.4.0" = self.buildNodePackage { + name = "browserify-aes-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; + name = "browserify-aes-0.4.0.tgz"; + sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify-aes"."^1.0.0" = self.by-version."browserify-aes"."1.0.0"; by-version."browserify-aes"."1.0.0" = self.buildNodePackage { name = "browserify-aes-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz"; @@ -3817,12 +5034,17 @@ "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify-rsa"."^1.1.0" = self.by-version."browserify-rsa"."1.1.1"; by-version."browserify-rsa"."1.1.1" = self.buildNodePackage { name = "browserify-rsa-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz"; @@ -3832,12 +5054,17 @@ deps = { "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify-sign"."2.8.0" = self.by-version."browserify-sign"."2.8.0"; by-version."browserify-sign"."2.8.0" = self.buildNodePackage { name = "browserify-sign-2.8.0"; + version = "2.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.8.0.tgz"; @@ -3851,12 +5078,17 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify-zlib"."^0.1.4" = self.by-version."browserify-zlib"."0.1.4"; by-version."browserify-zlib"."0.1.4" = self.buildNodePackage { name = "browserify-zlib-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; @@ -3866,14 +5098,21 @@ deps = { "pako-0.2.5" = self.by-version."pako"."0.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."browserify-zlib"."~0.1.2" = self.by-version."browserify-zlib"."0.1.4"; + by-spec."browserify-zlib"."~0.1.4" = + self.by-version."browserify-zlib"."0.1.4"; by-spec."bs58"."^2.0.0" = self.by-version."bs58"."2.0.1"; by-version."bs58"."2.0.1" = self.buildNodePackage { name = "bs58-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz"; @@ -3882,12 +5121,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bs58check"."1.0.3" = self.by-version."bs58check"."1.0.3"; by-version."bs58check"."1.0.3" = self.buildNodePackage { name = "bs58check-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bs58check/-/bs58check-1.0.3.tgz"; @@ -3897,12 +5141,17 @@ deps = { "bs58-2.0.1" = self.by-version."bs58"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bson"."0.1.8" = self.by-version."bson"."0.1.8"; by-version."bson"."0.1.8" = self.buildNodePackage { name = "bson-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; @@ -3911,12 +5160,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bson"."0.2.19" = self.by-version."bson"."0.2.19"; by-version."bson"."0.2.19" = self.buildNodePackage { name = "bson-0.2.19"; + version = "0.2.19"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.19.tgz"; @@ -3926,12 +5180,17 @@ deps = { "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bson"."0.2.2" = self.by-version."bson"."0.2.2"; by-version."bson"."0.2.2" = self.buildNodePackage { name = "bson-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz"; @@ -3940,31 +5199,63 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bson"."~0.2" = self.by-version."bson"."0.2.19"; + by-spec."buffer"."^2.3.0" = + self.by-version."buffer"."2.8.2"; + by-version."buffer"."2.8.2" = self.buildNodePackage { + name = "buffer-2.8.2"; + version = "2.8.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz"; + name = "buffer-2.8.2.tgz"; + sha1 = "d73c214c0334384dc29b04ee0ff5f5527c7974e7"; + }; + deps = { + "base64-js-0.0.7" = self.by-version."base64-js"."0.0.7"; + "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4"; + "is-array-1.0.1" = self.by-version."is-array"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."buffer"."^3.0.0" = - self.by-version."buffer"."3.0.2"; - by-version."buffer"."3.0.2" = self.buildNodePackage { - name = "buffer-3.0.2"; + self.by-version."buffer"."3.0.3"; + by-version."buffer"."3.0.3" = self.buildNodePackage { + name = "buffer-3.0.3"; + version = "3.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-3.0.2.tgz"; - name = "buffer-3.0.2.tgz"; - sha1 = "4f6513750dbe278300fa903da9d7b4b1745b480e"; + url = "http://registry.npmjs.org/buffer/-/buffer-3.0.3.tgz"; + name = "buffer-3.0.3.tgz"; + sha1 = "93d8a236e8ee37941cdaf801eb8cd4117192ece6"; }; deps = { "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8"; "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4"; "is-array-1.0.1" = self.by-version."is-array"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = self.buildNodePackage { name = "buffer-crc32-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; @@ -3973,12 +5264,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffer-crc32"."0.2.1" = self.by-version."buffer-crc32"."0.2.1"; by-version."buffer-crc32"."0.2.1" = self.buildNodePackage { name = "buffer-crc32-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; @@ -3987,12 +5283,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffer-crc32"."0.2.3" = self.by-version."buffer-crc32"."0.2.3"; by-version."buffer-crc32"."0.2.3" = self.buildNodePackage { name = "buffer-crc32-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; @@ -4001,12 +5302,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffer-crc32"."~0.2.1" = self.by-version."buffer-crc32"."0.2.5"; by-version."buffer-crc32"."0.2.5" = self.buildNodePackage { name = "buffer-crc32-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; @@ -4015,12 +5321,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffer-equal"."0.0.1" = self.by-version."buffer-equal"."0.0.1"; by-version."buffer-equal"."0.0.1" = self.buildNodePackage { name = "buffer-equal-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; @@ -4029,7 +5340,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffer-equal"."^0.0.1" = self.by-version."buffer-equal"."0.0.1"; @@ -4039,6 +5354,7 @@ self.by-version."buffercursor"."0.0.12"; by-version."buffercursor"."0.0.12" = self.buildNodePackage { name = "buffercursor-0.0.12"; + version = "0.0.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; @@ -4048,12 +5364,17 @@ deps = { "verror-1.6.0" = self.by-version."verror"."1.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffers"."~0.1.1" = self.by-version."buffers"."0.1.1"; by-version."buffers"."0.1.1" = self.buildNodePackage { name = "buffers-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; @@ -4062,12 +5383,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."buffertools"."*" = self.by-version."buffertools"."2.1.2"; by-version."buffertools"."2.1.2" = self.buildNodePackage { name = "buffertools-2.1.2"; + version = "2.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz"; @@ -4076,27 +5402,18 @@ }; deps = { }; - peerDependencies = []; - }; - "buffertools" = self.by-version."buffertools"."2.1.2"; - by-spec."buffertools".">=1.1.1 <2.0.0" = - self.by-version."buffertools"."1.1.1"; - by-version."buffertools"."1.1.1" = self.buildNodePackage { - name = "buffertools-1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; - name = "buffertools-1.1.1.tgz"; - sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + "buffertools" = self.by-version."buffertools"."2.1.2"; by-spec."bufferutil"."1.0.x" = self.by-version."bufferutil"."1.0.1"; by-version."bufferutil"."1.0.1" = self.buildNodePackage { name = "bufferutil-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz"; @@ -4107,12 +5424,17 @@ "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bufferview"."~1" = self.by-version."bufferview"."1.0.1"; by-version."bufferview"."1.0.1" = self.buildNodePackage { name = "bufferview-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; @@ -4121,12 +5443,41 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."buildmail"."^1.2.0" = + self.by-version."buildmail"."1.2.0"; + by-version."buildmail"."1.2.0" = self.buildNodePackage { + name = "buildmail-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/buildmail/-/buildmail-1.2.0.tgz"; + name = "buildmail-1.2.0.tgz"; + sha1 = "9434eefe177fc496a23e605f51ceb38da3a6cee6"; + }; + deps = { + "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2"; + "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0"; + "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0"; + "libmime-0.1.7" = self.by-version."libmime"."0.1.7"; + "libqp-0.1.1" = self.by-version."libqp"."0.1.1"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."builtins"."~0.0.3" = self.by-version."builtins"."0.0.7"; by-version."builtins"."0.0.7" = self.buildNodePackage { name = "builtins-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"; @@ -4135,12 +5486,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bunker"."0.1.X" = self.by-version."bunker"."0.1.2"; by-version."bunker"."0.1.2" = self.buildNodePackage { name = "bunker-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; @@ -4150,12 +5506,17 @@ deps = { "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bunyan"."0.21.1" = self.by-version."bunyan"."0.21.1"; by-version."bunyan"."0.21.1" = self.buildNodePackage { name = "bunyan-0.21.1"; + version = "0.21.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz"; @@ -4163,15 +5524,20 @@ sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a"; }; deps = { + }; + optionalDependencies = { "mv-0.0.5" = self.by-version."mv"."0.0.5"; "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bunyan"."0.22.1" = self.by-version."bunyan"."0.22.1"; by-version."bunyan"."0.22.1" = self.buildNodePackage { name = "bunyan-0.22.1"; + version = "0.22.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz"; @@ -4179,31 +5545,20 @@ sha1 = "020c383bed625af5c6c8834dd8c4aca0dd0f765c"; }; deps = { - "mv-0.0.5" = self.by-version."mv"."0.0.5"; - "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; - }; - peerDependencies = []; - }; - by-spec."bunyan"."~0.22.0" = - self.by-version."bunyan"."0.22.3"; - by-version."bunyan"."0.22.3" = self.buildNodePackage { - name = "bunyan-0.22.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.3.tgz"; - name = "bunyan-0.22.3.tgz"; - sha1 = "7a19dc1b4c8c645f740241a740f2245147c67ec2"; }; - deps = { - "mv-2.0.3" = self.by-version."mv"."2.0.3"; + optionalDependencies = { + "mv-0.0.5" = self.by-version."mv"."0.0.5"; "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bunyan"."~1.0.0" = self.by-version."bunyan"."1.0.1"; by-version."bunyan"."1.0.1" = self.buildNodePackage { name = "bunyan-1.0.1"; + version = "1.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/bunyan/-/bunyan-1.0.1.tgz"; @@ -4211,28 +5566,19 @@ sha1 = "9916a8c1832020c2d095656d923da5963db05466"; }; deps = { - "mv-2.0.3" = self.by-version."mv"."2.0.3"; }; - peerDependencies = []; - }; - by-spec."bunyan-prettystream"."~0.1.3" = - self.by-version."bunyan-prettystream"."0.1.3"; - by-version."bunyan-prettystream"."0.1.3" = self.buildNodePackage { - name = "bunyan-prettystream-0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bunyan-prettystream/-/bunyan-prettystream-0.1.3.tgz"; - name = "bunyan-prettystream-0.1.3.tgz"; - sha1 = "6c3b713266f6ad32007c7b6ab1e998a245349d98"; - }; - deps = { + optionalDependencies = { + "mv-2.0.3" = self.by-version."mv"."2.0.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."burrito".">=0.2.5 <0.3" = self.by-version."burrito"."0.2.12"; by-version."burrito"."0.2.12" = self.buildNodePackage { name = "burrito-0.2.12"; + version = "0.2.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; @@ -4243,12 +5589,17 @@ "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."busboy"."~0.2.9" = self.by-version."busboy"."0.2.9"; by-version."busboy"."0.2.9" = self.buildNodePackage { name = "busboy-0.2.9"; + version = "0.2.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/busboy/-/busboy-0.2.9.tgz"; @@ -4259,12 +5610,17 @@ "dicer-0.2.3" = self.by-version."dicer"."0.2.3"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytebuffer"."~3 >=3.5" = self.by-version."bytebuffer"."3.5.4"; by-version."bytebuffer"."3.5.4" = self.buildNodePackage { name = "bytebuffer-3.5.4"; + version = "3.5.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.4.tgz"; @@ -4275,12 +5631,17 @@ "long-2.2.3" = self.by-version."long"."2.2.3"; "bufferview-1.0.1" = self.by-version."bufferview"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytes"."0.1.0" = self.by-version."bytes"."0.1.0"; by-version."bytes"."0.1.0" = self.buildNodePackage { name = "bytes-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; @@ -4289,12 +5650,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytes"."0.2.0" = self.by-version."bytes"."0.2.0"; by-version."bytes"."0.2.0" = self.buildNodePackage { name = "bytes-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; @@ -4303,12 +5669,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytes"."0.2.1" = self.by-version."bytes"."0.2.1"; by-version."bytes"."0.2.1" = self.buildNodePackage { name = "bytes-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; @@ -4317,12 +5688,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytes"."0.3.0" = self.by-version."bytes"."0.3.0"; by-version."bytes"."0.3.0" = self.buildNodePackage { name = "bytes-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; @@ -4331,12 +5707,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytes"."1" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = self.buildNodePackage { name = "bytes-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; @@ -4345,7 +5726,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."bytes"."1.0.0" = self.by-version."bytes"."1.0.0"; @@ -4357,6 +5742,7 @@ self.by-version."callsite"."1.0.0"; by-version."callsite"."1.0.0" = self.buildNodePackage { name = "callsite-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; @@ -4365,7 +5751,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."callsite"."~1.0.0" = self.by-version."callsite"."1.0.0"; @@ -4373,6 +5763,7 @@ self.by-version."camelcase"."1.0.2"; by-version."camelcase"."1.0.2" = self.buildNodePackage { name = "camelcase-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"; @@ -4381,12 +5772,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."camelcase-keys"."^1.0.0" = self.by-version."camelcase-keys"."1.0.0"; by-version."camelcase-keys"."1.0.0" = self.buildNodePackage { name = "camelcase-keys-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; @@ -4397,12 +5793,17 @@ "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2"; "map-obj-1.0.0" = self.by-version."map-obj"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cardinal"."0.4.0" = self.by-version."cardinal"."0.4.0"; by-version."cardinal"."0.4.0" = self.buildNodePackage { name = "cardinal-0.4.0"; + version = "0.4.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz"; @@ -4412,12 +5813,17 @@ deps = { "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."caseless"."~0.6.0" = self.by-version."caseless"."0.6.0"; by-version."caseless"."0.6.0" = self.buildNodePackage { name = "caseless-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; @@ -4426,12 +5832,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."caseless"."~0.7.0" = self.by-version."caseless"."0.7.0"; by-version."caseless"."0.7.0" = self.buildNodePackage { name = "caseless-0.7.0"; + version = "0.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"; @@ -4440,12 +5851,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."caseless"."~0.8.0" = self.by-version."caseless"."0.8.0"; by-version."caseless"."0.8.0" = self.buildNodePackage { name = "caseless-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"; @@ -4454,12 +5870,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."caseless"."~0.9.0" = self.by-version."caseless"."0.9.0"; by-version."caseless"."0.9.0" = self.buildNodePackage { name = "caseless-0.9.0"; + version = "0.9.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; @@ -4468,23 +5889,28 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."castnow"."*" = - self.by-version."castnow"."0.4.9"; - by-version."castnow"."0.4.9" = self.buildNodePackage { - name = "castnow-0.4.9"; + self.by-version."castnow"."0.4.12"; + by-version."castnow"."0.4.12" = self.buildNodePackage { + name = "castnow-0.4.12"; + version = "0.4.12"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/castnow/-/castnow-0.4.9.tgz"; - name = "castnow-0.4.9.tgz"; - sha1 = "a9d4e42614c29c09f4dfdebcf52f34c7ea37865e"; + url = "http://registry.npmjs.org/castnow/-/castnow-0.4.12.tgz"; + name = "castnow-0.4.12.tgz"; + sha1 = "048a351420a5e6a68d098d6e8dc6b4abc86d6780"; }; deps = { "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0"; "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "chromecast-player-0.1.9" = self.by-version."chromecast-player"."0.1.9"; + "chromecast-player-0.1.10" = self.by-version."chromecast-player"."0.1.10"; "debounced-seeker-1.0.0" = self.by-version."debounced-seeker"."1.0.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "fs-extended-0.2.0" = self.by-version."fs-extended"."0.2.0"; @@ -4494,7 +5920,7 @@ "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; "mime-1.3.4" = self.by-version."mime"."1.3.4"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; - "peerflix-0.19.3" = self.by-version."peerflix"."0.19.3"; + "peerflix-0.25.2" = self.by-version."peerflix"."0.25.2"; "playerui-1.2.0" = self.by-version."playerui"."1.2.0"; "query-string-1.0.0" = self.by-version."query-string"."1.0.0"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; @@ -4505,13 +5931,18 @@ "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "castnow" = self.by-version."castnow"."0.4.9"; + "castnow" = self.by-version."castnow"."0.4.12"; by-spec."castv2"."~0.1.4" = self.by-version."castv2"."0.1.4"; by-version."castv2"."0.1.4" = self.buildNodePackage { name = "castv2-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/castv2/-/castv2-0.1.4.tgz"; @@ -4522,12 +5953,17 @@ "debug-0.8.1" = self.by-version."debug"."0.8.1"; "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."castv2-client"."0.0.8" = self.by-version."castv2-client"."0.0.8"; by-version."castv2-client"."0.0.8" = self.buildNodePackage { name = "castv2-client-0.0.8"; + version = "0.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/castv2-client/-/castv2-client-0.0.8.tgz"; @@ -4538,12 +5974,17 @@ "debug-1.0.4" = self.by-version."debug"."1.0.4"; "castv2-0.1.4" = self.by-version."castv2"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chai"."*" = self.by-version."chai"."2.0.0"; by-version."chai"."2.0.0" = self.buildNodePackage { name = "chai-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chai/-/chai-2.0.0.tgz"; @@ -4554,13 +5995,18 @@ "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "chai" = self.by-version."chai"."2.0.0"; by-spec."chain-node".">=0.0.17" = self.by-version."chain-node"."3.1.0"; by-version."chain-node"."3.1.0" = self.buildNodePackage { name = "chain-node-3.1.0"; + version = "3.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chain-node/-/chain-node-3.1.0.tgz"; @@ -4572,12 +6018,17 @@ "bitcoinjs-lib-1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0"; "bigi-1.4.0" = self.by-version."bigi"."1.4.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chainsaw"."~0.1.0" = self.by-version."chainsaw"."0.1.0"; by-version."chainsaw"."0.1.0" = self.buildNodePackage { name = "chainsaw-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; @@ -4587,12 +6038,17 @@ deps = { "traverse-0.3.9" = self.by-version."traverse"."0.3.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chalk"."0.5.0" = self.by-version."chalk"."0.5.0"; by-version."chalk"."0.5.0" = self.buildNodePackage { name = "chalk-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz"; @@ -4601,17 +6057,22 @@ }; deps = { "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; - "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chalk"."^0.5.0" = self.by-version."chalk"."0.5.1"; by-version."chalk"."0.5.1" = self.buildNodePackage { name = "chalk-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; @@ -4620,12 +6081,16 @@ }; deps = { "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; - "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chalk"."^0.5.1" = self.by-version."chalk"."0.5.1"; @@ -4633,6 +6098,7 @@ self.by-version."char-spinner"."1.0.1"; by-version."char-spinner"."1.0.1" = self.buildNodePackage { name = "char-spinner-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"; @@ -4641,12 +6107,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."character-parser"."1.2.0" = self.by-version."character-parser"."1.2.0"; by-version."character-parser"."1.2.0" = self.buildNodePackage { name = "character-parser-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; @@ -4655,12 +6126,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."character-parser"."1.2.1" = self.by-version."character-parser"."1.2.1"; by-version."character-parser"."1.2.1" = self.buildNodePackage { name = "character-parser-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; @@ -4669,12 +6145,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."charm"."0.1.x" = self.by-version."charm"."0.1.2"; by-version."charm"."0.1.2" = self.buildNodePackage { name = "charm-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; @@ -4683,12 +6164,41 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cheerio"."0.18.0" = + self.by-version."cheerio"."0.18.0"; + by-version."cheerio"."0.18.0" = self.buildNodePackage { + name = "cheerio-0.18.0"; + version = "0.18.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz"; + name = "cheerio-0.18.0.tgz"; + sha1 = "4e1c06377e725b740e996e0dfec353863de677fa"; + }; + deps = { + "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1"; + "entities-1.1.1" = self.by-version."entities"."1.1.1"; + "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; + "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1"; + "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cheerio"."^0.17.0" = self.by-version."cheerio"."0.17.0"; by-version."cheerio"."0.17.0" = self.buildNodePackage { name = "cheerio-0.17.0"; + version = "0.17.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz"; @@ -4702,12 +6212,17 @@ "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."child-process-close"."~0.1.1" = self.by-version."child-process-close"."0.1.1"; by-version."child-process-close"."0.1.1" = self.buildNodePackage { name = "child-process-close-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"; @@ -4716,12 +6231,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chmodr"."0.1.0" = self.by-version."chmodr"."0.1.0"; by-version."chmodr"."0.1.0" = self.buildNodePackage { name = "chmodr-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz"; @@ -4730,14 +6250,41 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chmodr"."~0.1.0" = self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = + self.by-version."chokidar"."0.12.6"; + by-version."chokidar"."0.12.6" = self.buildNodePackage { + name = "chokidar-0.12.6"; + version = "0.12.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz"; + name = "chokidar-0.12.6.tgz"; + sha1 = "be204f5b9634e009311256e5d6e8e0e508284d2f"; + }; + deps = { + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; + "async-each-0.1.6" = self.by-version."async-each"."0.1.6"; + }; + optionalDependencies = { + "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."chokidar"."^1.0.0-rc2" = self.by-version."chokidar"."1.0.0-rc3"; by-version."chokidar"."1.0.0-rc3" = self.buildNodePackage { name = "chokidar-1.0.0-rc3"; + version = "1.0.0-rc3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc3.tgz"; @@ -4750,14 +6297,19 @@ "glob-parent-1.0.0" = self.by-version."glob-parent"."1.0.0"; "is-binary-path-1.0.0" = self.by-version."is-binary-path"."1.0.0"; "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; + }; + optionalDependencies = { "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."chownr"."0" = self.by-version."chownr"."0.0.1"; by-version."chownr"."0.0.1" = self.buildNodePackage { name = "chownr-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz"; @@ -4766,51 +6318,64 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."chromecast-player"."0.1.9" = - self.by-version."chromecast-player"."0.1.9"; - by-version."chromecast-player"."0.1.9" = self.buildNodePackage { - name = "chromecast-player-0.1.9"; + by-spec."chromecast-player"."^0.1.10" = + self.by-version."chromecast-player"."0.1.10"; + by-version."chromecast-player"."0.1.10" = self.buildNodePackage { + name = "chromecast-player-0.1.10"; + version = "0.1.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.9.tgz"; - name = "chromecast-player-0.1.9.tgz"; - sha1 = "854d4264822347b3163ece8c8da2481390a0294e"; + url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.10.tgz"; + name = "chromecast-player-0.1.10.tgz"; + sha1 = "c5180f693d50119d824f81f388fe55bc2026844f"; }; deps = { "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8"; - "chromecast-scanner-0.2.0" = self.by-version."chromecast-scanner"."0.2.0"; + "chromecast-scanner-0.3.0" = self.by-version."chromecast-scanner"."0.3.0"; "mutate.js-0.2.0" = self.by-version."mutate.js"."0.2.0"; "promiscuous-0.6.0" = self.by-version."promiscuous"."0.6.0"; "time-line-1.0.1" = self.by-version."time-line"."1.0.1"; "ware-1.2.0" = self.by-version."ware"."1.2.0"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."chromecast-scanner"."0.2.0" = - self.by-version."chromecast-scanner"."0.2.0"; - by-version."chromecast-scanner"."0.2.0" = self.buildNodePackage { - name = "chromecast-scanner-0.2.0"; + by-spec."chromecast-scanner"."0.3.0" = + self.by-version."chromecast-scanner"."0.3.0"; + by-version."chromecast-scanner"."0.3.0" = self.buildNodePackage { + name = "chromecast-scanner-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.2.0.tgz"; - name = "chromecast-scanner-0.2.0.tgz"; - sha1 = "5b1f17aa92cf382bc413471d9b66caaf16d45d0e"; + url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.3.0.tgz"; + name = "chromecast-scanner-0.3.0.tgz"; + sha1 = "5e5bab3d8020ab5a8e868f967ebbdca2361c08f9"; }; deps = { - "got-2.4.0" = self.by-version."got"."2.4.0"; "mdns-js-0.2.9" = self.by-version."mdns-js"."0.2.9"; - "node-ssdp-2.0.1" = self.by-version."node-ssdp"."2.0.1"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cint"."^8.2.1" = self.by-version."cint"."8.2.1"; by-version."cint"."8.2.1" = self.buildNodePackage { name = "cint-8.2.1"; + version = "8.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; @@ -4819,12 +6384,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clean-css"."^3.0.1" = self.by-version."clean-css"."3.0.10"; by-version."clean-css"."3.0.10" = self.buildNodePackage { name = "clean-css-3.0.10"; + version = "3.0.10"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.10.tgz"; @@ -4835,12 +6405,17 @@ "commander-2.5.1" = self.by-version."commander"."2.5.1"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cli"."0.6.x" = self.by-version."cli"."0.6.5"; by-version."cli"."0.6.5" = self.buildNodePackage { name = "cli-0.6.5"; + version = "0.6.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz"; @@ -4851,12 +6426,17 @@ "glob-3.2.11" = self.by-version."glob"."3.2.11"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cli-color"."~0.3.2" = self.by-version."cli-color"."0.3.2"; by-version."cli-color"."0.3.2" = self.buildNodePackage { name = "cli-color-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz"; @@ -4869,12 +6449,17 @@ "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8"; "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cli-table"."^0.3.1" = self.by-version."cli-table"."0.3.1"; by-version."cli-table"."0.3.1" = self.buildNodePackage { name = "cli-table-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; @@ -4884,12 +6469,17 @@ deps = { "colors-1.0.3" = self.by-version."colors"."1.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cliff"."0.1.8" = self.by-version."cliff"."0.1.8"; by-version."cliff"."0.1.8" = self.buildNodePackage { name = "cliff-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; @@ -4901,12 +6491,17 @@ "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "winston-0.6.2" = self.by-version."winston"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cliff"."0.1.9" = self.by-version."cliff"."0.1.9"; by-version."cliff"."0.1.9" = self.buildNodePackage { name = "cliff-0.1.9"; + version = "0.1.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; @@ -4918,12 +6513,17 @@ "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cliff"."~0.1.9" = self.by-version."cliff"."0.1.10"; by-version."cliff"."0.1.10" = self.buildNodePackage { name = "cliff-0.1.10"; + version = "0.1.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; @@ -4935,12 +6535,17 @@ "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clivas"."^0.1.4" = self.by-version."clivas"."0.1.4"; by-version."clivas"."0.1.4" = self.buildNodePackage { name = "clivas-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; @@ -4949,12 +6554,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clone"."0.1.11" = self.by-version."clone"."0.1.11"; by-version."clone"."0.1.11" = self.buildNodePackage { name = "clone-0.1.11"; + version = "0.1.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz"; @@ -4963,12 +6573,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clone"."0.1.5" = self.by-version."clone"."0.1.5"; by-version."clone"."0.1.5" = self.buildNodePackage { name = "clone-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; @@ -4977,12 +6592,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clone"."0.1.6" = self.by-version."clone"."0.1.6"; by-version."clone"."0.1.6" = self.buildNodePackage { name = "clone-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; @@ -4991,12 +6611,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."clone"."0.2.0" = + self.by-version."clone"."0.2.0"; + by-version."clone"."0.2.0" = self.buildNodePackage { + name = "clone-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + name = "clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clone".">=0.1.0" = self.by-version."clone"."1.0.0"; by-version."clone"."1.0.0" = self.buildNodePackage { name = "clone-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clone/-/clone-1.0.0.tgz"; @@ -5005,26 +6649,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."clone"."^0.2.0" = self.by-version."clone"."0.2.0"; - by-version."clone"."0.2.0" = self.buildNodePackage { - name = "clone-0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - name = "clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; - }; - deps = { - }; - peerDependencies = []; - }; - by-spec."clone"."~0.1.5" = + by-spec."clone"."~0.1.15" = self.by-version."clone"."0.1.19"; by-version."clone"."0.1.19" = self.buildNodePackage { name = "clone-0.1.19"; + version = "0.1.19"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; @@ -5033,14 +6670,21 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."clone"."~0.1.5" = + self.by-version."clone"."0.1.19"; by-spec."clone"."~0.2.0" = self.by-version."clone"."0.2.0"; by-spec."clone-stats"."^0.0.1" = self.by-version."clone-stats"."0.0.1"; by-version."clone-stats"."0.0.1" = self.buildNodePackage { name = "clone-stats-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; @@ -5049,12 +6693,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."closest-package"."^1.0.0" = self.by-version."closest-package"."1.0.0"; by-version."closest-package"."1.0.0" = self.buildNodePackage { name = "closest-package-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/closest-package/-/closest-package-1.0.0.tgz"; @@ -5063,26 +6712,17 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."cls"."~0.1.3" = - self.by-version."cls"."0.1.5"; - by-version."cls"."0.1.5" = self.buildNodePackage { - name = "cls-0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cls/-/cls-0.1.5.tgz"; - name = "cls-0.1.5.tgz"; - sha1 = "df3218cf9d1480747f584d88b19b74c6b281317b"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cmd-shim"."2.0.0" = self.by-version."cmd-shim"."2.0.0"; by-version."cmd-shim"."2.0.0" = self.buildNodePackage { name = "cmd-shim-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.0.tgz"; @@ -5090,15 +6730,20 @@ sha1 = "34e0cd2ede0505cd8b154667eee9054ee24006b4"; }; deps = { - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; + optionalDependencies = { + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cmd-shim"."~2.0.1" = self.by-version."cmd-shim"."2.0.1"; by-version."cmd-shim"."2.0.1" = self.buildNodePackage { name = "cmd-shim-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"; @@ -5109,12 +6754,17 @@ "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cmdln"."1.3.2" = self.by-version."cmdln"."1.3.2"; by-version."cmdln"."1.3.2" = self.buildNodePackage { name = "cmdln-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz"; @@ -5127,12 +6777,17 @@ "verror-1.3.6" = self.by-version."verror"."1.3.6"; "dashdash-1.3.2" = self.by-version."dashdash"."1.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."co"."3.1.0" = self.by-version."co"."3.1.0"; by-version."co"."3.1.0" = self.buildNodePackage { name = "co-3.1.0"; + version = "3.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz"; @@ -5141,12 +6796,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."co"."~3.0.6" = self.by-version."co"."3.0.6"; by-version."co"."3.0.6" = self.buildNodePackage { name = "co-3.0.6"; + version = "3.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/co/-/co-3.0.6.tgz"; @@ -5155,12 +6815,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."codepage"."~1.3.4" = self.by-version."codepage"."1.3.8"; by-version."codepage"."1.3.8" = self.buildNodePackage { name = "codepage-1.3.8"; + version = "1.3.8"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/codepage/-/codepage-1.3.8.tgz"; @@ -5172,27 +6837,37 @@ "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "commander-2.6.0" = self.by-version."commander"."2.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."coffee-script"."*" = - self.by-version."coffee-script"."1.9.0"; - by-version."coffee-script"."1.9.0" = self.buildNodePackage { - name = "coffee-script-1.9.0"; + self.by-version."coffee-script"."1.9.1"; + by-version."coffee-script"."1.9.1" = self.buildNodePackage { + name = "coffee-script-1.9.1"; + version = "1.9.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.0.tgz"; - name = "coffee-script-1.9.0.tgz"; - sha1 = "7492cbbc3f0361cc5d8865aff7237552ff33e1f7"; + url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.1.tgz"; + name = "coffee-script-1.9.1.tgz"; + sha1 = "c458d02200f460d064a79cb6ab1ee6e2c9ca1c31"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "coffee-script" = self.by-version."coffee-script"."1.9.0"; + "coffee-script" = self.by-version."coffee-script"."1.9.1"; by-spec."coffee-script"."1.6.3" = self.by-version."coffee-script"."1.6.3"; by-version."coffee-script"."1.6.3" = self.buildNodePackage { name = "coffee-script-1.6.3"; + version = "1.6.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; @@ -5201,18 +6876,23 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."coffee-script".">= 0.0.1" = - self.by-version."coffee-script"."1.9.0"; + self.by-version."coffee-script"."1.9.1"; by-spec."coffee-script".">=1.2.0" = - self.by-version."coffee-script"."1.9.0"; + self.by-version."coffee-script"."1.9.1"; by-spec."coffee-script".">=1.6.2 <2.0.0" = - self.by-version."coffee-script"."1.9.0"; + self.by-version."coffee-script"."1.9.1"; by-spec."coffee-script"."~1.3.3" = self.by-version."coffee-script"."1.3.3"; by-version."coffee-script"."1.3.3" = self.buildNodePackage { name = "coffee-script-1.3.3"; + version = "1.3.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"; @@ -5221,12 +6901,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."coffee-script"."~1.8.0" = self.by-version."coffee-script"."1.8.0"; by-version."coffee-script"."1.8.0" = self.buildNodePackage { name = "coffee-script-1.8.0"; + version = "1.8.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"; @@ -5236,12 +6921,17 @@ deps = { "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."color"."~0.7.3" = self.by-version."color"."0.7.3"; by-version."color"."0.7.3" = self.buildNodePackage { name = "color-0.7.3"; + version = "0.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz"; @@ -5252,12 +6942,17 @@ "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; "color-string-0.2.4" = self.by-version."color-string"."0.2.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."color-convert"."0.5.x" = self.by-version."color-convert"."0.5.2"; by-version."color-convert"."0.5.2" = self.buildNodePackage { name = "color-convert-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz"; @@ -5266,12 +6961,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."color-name"."1.0.x" = self.by-version."color-name"."1.0.0"; by-version."color-name"."1.0.0" = self.buildNodePackage { name = "color-name-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz"; @@ -5280,12 +6980,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."color-string"."0.2.x" = self.by-version."color-string"."0.2.4"; by-version."color-string"."0.2.4" = self.buildNodePackage { name = "color-string-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz"; @@ -5295,12 +7000,17 @@ deps = { "color-name-1.0.0" = self.by-version."color-name"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."colors"."0.5.x" = self.by-version."colors"."0.5.1"; by-version."colors"."0.5.1" = self.buildNodePackage { name = "colors-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; @@ -5309,12 +7019,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."colors"."0.6.x" = self.by-version."colors"."0.6.2"; by-version."colors"."0.6.2" = self.buildNodePackage { name = "colors-0.6.2"; + version = "0.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; @@ -5323,7 +7038,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."colors"."0.x.x" = self.by-version."colors"."0.6.2"; @@ -5331,6 +7050,7 @@ self.by-version."colors"."1.0.3"; by-version."colors"."1.0.3" = self.buildNodePackage { name = "colors-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; @@ -5339,7 +7059,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."colors"."1.0.x" = self.by-version."colors"."1.0.3"; @@ -5351,6 +7075,7 @@ self.by-version."colour"."0.7.1"; by-version."colour"."0.7.1" = self.buildNodePackage { name = "colour-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; @@ -5359,12 +7084,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."columnify"."~1.2.1" = self.by-version."columnify"."1.2.1"; by-version."columnify"."1.2.1" = self.buildNodePackage { name = "columnify-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz"; @@ -5375,12 +7105,17 @@ "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0"; "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."columnify"."~1.4.1" = self.by-version."columnify"."1.4.1"; by-version."columnify"."1.4.1" = self.buildNodePackage { name = "columnify-1.4.1"; + version = "1.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/columnify/-/columnify-1.4.1.tgz"; @@ -5391,12 +7126,17 @@ "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."combine-source-map"."~0.3.0" = self.by-version."combine-source-map"."0.3.0"; by-version."combine-source-map"."0.3.0" = self.buildNodePackage { name = "combine-source-map-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz"; @@ -5404,16 +7144,21 @@ sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7"; }; deps = { - "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0"; + "inline-source-map-0.3.1" = self.by-version."inline-source-map"."0.3.1"; "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.7"; by-version."combined-stream"."0.0.7" = self.buildNodePackage { name = "combined-stream-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; @@ -5423,7 +7168,11 @@ deps = { "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."combined-stream"."~0.0.5" = self.by-version."combined-stream"."0.0.7"; @@ -5431,6 +7180,7 @@ self.by-version."commander"."2.6.0"; by-version."commander"."2.6.0" = self.buildNodePackage { name = "commander-2.6.0"; + version = "2.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; @@ -5439,12 +7189,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."0.6.1" = self.by-version."commander"."0.6.1"; by-version."commander"."0.6.1" = self.buildNodePackage { name = "commander-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; @@ -5453,12 +7208,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."1.3.1" = self.by-version."commander"."1.3.1"; by-version."commander"."1.3.1" = self.buildNodePackage { name = "commander-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; @@ -5468,12 +7228,17 @@ deps = { "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."1.3.2" = self.by-version."commander"."1.3.2"; by-version."commander"."1.3.2" = self.buildNodePackage { name = "commander-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; @@ -5483,12 +7248,17 @@ deps = { "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."2.0.0" = self.by-version."commander"."2.0.0"; by-version."commander"."2.0.0" = self.buildNodePackage { name = "commander-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; @@ -5497,12 +7267,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = self.buildNodePackage { name = "commander-2.1.0"; + version = "2.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; @@ -5511,12 +7286,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."2.3.0" = self.by-version."commander"."2.3.0"; by-version."commander"."2.3.0" = self.buildNodePackage { name = "commander-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; @@ -5525,12 +7305,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."2.5.x" = self.by-version."commander"."2.5.1"; by-version."commander"."2.5.1" = self.buildNodePackage { name = "commander-2.5.1"; + version = "2.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz"; @@ -5539,7 +7324,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commander"."2.6.0" = self.by-version."commander"."2.6.0"; @@ -5563,6 +7352,7 @@ self.by-version."commondir"."0.0.1"; by-version."commondir"."0.0.1" = self.buildNodePackage { name = "commondir-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"; @@ -5571,7 +7361,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."commondir"."~0.0.1" = self.by-version."commondir"."0.0.1"; @@ -5579,6 +7373,7 @@ self.by-version."commoner"."0.10.1"; by-version."commoner"."0.10.1" = self.buildNodePackage { name = "commoner-0.10.1"; + version = "0.10.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/commoner/-/commoner-0.10.1.tgz"; @@ -5596,12 +7391,19 @@ "install-0.1.8" = self.by-version."install"."0.1.8"; "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."commoner"."~0.10.0" = + self.by-version."commoner"."0.10.1"; by-spec."compact2string"."^1.2.0" = self.by-version."compact2string"."1.4.0"; by-version."compact2string"."1.4.0" = self.buildNodePackage { name = "compact2string-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; @@ -5611,12 +7413,17 @@ deps = { "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."component-bind"."1.0.0" = self.by-version."component-bind"."1.0.0"; by-version."component-bind"."1.0.0" = self.buildNodePackage { name = "component-bind-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; @@ -5625,12 +7432,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."component-emitter"."1.1.2" = self.by-version."component-emitter"."1.1.2"; by-version."component-emitter"."1.1.2" = self.buildNodePackage { name = "component-emitter-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; @@ -5639,12 +7451,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."component-inherit"."0.0.3" = self.by-version."component-inherit"."0.0.3"; by-version."component-inherit"."0.0.3" = self.buildNodePackage { name = "component-inherit-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; @@ -5653,12 +7470,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."compress-commons"."~0.1.0" = self.by-version."compress-commons"."0.1.6"; by-version."compress-commons"."0.1.6" = self.buildNodePackage { name = "compress-commons-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz"; @@ -5670,12 +7492,17 @@ "crc32-stream-0.3.2" = self.by-version."crc32-stream"."0.3.2"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."compressible"."1.0.0" = self.by-version."compressible"."1.0.0"; by-version."compressible"."1.0.0" = self.buildNodePackage { name = "compressible-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz"; @@ -5684,12 +7511,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."compressible"."~2.0.1" = self.by-version."compressible"."2.0.2"; by-version."compressible"."2.0.2" = self.buildNodePackage { name = "compressible-2.0.2"; + version = "2.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz"; @@ -5699,7 +7531,11 @@ deps = { "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."compressible"."~2.0.2" = self.by-version."compressible"."2.0.2"; @@ -5707,6 +7543,7 @@ self.by-version."compression"."1.0.0"; by-version."compression"."1.0.0" = self.buildNodePackage { name = "compression-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; @@ -5718,12 +7555,17 @@ "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; "compressible-1.0.0" = self.by-version."compressible"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."compression"."~1.1.2" = + by-spec."compression"."~1.1.0" = self.by-version."compression"."1.1.2"; by-version."compression"."1.1.2" = self.buildNodePackage { name = "compression-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz"; @@ -5738,32 +7580,19 @@ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; - peerDependencies = []; - }; - by-spec."compression"."~1.3.1" = - self.by-version."compression"."1.3.1"; - by-version."compression"."1.3.1" = self.buildNodePackage { - name = "compression-1.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.3.1.tgz"; - name = "compression-1.3.1.tgz"; - sha1 = "30986b2f519ba90e57759896301de4955ce00945"; - }; - deps = { - "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; - "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."compression"."~1.1.2" = + self.by-version."compression"."1.1.2"; by-spec."compression"."~1.4.1" = self.by-version."compression"."1.4.1"; by-version."compression"."1.4.1" = self.buildNodePackage { name = "compression-1.4.1"; + version = "1.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/compression/-/compression-1.4.1.tgz"; @@ -5778,12 +7607,17 @@ "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."concat-map"."0.0.1" = self.by-version."concat-map"."0.0.1"; by-version."concat-map"."0.0.1" = self.buildNodePackage { name = "concat-map-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; @@ -5792,12 +7626,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."concat-stream"."*" = self.by-version."concat-stream"."1.4.7"; by-version."concat-stream"."1.4.7" = self.buildNodePackage { name = "concat-stream-1.4.7"; + version = "1.4.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz"; @@ -5809,7 +7648,11 @@ "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."concat-stream"."^1.4.1" = self.by-version."concat-stream"."1.4.7"; @@ -5823,6 +7666,7 @@ self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = self.buildNodePackage { name = "config-0.4.15"; + version = "0.4.15"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz"; @@ -5831,15 +7675,20 @@ }; deps = { "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7"; - "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0"; - "vows-0.9.0-rc2" = self.by-version."vows"."0.9.0-rc2"; + "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1"; + "vows-0.8.1" = self.by-version."vows"."0.8.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."config"."0.4.36" = self.by-version."config"."0.4.36"; by-version."config"."0.4.36" = self.buildNodePackage { name = "config-0.4.36"; + version = "0.4.36"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/config/-/config-0.4.36.tgz"; @@ -5848,12 +7697,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."config-chain"."~1.1.1" = self.by-version."config-chain"."1.1.8"; by-version."config-chain"."1.1.8" = self.buildNodePackage { name = "config-chain-1.1.8"; + version = "1.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz"; @@ -5864,7 +7718,11 @@ "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3"; "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; @@ -5872,6 +7730,7 @@ self.by-version."configstore"."0.3.2"; by-version."configstore"."0.3.2" = self.buildNodePackage { name = "configstore-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz"; @@ -5880,7 +7739,7 @@ }; deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6"; + "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; @@ -5888,7 +7747,11 @@ "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."configstore"."^0.3.1" = self.by-version."configstore"."0.3.2"; @@ -5896,6 +7759,7 @@ self.by-version."connect"."1.9.2"; by-version."connect"."1.9.2" = self.buildNodePackage { name = "connect-1.9.2"; + version = "1.9.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; @@ -5907,12 +7771,17 @@ "mime-1.3.4" = self.by-version."mime"."1.3.4"; "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."2.11.0" = self.by-version."connect"."2.11.0"; by-version."connect"."2.11.0" = self.buildNodePackage { name = "connect-2.11.0"; + version = "2.11.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; @@ -5935,12 +7804,17 @@ "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."2.14.5" = self.by-version."connect"."2.14.5"; by-version."connect"."2.14.5" = self.buildNodePackage { name = "connect-2.14.5"; + version = "2.14.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.14.5.tgz"; @@ -5972,57 +7846,115 @@ "debug-0.8.1" = self.by-version."debug"."0.8.1"; "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."connect"."2.28.3" = - self.by-version."connect"."2.28.3"; - by-version."connect"."2.28.3" = self.buildNodePackage { - name = "connect-2.28.3"; + by-spec."connect"."2.26.1" = + self.by-version."connect"."2.26.1"; + by-version."connect"."2.26.1" = self.buildNodePackage { + name = "connect-2.26.1"; + version = "2.26.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.28.3.tgz"; - name = "connect-2.28.3.tgz"; - sha1 = "60df681ca6a940675d89546f0df84e299cdc13d1"; + url = "http://registry.npmjs.org/connect/-/connect-2.26.1.tgz"; + name = "connect-2.26.1.tgz"; + sha1 = "e8eb8c182c5120d25f5a5b76a09e7b99694d1403"; }; deps = { "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; - "body-parser-1.10.2" = self.by-version."body-parser"."1.10.2"; + "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.3.1" = self.by-version."compression"."1.3.1"; - "connect-timeout-1.5.0" = self.by-version."connect-timeout"."1.5.0"; + "compression-1.1.2" = self.by-version."compression"."1.1.2"; + "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0"; "csurf-1.6.6" = self.by-version."csurf"."1.6.6"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "errorhandler-1.2.4" = self.by-version."errorhandler"."1.2.4"; + "express-session-1.8.2" = self.by-version."express-session"."1.8.2"; + "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "method-override-2.2.0" = self.by-version."method-override"."2.2.0"; + "morgan-1.3.2" = self.by-version."morgan"."1.3.2"; + "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "qs-2.2.3" = self.by-version."qs"."2.2.3"; + "response-time-2.0.1" = self.by-version."response-time"."2.0.1"; + "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; + "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; + "serve-static-1.6.5" = self.by-version."serve-static"."1.6.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; + "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; + "pause-0.0.1" = self.by-version."pause"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect"."2.29.0" = + self.by-version."connect"."2.29.0"; + by-version."connect"."2.29.0" = self.buildNodePackage { + name = "connect-2.29.0"; + version = "2.29.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.29.0.tgz"; + name = "connect-2.29.0.tgz"; + sha1 = "c67514d45cd41c7e3a3eecd8613e2a096151caf8"; + }; + deps = { + "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; + "body-parser-1.12.0" = self.by-version."body-parser"."1.12.0"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "compression-1.4.1" = self.by-version."compression"."1.4.1"; + "connect-timeout-1.6.0" = self.by-version."connect-timeout"."1.6.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "csurf-1.7.0" = self.by-version."csurf"."1.7.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4"; "express-session-1.10.3" = self.by-version."express-session"."1.10.3"; "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; "method-override-2.3.1" = self.by-version."method-override"."2.3.1"; "morgan-1.5.1" = self.by-version."morgan"."1.5.1"; "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; + "response-time-2.3.0" = self.by-version."response-time"."2.3.0"; "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; "serve-index-1.6.2" = self.by-version."serve-index"."1.6.2"; - "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; - "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; + "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1"; + "type-is-1.6.0" = self.by-version."type-is"."1.6.0"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."2.3.x" = self.by-version."connect"."2.3.9"; by-version."connect"."2.3.9" = self.buildNodePackage { name = "connect-2.3.9"; + version = "2.3.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; @@ -6039,12 +7971,17 @@ "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."2.7.5" = self.by-version."connect"."2.7.5"; by-version."connect"."2.7.5" = self.buildNodePackage { name = "connect-2.7.5"; + version = "2.7.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz"; @@ -6063,12 +8000,17 @@ "pause-0.0.1" = self.by-version."pause"."0.0.1"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."2.7.6" = self.by-version."connect"."2.7.6"; by-version."connect"."2.7.6" = self.buildNodePackage { name = "connect-2.7.6"; + version = "2.7.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; @@ -6087,12 +8029,17 @@ "pause-0.0.1" = self.by-version."pause"."0.0.1"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."3.0.2" = self.by-version."connect"."3.0.2"; by-version."connect"."3.0.2" = self.buildNodePackage { name = "connect-3.0.2"; + version = "3.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-3.0.2.tgz"; @@ -6105,59 +8052,21 @@ "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect"."^2.14.5" = self.by-version."connect"."2.29.0"; - by-version."connect"."2.29.0" = self.buildNodePackage { - name = "connect-2.29.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.29.0.tgz"; - name = "connect-2.29.0.tgz"; - sha1 = "c67514d45cd41c7e3a3eecd8613e2a096151caf8"; - }; - deps = { - "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; - "body-parser-1.12.0" = self.by-version."body-parser"."1.12.0"; - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "compression-1.4.1" = self.by-version."compression"."1.4.1"; - "connect-timeout-1.6.0" = self.by-version."connect-timeout"."1.6.0"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "csurf-1.7.0" = self.by-version."csurf"."1.7.0"; - "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4"; - "express-session-1.10.3" = self.by-version."express-session"."1.10.3"; - "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "method-override-2.3.1" = self.by-version."method-override"."2.3.1"; - "morgan-1.5.1" = self.by-version."morgan"."1.5.1"; - "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "response-time-2.3.0" = self.by-version."response-time"."2.3.0"; - "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; - "serve-index-1.6.2" = self.by-version."serve-index"."1.6.2"; - "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1"; - "type-is-1.6.0" = self.by-version."type-is"."1.6.0"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; - "pause-0.0.1" = self.by-version."pause"."0.0.1"; - }; - peerDependencies = []; - }; by-spec."connect"."~2" = self.by-version."connect"."2.29.0"; by-spec."connect"."~2.26.0" = self.by-version."connect"."2.26.6"; by-version."connect"."2.26.6" = self.buildNodePackage { name = "connect-2.26.6"; + version = "2.26.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.26.6.tgz"; @@ -6195,12 +8104,17 @@ "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect-flash"."*" = self.by-version."connect-flash"."0.1.1"; by-version."connect-flash"."0.1.1" = self.buildNodePackage { name = "connect-flash-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz"; @@ -6209,13 +8123,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "connect-flash" = self.by-version."connect-flash"."0.1.1"; by-spec."connect-flash"."0.1.0" = self.by-version."connect-flash"."0.1.0"; by-version."connect-flash"."0.1.0" = self.buildNodePackage { name = "connect-flash-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; @@ -6224,12 +8143,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect-jade-static"."*" = self.by-version."connect-jade-static"."0.2.1"; by-version."connect-jade-static"."0.2.1" = self.buildNodePackage { name = "connect-jade-static-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.1.tgz"; @@ -6239,13 +8163,18 @@ deps = { "jade-1.9.2" = self.by-version."jade"."1.9.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "connect-jade-static" = self.by-version."connect-jade-static"."0.2.1"; by-spec."connect-mongo"."*" = self.by-version."connect-mongo"."0.7.0"; by-version."connect-mongo"."0.7.0" = self.buildNodePackage { name = "connect-mongo-0.7.0"; + version = "0.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.7.0.tgz"; @@ -6255,10 +8184,14 @@ deps = { "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; + "lodash-3.3.0" = self.by-version."lodash"."3.3.0"; "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "connect-mongo" = self.by-version."connect-mongo"."0.7.0"; by-spec."connect-mongo".">=0.4.0" = @@ -6267,6 +8200,7 @@ self.by-version."connect-multiparty"."1.2.5"; by-version."connect-multiparty"."1.2.5" = self.buildNodePackage { name = "connect-multiparty-1.2.5"; + version = "1.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz"; @@ -6279,12 +8213,17 @@ "qs-2.2.5" = self.by-version."qs"."2.2.5"; "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect-restreamer"."*" = self.by-version."connect-restreamer"."1.0.1"; by-version."connect-restreamer"."1.0.1" = self.buildNodePackage { name = "connect-restreamer-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.1.tgz"; @@ -6293,12 +8232,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect-timeout"."1.0.0" = self.by-version."connect-timeout"."1.0.0"; by-version."connect-timeout"."1.0.0" = self.buildNodePackage { name = "connect-timeout-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; @@ -6308,12 +8252,17 @@ deps = { "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect-timeout"."~1.3.0" = self.by-version."connect-timeout"."1.3.0"; by-version."connect-timeout"."1.3.0" = self.buildNodePackage { name = "connect-timeout-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz"; @@ -6325,30 +8274,17 @@ "ms-0.6.2" = self.by-version."ms"."0.6.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; - peerDependencies = []; - }; - by-spec."connect-timeout"."~1.5.0" = - self.by-version."connect-timeout"."1.5.0"; - by-version."connect-timeout"."1.5.0" = self.buildNodePackage { - name = "connect-timeout-1.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.5.0.tgz"; - name = "connect-timeout-1.5.0.tgz"; - sha1 = "f9a18b06d5074d06d6f7db0cdf0ebd4bd6467621"; - }; - deps = { - "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connect-timeout"."~1.6.0" = self.by-version."connect-timeout"."1.6.0"; by-version."connect-timeout"."1.6.0" = self.buildNodePackage { name = "connect-timeout-1.6.0"; + version = "1.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.0.tgz"; @@ -6361,12 +8297,17 @@ "ms-0.7.0" = self.by-version."ms"."0.7.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."connection-parse"."0.0.x" = self.by-version."connection-parse"."0.0.7"; by-version."connection-parse"."0.0.7" = self.buildNodePackage { name = "connection-parse-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; @@ -6375,12 +8316,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."console-browserify"."1.1.x" = self.by-version."console-browserify"."1.1.0"; by-version."console-browserify"."1.1.0" = self.buildNodePackage { name = "console-browserify-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; @@ -6390,7 +8336,11 @@ deps = { "date-now-0.1.4" = self.by-version."date-now"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."console-browserify"."^1.1.0" = self.by-version."console-browserify"."1.1.0"; @@ -6398,6 +8348,7 @@ self.by-version."console-browserify"."1.0.3"; by-version."console-browserify"."1.0.3" = self.buildNodePackage { name = "console-browserify-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz"; @@ -6406,12 +8357,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."constantinople"."~1.0.1" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = self.buildNodePackage { name = "constantinople-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz"; @@ -6421,7 +8377,11 @@ deps = { "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; @@ -6429,6 +8389,7 @@ self.by-version."constantinople"."3.0.1"; by-version."constantinople"."3.0.1" = self.buildNodePackage { name = "constantinople-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz"; @@ -6438,12 +8399,17 @@ deps = { "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."constants-browserify"."~0.0.1" = + by-spec."constants-browserify"."0.0.1" = self.by-version."constants-browserify"."0.0.1"; by-version."constants-browserify"."0.0.1" = self.buildNodePackage { name = "constants-browserify-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; @@ -6452,12 +8418,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."constants-browserify"."~0.0.1" = + self.by-version."constants-browserify"."0.0.1"; by-spec."content-disposition"."0.5.0" = self.by-version."content-disposition"."0.5.0"; by-version."content-disposition"."0.5.0" = self.buildNodePackage { name = "content-disposition-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; @@ -6466,12 +8439,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."content-type"."~1.0.1" = self.by-version."content-type"."1.0.1"; by-version."content-type"."1.0.1" = self.buildNodePackage { name = "content-type-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; @@ -6480,12 +8458,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."contextify"."~0.1.5" = self.by-version."contextify"."0.1.13"; by-version."contextify"."0.1.13" = self.buildNodePackage { name = "contextify-0.1.13"; + version = "0.1.13"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/contextify/-/contextify-0.1.13.tgz"; @@ -6496,12 +8479,17 @@ "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."convert-source-map"."~0.3.0" = self.by-version."convert-source-map"."0.3.5"; by-version."convert-source-map"."0.3.5" = self.buildNodePackage { name = "convert-source-map-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"; @@ -6510,12 +8498,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie"."0.0.4" = self.by-version."cookie"."0.0.4"; by-version."cookie"."0.0.4" = self.buildNodePackage { name = "cookie-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; @@ -6524,12 +8517,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie"."0.0.5" = self.by-version."cookie"."0.0.5"; by-version."cookie"."0.0.5" = self.buildNodePackage { name = "cookie-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; @@ -6538,12 +8536,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie"."0.1.0" = self.by-version."cookie"."0.1.0"; by-version."cookie"."0.1.0" = self.buildNodePackage { name = "cookie-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; @@ -6552,12 +8555,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie"."0.1.2" = self.by-version."cookie"."0.1.2"; by-version."cookie"."0.1.2" = self.buildNodePackage { name = "cookie-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; @@ -6566,12 +8574,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-jar"."~0.2.0" = self.by-version."cookie-jar"."0.2.0"; by-version."cookie-jar"."0.2.0" = self.buildNodePackage { name = "cookie-jar-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; @@ -6580,12 +8593,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-jar"."~0.3.0" = self.by-version."cookie-jar"."0.3.0"; by-version."cookie-jar"."0.3.0" = self.buildNodePackage { name = "cookie-jar-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"; @@ -6594,12 +8612,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-parser"."1.0.1" = self.by-version."cookie-parser"."1.0.1"; by-version."cookie-parser"."1.0.1" = self.buildNodePackage { name = "cookie-parser-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; @@ -6610,12 +8633,17 @@ "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-parser"."^1.0.1" = self.by-version."cookie-parser"."1.3.4"; by-version."cookie-parser"."1.3.4" = self.buildNodePackage { name = "cookie-parser-1.3.4"; + version = "1.3.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz"; @@ -6626,7 +8654,11 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-parser"."~1.3.3" = self.by-version."cookie-parser"."1.3.4"; @@ -6636,6 +8668,7 @@ self.by-version."cookie-signature"."1.0.0"; by-version."cookie-signature"."1.0.0" = self.buildNodePackage { name = "cookie-signature-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz"; @@ -6644,12 +8677,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-signature"."1.0.1" = self.by-version."cookie-signature"."1.0.1"; by-version."cookie-signature"."1.0.1" = self.buildNodePackage { name = "cookie-signature-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; @@ -6658,12 +8696,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-signature"."1.0.3" = self.by-version."cookie-signature"."1.0.3"; by-version."cookie-signature"."1.0.3" = self.buildNodePackage { name = "cookie-signature-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"; @@ -6672,12 +8715,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-signature"."1.0.4" = self.by-version."cookie-signature"."1.0.4"; by-version."cookie-signature"."1.0.4" = self.buildNodePackage { name = "cookie-signature-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; @@ -6686,12 +8734,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-signature"."1.0.5" = self.by-version."cookie-signature"."1.0.5"; by-version."cookie-signature"."1.0.5" = self.buildNodePackage { name = "cookie-signature-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; @@ -6700,12 +8753,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookie-signature"."1.0.6" = self.by-version."cookie-signature"."1.0.6"; by-version."cookie-signature"."1.0.6" = self.buildNodePackage { name = "cookie-signature-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; @@ -6714,12 +8772,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookiejar"."2.0.1" = self.by-version."cookiejar"."2.0.1"; by-version."cookiejar"."2.0.1" = self.buildNodePackage { name = "cookiejar-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; @@ -6728,12 +8791,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookies"."0.1.x" = self.by-version."cookies"."0.1.6"; by-version."cookies"."0.1.6" = self.buildNodePackage { name = "cookies-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookies/-/cookies-0.1.6.tgz"; @@ -6742,12 +8810,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cookies".">= 0.2.2" = self.by-version."cookies"."0.5.0"; by-version."cookies"."0.5.0" = self.buildNodePackage { name = "cookies-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz"; @@ -6757,12 +8830,17 @@ deps = { "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cordova"."*" = self.by-version."cordova"."4.2.0"; by-version."cordova"."4.2.0" = self.buildNodePackage { name = "cordova-4.2.0"; + version = "4.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/cordova/-/cordova-4.2.0.tgz"; @@ -6775,13 +8853,18 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "cordova" = self.by-version."cordova"."4.2.0"; by-spec."cordova-js"."3.7.3" = self.by-version."cordova-js"."3.7.3"; by-version."cordova-js"."3.7.3" = self.buildNodePackage { name = "cordova-js-3.7.3"; + version = "3.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.7.3.tgz"; @@ -6793,12 +8876,17 @@ "through-2.3.4" = self.by-version."through"."2.3.4"; "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cordova-lib"."4.2.0" = self.by-version."cordova-lib"."4.2.0"; by-version."cordova-lib"."4.2.0" = self.buildNodePackage { name = "cordova-lib-4.2.0"; + version = "4.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-4.2.0.tgz"; @@ -6830,12 +8918,17 @@ "valid-identifier-0.0.1" = self.by-version."valid-identifier"."0.0.1"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."core-util-is"."~1.0.0" = self.by-version."core-util-is"."1.0.1"; by-version."core-util-is"."1.0.1" = self.buildNodePackage { name = "core-util-is-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; @@ -6844,12 +8937,37 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cors"."2.5.3" = + self.by-version."cors"."2.5.3"; + by-version."cors"."2.5.3" = self.buildNodePackage { + name = "cors-2.5.3"; + version = "2.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cors/-/cors-2.5.3.tgz"; + name = "cors-2.5.3.tgz"; + sha1 = "0d70a211ec3b6cc9824e6cdc299c0630ef69c392"; + }; + deps = { + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."couch-login"."~0.1.15" = self.by-version."couch-login"."0.1.20"; by-version."couch-login"."0.1.20" = self.buildNodePackage { name = "couch-login-0.1.20"; + version = "0.1.20"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; @@ -6859,12 +8977,17 @@ deps = { "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."coveralls"."*" = self.by-version."coveralls"."2.11.2"; by-version."coveralls"."2.11.2" = self.buildNodePackage { name = "coveralls-2.11.2"; + version = "2.11.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz"; @@ -6877,13 +9000,18 @@ "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4"; "request-2.40.0" = self.by-version."request"."2.40.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "coveralls" = self.by-version."coveralls"."2.11.2"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = self.buildNodePackage { name = "crc-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; @@ -6892,12 +9020,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."crc"."3.0.0" = self.by-version."crc"."3.0.0"; by-version."crc"."3.0.0" = self.buildNodePackage { name = "crc-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; @@ -6906,12 +9039,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."crc"."3.2.1" = self.by-version."crc"."3.2.1"; by-version."crc"."3.2.1" = self.buildNodePackage { name = "crc-3.2.1"; + version = "3.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; @@ -6920,12 +9058,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."crc32-stream"."~0.3.1" = self.by-version."crc32-stream"."0.3.2"; by-version."crc32-stream"."0.3.2" = self.buildNodePackage { name = "crc32-stream-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.2.tgz"; @@ -6936,12 +9079,17 @@ "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."create-ecdh"."1.0.3" = self.by-version."create-ecdh"."1.0.3"; by-version."create-ecdh"."1.0.3" = self.buildNodePackage { name = "create-ecdh-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-1.0.3.tgz"; @@ -6952,12 +9100,17 @@ "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."create-hash"."^1.1.0" = self.by-version."create-hash"."1.1.0"; by-version."create-hash"."1.1.0" = self.buildNodePackage { name = "create-hash-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/create-hash/-/create-hash-1.1.0.tgz"; @@ -6969,12 +9122,17 @@ "ripemd160-1.0.0" = self.by-version."ripemd160"."1.0.0"; "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."create-hmac"."^1.1.0" = self.by-version."create-hmac"."1.1.3"; by-version."create-hmac"."1.1.3" = self.buildNodePackage { name = "create-hmac-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"; @@ -6985,14 +9143,19 @@ "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."create-hmac"."^1.1.2" = self.by-version."create-hmac"."1.1.3"; - by-spec."cron".">=1.0.1" = + by-spec."cron"."1.0.6" = self.by-version."cron"."1.0.6"; by-version."cron"."1.0.6" = self.buildNodePackage { name = "cron-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cron/-/cron-1.0.6.tgz"; @@ -7002,14 +9165,21 @@ deps = { "moment-timezone-0.2.4" = self.by-version."moment-timezone"."0.2.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."cron".">=1.0.1" = + self.by-version."cron"."1.0.6"; by-spec."cron"."^1.0.4" = self.by-version."cron"."1.0.6"; by-spec."crossroads"."~0.12.0" = self.by-version."crossroads"."0.12.0"; by-version."crossroads"."0.12.0" = self.buildNodePackage { name = "crossroads-0.12.0"; + version = "0.12.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz"; @@ -7019,12 +9189,17 @@ deps = { "signals-1.0.0" = self.by-version."signals"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cryptiles"."0.1.x" = self.by-version."cryptiles"."0.1.3"; by-version."cryptiles"."0.1.3" = self.buildNodePackage { name = "cryptiles-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; @@ -7034,12 +9209,17 @@ deps = { "boom-0.3.8" = self.by-version."boom"."0.3.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = self.buildNodePackage { name = "cryptiles-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; @@ -7049,12 +9229,17 @@ deps = { "boom-0.4.2" = self.by-version."boom"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cryptiles"."2.x.x" = self.by-version."cryptiles"."2.0.4"; by-version."cryptiles"."2.0.4" = self.buildNodePackage { name = "cryptiles-2.0.4"; + version = "2.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; @@ -7064,12 +9249,17 @@ deps = { "boom-2.6.1" = self.by-version."boom"."2.6.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."crypto"."0.0.3" = self.by-version."crypto"."0.0.3"; by-version."crypto"."0.0.3" = self.buildNodePackage { name = "crypto-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; @@ -7078,12 +9268,40 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."crypto-browserify"."3.3.0" = + self.by-version."crypto-browserify"."3.3.0"; + by-version."crypto-browserify"."3.3.0" = self.buildNodePackage { + name = "crypto-browserify-3.3.0"; + version = "3.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; + name = "crypto-browserify-3.3.0.tgz"; + sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; + }; + deps = { + "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1"; + "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0"; + "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6"; + "browserify-aes-0.4.0" = self.by-version."browserify-aes"."0.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."crypto-browserify"."^3.0.0" = self.by-version."crypto-browserify"."3.9.12"; by-version."crypto-browserify"."3.9.12" = self.buildNodePackage { name = "crypto-browserify-3.9.12"; + version = "3.9.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.12.tgz"; @@ -7102,7 +9320,11 @@ "public-encrypt-1.1.2" = self.by-version."public-encrypt"."1.1.2"; "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."crypto-browserify"."^3.2.6" = self.by-version."crypto-browserify"."3.9.12"; @@ -7110,6 +9332,7 @@ self.by-version."crypto-browserify"."1.0.9"; by-version."crypto-browserify"."1.0.9" = self.buildNodePackage { name = "crypto-browserify-1.0.9"; + version = "1.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; @@ -7118,12 +9341,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."csrf"."~2.0.5" = self.by-version."csrf"."2.0.6"; by-version."csrf"."2.0.6" = self.buildNodePackage { name = "csrf-2.0.6"; + version = "2.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz"; @@ -7136,7 +9364,11 @@ "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."csrf"."~2.0.6" = self.by-version."csrf"."2.0.6"; @@ -7144,6 +9376,7 @@ self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = self.buildNodePackage { name = "css-1.0.8"; + version = "1.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz"; @@ -7154,12 +9387,17 @@ "css-parse-1.0.4" = self.by-version."css-parse"."1.0.4"; "css-stringify-1.0.5" = self.by-version."css-stringify"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."css-parse"."1.0.4" = self.by-version."css-parse"."1.0.4"; by-version."css-parse"."1.0.4" = self.buildNodePackage { name = "css-parse-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; @@ -7168,12 +9406,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."css-parse"."1.7.x" = self.by-version."css-parse"."1.7.0"; by-version."css-parse"."1.7.0" = self.buildNodePackage { name = "css-parse-1.7.0"; + version = "1.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; @@ -7182,12 +9425,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."css-stringify"."1.0.5" = self.by-version."css-stringify"."1.0.5"; by-version."css-stringify"."1.0.5" = self.buildNodePackage { name = "css-stringify-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; @@ -7196,12 +9444,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cssom"."0.3.x" = self.by-version."cssom"."0.3.0"; by-version."cssom"."0.3.0" = self.buildNodePackage { name = "cssom-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cssom/-/cssom-0.3.0.tgz"; @@ -7210,7 +9463,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cssom"."~0.3.0" = self.by-version."cssom"."0.3.0"; @@ -7218,6 +9475,7 @@ self.by-version."cssstyle"."0.2.22"; by-version."cssstyle"."0.2.22" = self.buildNodePackage { name = "cssstyle-0.2.22"; + version = "0.2.22"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cssstyle/-/cssstyle-0.2.22.tgz"; @@ -7227,12 +9485,17 @@ deps = { "cssom-0.3.0" = self.by-version."cssom"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."csurf"."1.1.0" = self.by-version."csurf"."1.1.0"; by-version."csurf"."1.1.0" = self.buildNodePackage { name = "csurf-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; @@ -7243,12 +9506,17 @@ "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; "scmp-0.0.3" = self.by-version."scmp"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."csurf"."~1.6.2" = + by-spec."csurf"."~1.6.1" = self.by-version."csurf"."1.6.6"; by-version."csurf"."1.6.6" = self.buildNodePackage { name = "csurf-1.6.6"; + version = "1.6.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/csurf/-/csurf-1.6.6.tgz"; @@ -7261,14 +9529,19 @@ "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."csurf"."~1.6.6" = + by-spec."csurf"."~1.6.2" = self.by-version."csurf"."1.6.6"; by-spec."csurf"."~1.7.0" = self.by-version."csurf"."1.7.0"; by-version."csurf"."1.7.0" = self.buildNodePackage { name = "csurf-1.7.0"; + version = "1.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz"; @@ -7281,12 +9554,17 @@ "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ctype"."0.5.0" = self.by-version."ctype"."0.5.0"; by-version."ctype"."0.5.0" = self.buildNodePackage { name = "ctype-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz"; @@ -7295,12 +9573,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ctype"."0.5.2" = self.by-version."ctype"."0.5.2"; by-version."ctype"."0.5.2" = self.buildNodePackage { name = "ctype-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; @@ -7309,12 +9592,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ctype"."0.5.3" = self.by-version."ctype"."0.5.3"; by-version."ctype"."0.5.3" = self.buildNodePackage { name = "ctype-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; @@ -7323,12 +9611,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."cycle"."1.0.x" = self.by-version."cycle"."1.0.3"; by-version."cycle"."1.0.3" = self.buildNodePackage { name = "cycle-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; @@ -7337,12 +9630,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."d"."~0.1.1" = self.by-version."d"."0.1.1"; by-version."d"."0.1.1" = self.buildNodePackage { name = "d-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz"; @@ -7352,12 +9650,17 @@ deps = { "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."d8"."0.4.4" = self.by-version."d8"."0.4.4"; by-version."d8"."0.4.4" = self.buildNodePackage { name = "d8-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/d8/-/d8-0.4.4.tgz"; @@ -7367,12 +9670,17 @@ deps = { "m8-0.4.4" = self.by-version."m8"."0.4.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dashdash"."1.3.2" = self.by-version."dashdash"."1.3.2"; by-version."dashdash"."1.3.2" = self.buildNodePackage { name = "dashdash-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz"; @@ -7382,12 +9690,17 @@ deps = { "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dashdash"."1.5.0" = self.by-version."dashdash"."1.5.0"; by-version."dashdash"."1.5.0" = self.buildNodePackage { name = "dashdash-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz"; @@ -7397,12 +9710,17 @@ deps = { "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."data-uri-to-buffer"."0" = self.by-version."data-uri-to-buffer"."0.0.3"; by-version."data-uri-to-buffer"."0.0.3" = self.buildNodePackage { name = "data-uri-to-buffer-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz"; @@ -7411,12 +9729,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."date-now"."^0.1.4" = self.by-version."date-now"."0.1.4"; by-version."date-now"."0.1.4" = self.buildNodePackage { name = "date-now-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; @@ -7425,12 +9748,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dateformat"."1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3"; by-version."dateformat"."1.0.2-1.2.3" = self.buildNodePackage { name = "dateformat-1.0.2-1.2.3"; + version = "1.0.2-1.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; @@ -7439,12 +9767,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dateformat"."1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3"; by-version."dateformat"."1.0.7-1.2.3" = self.buildNodePackage { name = "dateformat-1.0.7-1.2.3"; + version = "1.0.7-1.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; @@ -7453,12 +9786,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dateformat"."^1.0.11" = self.by-version."dateformat"."1.0.11"; by-version."dateformat"."1.0.11" = self.buildNodePackage { name = "dateformat-1.0.11"; + version = "1.0.11"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz"; @@ -7469,28 +9807,39 @@ "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; "meow-3.0.0" = self.by-version."meow"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dateformat"."~1.0.6" = self.by-version."dateformat"."1.0.11"; by-spec."datejs".">=0.0.2" = - self.by-version."datejs"."1.0.0-rc3"; - by-version."datejs"."1.0.0-rc3" = self.buildNodePackage { - name = "datejs-1.0.0-rc3"; + self.by-version."datejs"."0.0.2"; + by-version."datejs"."0.0.2" = self.buildNodePackage { + name = "datejs-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/datejs/-/datejs-1.0.0-rc3.tgz"; - name = "datejs-1.0.0-rc3.tgz"; - sha1 = "bffa1efedefeb41fdd8a242af55afa01fb58de57"; + url = "http://registry.npmjs.org/datejs/-/datejs-0.0.2.tgz"; + name = "datejs-0.0.2.tgz"; + sha1 = "242cf2e1c7338d9502a5ae4196fd69e234211f4a"; }; deps = { + "vows-0.8.1" = self.by-version."vows"."0.8.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debounced-seeker"."^1.0.0" = self.by-version."debounced-seeker"."1.0.0"; by-version."debounced-seeker"."1.0.0" = self.buildNodePackage { name = "debounced-seeker-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; @@ -7499,12 +9848,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."*" = self.by-version."debug"."2.1.1"; by-version."debug"."2.1.1" = self.buildNodePackage { name = "debug-2.1.1"; + version = "2.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-2.1.1.tgz"; @@ -7514,12 +9868,17 @@ deps = { "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."0" = self.by-version."debug"."0.8.1"; by-version."debug"."0.8.1" = self.buildNodePackage { name = "debug-0.8.1"; + version = "0.8.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; @@ -7528,12 +9887,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."0.5.0" = self.by-version."debug"."0.5.0"; by-version."debug"."0.5.0" = self.buildNodePackage { name = "debug-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; @@ -7542,12 +9906,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."0.6.0" = self.by-version."debug"."0.6.0"; by-version."debug"."0.6.0" = self.buildNodePackage { name = "debug-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; @@ -7556,12 +9925,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."0.7.4" = self.by-version."debug"."0.7.4"; by-version."debug"."0.7.4" = self.buildNodePackage { name = "debug-0.7.4"; + version = "0.7.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; @@ -7570,12 +9944,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."debug"."0.7.x" = + self.by-version."debug"."0.7.4"; by-spec."debug"."0.8.0" = self.by-version."debug"."0.8.0"; by-version."debug"."0.8.0" = self.buildNodePackage { name = "debug-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; @@ -7584,7 +9965,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."0.8.1" = self.by-version."debug"."0.8.1"; @@ -7592,6 +9977,7 @@ self.by-version."debug"."1.0.2"; by-version."debug"."1.0.2" = self.buildNodePackage { name = "debug-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz"; @@ -7601,12 +9987,17 @@ deps = { "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."1.0.3" = self.by-version."debug"."1.0.3"; by-version."debug"."1.0.3" = self.buildNodePackage { name = "debug-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-1.0.3.tgz"; @@ -7616,7 +10007,11 @@ deps = { "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."2" = self.by-version."debug"."2.1.1"; @@ -7624,6 +10019,7 @@ self.by-version."debug"."2.0.0"; by-version."debug"."2.0.0" = self.buildNodePackage { name = "debug-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; @@ -7633,7 +10029,11 @@ deps = { "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug".">= 0.7.0" = self.by-version."debug"."2.1.1"; @@ -7645,6 +10045,7 @@ self.by-version."debug"."1.0.4"; by-version."debug"."1.0.4" = self.buildNodePackage { name = "debug-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; @@ -7654,7 +10055,11 @@ deps = { "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."debug"."^1.0.0" = self.by-version."debug"."1.0.4"; @@ -7688,6 +10093,7 @@ self.by-version."debuglog"."1.0.1"; by-version."debuglog"."1.0.1" = self.buildNodePackage { name = "debuglog-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; @@ -7696,12 +10102,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."decompress-zip"."0.0.8" = self.by-version."decompress-zip"."0.0.8"; by-version."decompress-zip"."0.0.8" = self.buildNodePackage { name = "decompress-zip-0.0.8"; + version = "0.0.8"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz"; @@ -7717,12 +10128,17 @@ "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-eql"."0.1.3" = self.by-version."deep-eql"."0.1.3"; by-version."deep-eql"."0.1.3" = self.buildNodePackage { name = "deep-eql-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; @@ -7732,12 +10148,17 @@ deps = { "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-equal"."*" = self.by-version."deep-equal"."1.0.0"; by-version."deep-equal"."1.0.0" = self.buildNodePackage { name = "deep-equal-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"; @@ -7746,12 +10167,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-equal"."0.0.0" = self.by-version."deep-equal"."0.0.0"; by-version."deep-equal"."0.0.0" = self.buildNodePackage { name = "deep-equal-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; @@ -7760,14 +10186,21 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."deep-equal"."^1.0.0" = + self.by-version."deep-equal"."1.0.0"; by-spec."deep-equal"."~0.0.0" = self.by-version."deep-equal"."0.0.0"; by-spec."deep-equal"."~0.1.0" = self.by-version."deep-equal"."0.1.2"; by-version."deep-equal"."0.1.2" = self.buildNodePackage { name = "deep-equal-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; @@ -7776,12 +10209,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-equal"."~0.2.1" = self.by-version."deep-equal"."0.2.2"; by-version."deep-equal"."0.2.2" = self.buildNodePackage { name = "deep-equal-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; @@ -7790,12 +10228,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-extend"."~0.2.5" = self.by-version."deep-extend"."0.2.11"; by-version."deep-extend"."0.2.11" = self.buildNodePackage { name = "deep-extend-0.2.11"; + version = "0.2.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; @@ -7804,12 +10247,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-extend"."~0.3.2" = self.by-version."deep-extend"."0.3.2"; by-version."deep-extend"."0.3.2" = self.buildNodePackage { name = "deep-extend-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.3.2.tgz"; @@ -7818,12 +10266,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-is"."0.1.x" = self.by-version."deep-is"."0.1.3"; by-version."deep-is"."0.1.3" = self.buildNodePackage { name = "deep-is-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; @@ -7832,7 +10285,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deep-is"."~0.1.2" = self.by-version."deep-is"."0.1.3"; @@ -7840,6 +10297,7 @@ self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = self.buildNodePackage { name = "deepmerge-0.2.7"; + version = "0.2.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz"; @@ -7848,13 +10306,39 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "deepmerge" = self.by-version."deepmerge"."0.2.7"; + by-spec."default-browser-id"."1.0.2" = + self.by-version."default-browser-id"."1.0.2"; + by-version."default-browser-id"."1.0.2" = self.buildNodePackage { + name = "default-browser-id-1.0.2"; + version = "1.0.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.2.tgz"; + name = "default-browser-id-1.0.2.tgz"; + sha1 = "17f500f18e466d1a82c06cd7ccba71c6ee6600a9"; + }; + deps = { + "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6"; + "untildify-1.0.0" = self.by-version."untildify"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ "darwin" ]; + cpu = [ ]; + }; by-spec."defaultable"."~0.7.2" = self.by-version."defaultable"."0.7.2"; by-version."defaultable"."0.7.2" = self.buildNodePackage { name = "defaultable-0.7.2"; + version = "0.7.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/defaultable/-/defaultable-0.7.2.tgz"; @@ -7863,12 +10347,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."defaults"."^1.0.0" = self.by-version."defaults"."1.0.0"; by-version."defaults"."1.0.0" = self.buildNodePackage { name = "defaults-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz"; @@ -7878,12 +10367,17 @@ deps = { "clone-0.1.19" = self.by-version."clone"."0.1.19"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."defined"."0.0.0" = self.by-version."defined"."0.0.0"; by-version."defined"."0.0.0" = self.buildNodePackage { name = "defined-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; @@ -7892,37 +10386,48 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."defined"."~0.0.0" = self.by-version."defined"."0.0.0"; - by-spec."defs"."~0.6.2" = - self.by-version."defs"."0.6.2"; - by-version."defs"."0.6.2" = self.buildNodePackage { - name = "defs-0.6.2"; + by-spec."defs"."~1.1.0" = + self.by-version."defs"."1.1.0"; + by-version."defs"."1.1.0" = self.buildNodePackage { + name = "defs-1.1.0"; + version = "1.1.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/defs/-/defs-0.6.2.tgz"; - name = "defs-0.6.2.tgz"; - sha1 = "c4e05855d29a7a3a9cd9cca4a40813503418d907"; + url = "http://registry.npmjs.org/defs/-/defs-1.1.0.tgz"; + name = "defs-1.1.0.tgz"; + sha1 = "a271201acd271eb0be887eefc61edd9f89f32b49"; }; deps = { "alter-0.2.0" = self.by-version."alter"."0.2.0"; - "breakable-0.1.0" = self.by-version."breakable"."0.1.0"; "ast-traverse-0.1.1" = self.by-version."ast-traverse"."0.1.1"; + "breakable-1.0.0" = self.by-version."breakable"."1.0.0"; + "esprima-fb-8001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb"; "simple-fmt-0.1.0" = self.by-version."simple-fmt"."0.1.0"; "simple-is-0.2.0" = self.by-version."simple-is"."0.2.0"; "stringmap-0.2.2" = self.by-version."stringmap"."0.2.2"; "stringset-0.2.1" = self.by-version."stringset"."0.2.1"; "tryor-0.1.2" = self.by-version."tryor"."0.1.2"; - "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."degenerator"."~1.0.0" = self.by-version."degenerator"."1.0.0"; by-version."degenerator"."1.0.0" = self.buildNodePackage { name = "degenerator-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/degenerator/-/degenerator-1.0.0.tgz"; @@ -7934,12 +10439,17 @@ "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; "ast-types-0.3.38" = self.by-version."ast-types"."0.3.38"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = self.buildNodePackage { name = "delayed-stream-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; @@ -7948,12 +10458,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."delegates"."^0.1.0" = self.by-version."delegates"."0.1.0"; by-version."delegates"."0.1.0" = self.buildNodePackage { name = "delegates-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"; @@ -7962,12 +10477,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dep-graph"."1.1.0" = self.by-version."dep-graph"."1.1.0"; by-version."dep-graph"."1.1.0" = self.buildNodePackage { name = "dep-graph-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; @@ -7977,12 +10497,17 @@ deps = { "underscore-1.2.1" = self.by-version."underscore"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."depd"."0.3.0" = self.by-version."depd"."0.3.0"; by-version."depd"."0.3.0" = self.buildNodePackage { name = "depd-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz"; @@ -7991,12 +10516,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."depd"."0.4.2" = self.by-version."depd"."0.4.2"; by-version."depd"."0.4.2" = self.buildNodePackage { name = "depd-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/depd/-/depd-0.4.2.tgz"; @@ -8005,12 +10535,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."depd"."0.4.5" = self.by-version."depd"."0.4.5"; by-version."depd"."0.4.5" = self.buildNodePackage { name = "depd-0.4.5"; + version = "0.4.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; @@ -8019,12 +10554,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."depd".">= 0.4.0" = self.by-version."depd"."1.0.0"; by-version."depd"."1.0.0" = self.buildNodePackage { name = "depd-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; @@ -8033,7 +10573,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."depd"."~1.0.0" = self.by-version."depd"."1.0.0"; @@ -8041,6 +10585,7 @@ self.by-version."deprecated"."0.0.1"; by-version."deprecated"."0.0.1" = self.buildNodePackage { name = "deprecated-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; @@ -8049,12 +10594,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deps-sort"."^1.3.5" = self.by-version."deps-sort"."1.3.5"; by-version."deps-sort"."1.3.5" = self.buildNodePackage { name = "deps-sort-1.3.5"; + version = "1.3.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz"; @@ -8068,12 +10618,17 @@ "shasum-1.0.1" = self.by-version."shasum"."1.0.1"; "through2-0.5.1" = self.by-version."through2"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."deps-sort"."~0.1.1" = self.by-version."deps-sort"."0.1.2"; by-version."deps-sort"."0.1.2" = self.buildNodePackage { name = "deps-sort-0.1.2"; + version = "0.1.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz"; @@ -8085,12 +10640,17 @@ "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4"; "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."derequire"."~0.6.0" = self.by-version."derequire"."0.6.1"; by-version."derequire"."0.6.1" = self.buildNodePackage { name = "derequire-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz"; @@ -8102,12 +10662,17 @@ "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3"; "esrefactor-0.1.0" = self.by-version."esrefactor"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = self.buildNodePackage { name = "destroy-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; @@ -8116,12 +10681,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."detective"."^4.0.0" = self.by-version."detective"."4.0.0"; by-version."detective"."4.0.0" = self.buildNodePackage { name = "detective-4.0.0"; + version = "4.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/detective/-/detective-4.0.0.tgz"; @@ -8133,12 +10703,17 @@ "defined-0.0.0" = self.by-version."defined"."0.0.0"; "escodegen-1.6.1" = self.by-version."escodegen"."1.6.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."detective"."~2.1.2" = self.by-version."detective"."2.1.2"; by-version."detective"."2.1.2" = self.buildNodePackage { name = "detective-2.1.2"; + version = "2.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/detective/-/detective-2.1.2.tgz"; @@ -8149,12 +10724,17 @@ "esprima-1.0.2" = self.by-version."esprima"."1.0.2"; "escodegen-0.0.15" = self.by-version."escodegen"."0.0.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dezalgo"."^1.0.0" = self.by-version."dezalgo"."1.0.1"; by-version."dezalgo"."1.0.1" = self.buildNodePackage { name = "dezalgo-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz"; @@ -8165,7 +10745,11 @@ "asap-1.0.0" = self.by-version."asap"."1.0.0"; "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dezalgo"."^1.0.1" = self.by-version."dezalgo"."1.0.1"; @@ -8175,6 +10759,7 @@ self.by-version."di"."0.0.1"; by-version."di"."0.0.1" = self.buildNodePackage { name = "di-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz"; @@ -8183,12 +10768,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dicer"."0.2.3" = self.by-version."dicer"."0.2.3"; by-version."dicer"."0.2.3" = self.buildNodePackage { name = "dicer-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dicer/-/dicer-0.2.3.tgz"; @@ -8199,12 +10789,17 @@ "streamsearch-0.1.2" = self.by-version."streamsearch"."0.1.2"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."diff"."1.0.7" = self.by-version."diff"."1.0.7"; by-version."diff"."1.0.7" = self.buildNodePackage { name = "diff-1.0.7"; + version = "1.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; @@ -8213,12 +10808,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."diff"."1.0.8" = self.by-version."diff"."1.0.8"; by-version."diff"."1.0.8" = self.buildNodePackage { name = "diff-1.0.8"; + version = "1.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; @@ -8227,28 +10827,21 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; - by-spec."diff"."~1.2.0" = - self.by-version."diff"."1.2.2"; - by-version."diff"."1.2.2" = self.buildNodePackage { - name = "diff-1.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.2.2.tgz"; - name = "diff-1.2.2.tgz"; - sha1 = "27f936a1f5831581024e9ac78fbda7330ce79e85"; - }; - deps = { - }; - peerDependencies = []; - }; + by-spec."diff"."~1.0.8" = + self.by-version."diff"."1.0.8"; by-spec."diffie-hellman"."^3.0.1" = self.by-version."diffie-hellman"."3.0.1"; by-version."diffie-hellman"."3.0.1" = self.buildNodePackage { name = "diffie-hellman-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz"; @@ -8260,12 +10853,17 @@ "miller-rabin-1.1.5" = self.by-version."miller-rabin"."1.1.5"; "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."difflet"."~0.2.0" = self.by-version."difflet"."0.2.6"; by-version."difflet"."0.2.6" = self.buildNodePackage { name = "difflet-0.2.6"; + version = "0.2.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; @@ -8277,12 +10875,17 @@ "charm-0.1.2" = self.by-version."charm"."0.1.2"; "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."directmail"."~0.1.7" = self.by-version."directmail"."0.1.8"; by-version."directmail"."0.1.8" = self.buildNodePackage { name = "directmail-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/directmail/-/directmail-0.1.8.tgz"; @@ -8292,12 +10895,17 @@ deps = { "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."director"."1.2.7" = self.by-version."director"."1.2.7"; by-version."director"."1.2.7" = self.buildNodePackage { name = "director-1.2.7"; + version = "1.2.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz"; @@ -8306,12 +10914,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dkim-signer"."~0.1.1" = self.by-version."dkim-signer"."0.1.2"; by-version."dkim-signer"."0.1.2" = self.buildNodePackage { name = "dkim-signer-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz"; @@ -8320,14 +10933,19 @@ }; deps = { "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; - "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18"; + "mimelib-0.2.19" = self.by-version."mimelib"."0.2.19"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dns"."^0.2.2" = self.by-version."dns"."0.2.2"; by-version."dns"."0.2.2" = self.buildNodePackage { name = "dns-0.2.2"; + version = "0.2.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/dns/-/dns-0.2.2.tgz"; @@ -8342,12 +10960,17 @@ "tomahawk-0.1.6" = self.by-version."tomahawk"."0.1.6"; "tomahawk-plugin-kv-memory-store-0.0.3" = self.by-version."tomahawk-plugin-kv-memory-store"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dom-serializer"."0" = self.by-version."dom-serializer"."0.1.0"; by-version."dom-serializer"."0.1.0" = self.buildNodePackage { name = "dom-serializer-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; @@ -8358,12 +10981,17 @@ "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; "entities-1.1.1" = self.by-version."entities"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dom-serializer"."~0.0.0" = self.by-version."dom-serializer"."0.0.1"; by-version."dom-serializer"."0.0.1" = self.buildNodePackage { name = "dom-serializer-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; @@ -8374,12 +11002,17 @@ "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; "entities-1.1.1" = self.by-version."entities"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."domain-browser"."~1.1.0" = + by-spec."domain-browser"."^1.1.1" = self.by-version."domain-browser"."1.1.4"; by-version."domain-browser"."1.1.4" = self.buildNodePackage { name = "domain-browser-1.1.4"; + version = "1.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"; @@ -8388,12 +11021,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."domain-browser"."~1.1.0" = + self.by-version."domain-browser"."1.1.4"; by-spec."domelementtype"."1" = self.by-version."domelementtype"."1.1.3"; by-version."domelementtype"."1.1.3" = self.buildNodePackage { name = "domelementtype-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; @@ -8402,7 +11042,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."domelementtype"."~1.1.1" = self.by-version."domelementtype"."1.1.3"; @@ -8410,6 +11054,7 @@ self.by-version."domhandler"."2.2.1"; by-version."domhandler"."2.2.1" = self.buildNodePackage { name = "domhandler-2.2.1"; + version = "2.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; @@ -8419,12 +11064,17 @@ deps = { "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."domhandler"."2.3" = self.by-version."domhandler"."2.3.0"; by-version."domhandler"."2.3.0" = self.buildNodePackage { name = "domhandler-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; @@ -8434,12 +11084,17 @@ deps = { "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."domino"."~1.0.18" = self.by-version."domino"."1.0.18"; by-version."domino"."1.0.18" = self.buildNodePackage { name = "domino-1.0.18"; + version = "1.0.18"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domino/-/domino-1.0.18.tgz"; @@ -8448,12 +11103,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."domutils"."1.4" = self.by-version."domutils"."1.4.3"; by-version."domutils"."1.4.3" = self.buildNodePackage { name = "domutils-1.4.3"; + version = "1.4.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; @@ -8463,12 +11123,17 @@ deps = { "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."domutils"."1.5" = self.by-version."domutils"."1.5.1"; by-version."domutils"."1.5.1" = self.buildNodePackage { name = "domutils-1.5.1"; + version = "1.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; @@ -8479,28 +11144,17 @@ "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0"; "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; - peerDependencies = []; - }; - by-spec."dox"."~0.4.4" = - self.by-version."dox"."0.4.6"; - by-version."dox"."0.4.6" = self.buildNodePackage { - name = "dox-0.4.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/dox/-/dox-0.4.6.tgz"; - name = "dox-0.4.6.tgz"; - sha1 = "b1f53ccd1aa0d7f712fdca22124a666e3ed37215"; - }; - deps = { - "marked-0.3.3" = self.by-version."marked"."0.3.3"; - "commander-0.6.1" = self.by-version."commander"."0.6.1"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dropbox"."=0.9.2" = self.by-version."dropbox"."0.9.2"; by-version."dropbox"."0.9.2" = self.buildNodePackage { name = "dropbox-0.9.2"; + version = "0.9.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dropbox/-/dropbox-0.9.2.tgz"; @@ -8511,12 +11165,17 @@ "open-0.0.5" = self.by-version."open"."0.0.5"; "xhr2-0.1.2" = self.by-version."xhr2"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."dtrace-provider"."0.2.8" = self.by-version."dtrace-provider"."0.2.8"; by-version."dtrace-provider"."0.2.8" = self.buildNodePackage { name = "dtrace-provider-0.2.8"; + version = "0.2.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz"; @@ -8525,12 +11184,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."duplexer"."~0.1.1" = + by-spec."duplexer"."~0.1.0" = self.by-version."duplexer"."0.1.1"; by-version."duplexer"."0.1.1" = self.buildNodePackage { name = "duplexer-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; @@ -8539,12 +11203,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."duplexer"."~0.1.1" = + self.by-version."duplexer"."0.1.1"; by-spec."duplexer2"."0.0.2" = self.by-version."duplexer2"."0.0.2"; by-version."duplexer2"."0.0.2" = self.buildNodePackage { name = "duplexer2-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; @@ -8554,7 +11225,11 @@ deps = { "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."duplexer2"."~0.0.2" = self.by-version."duplexer2"."0.0.2"; @@ -8562,6 +11237,7 @@ self.by-version."duplexify"."3.2.0"; by-version."duplexify"."3.2.0" = self.buildNodePackage { name = "duplexify-3.2.0"; + version = "3.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/duplexify/-/duplexify-3.2.0.tgz"; @@ -8572,12 +11248,17 @@ "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."each-async"."^1.1.0" = self.by-version."each-async"."1.1.1"; by-version."each-async"."1.1.1" = self.buildNodePackage { name = "each-async-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; @@ -8588,12 +11269,17 @@ "onetime-1.0.0" = self.by-version."onetime"."1.0.0"; "set-immediate-shim-1.0.0" = self.by-version."set-immediate-shim"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ecurve"."1.0.0" = self.by-version."ecurve"."1.0.0"; by-version."ecurve"."1.0.0" = self.buildNodePackage { name = "ecurve-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ecurve/-/ecurve-1.0.0.tgz"; @@ -8603,12 +11289,17 @@ deps = { "bigi-1.4.0" = self.by-version."bigi"."1.4.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."editor"."~0.1.0" = self.by-version."editor"."0.1.0"; by-version."editor"."0.1.0" = self.buildNodePackage { name = "editor-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz"; @@ -8617,12 +11308,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ee-first"."1.0.3" = self.by-version."ee-first"."1.0.3"; by-version."ee-first"."1.0.3" = self.buildNodePackage { name = "ee-first-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz"; @@ -8631,12 +11327,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ee-first"."1.0.5" = self.by-version."ee-first"."1.0.5"; by-version."ee-first"."1.0.5" = self.buildNodePackage { name = "ee-first-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; @@ -8645,12 +11346,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ee-first"."1.1.0" = self.by-version."ee-first"."1.1.0"; by-version."ee-first"."1.1.0" = self.buildNodePackage { name = "ee-first-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; @@ -8659,12 +11365,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ejs"."0.7.1" = self.by-version."ejs"."0.7.1"; by-version."ejs"."0.7.1" = self.buildNodePackage { name = "ejs-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ejs/-/ejs-0.7.1.tgz"; @@ -8673,12 +11384,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ejs"."0.8.3" = self.by-version."ejs"."0.8.3"; by-version."ejs"."0.8.3" = self.buildNodePackage { name = "ejs-0.8.3"; + version = "0.8.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; @@ -8687,26 +11403,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ejs".">=0.7.1" = - self.by-version."ejs"."2.2.4"; - by-version."ejs"."2.2.4" = self.buildNodePackage { - name = "ejs-2.2.4"; + self.by-version."ejs"."2.3.1"; + by-version."ejs"."2.3.1" = self.buildNodePackage { + name = "ejs-2.3.1"; + version = "2.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ejs/-/ejs-2.2.4.tgz"; - name = "ejs-2.2.4.tgz"; - sha1 = "f0af7e366c13149dd7ae30106c0c0e1cad11903c"; + url = "http://registry.npmjs.org/ejs/-/ejs-2.3.1.tgz"; + name = "ejs-2.3.1.tgz"; + sha1 = "a697d98ac401e32a99c3deed92c60c19b6199a7f"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."elementtree"."0.1.5" = self.by-version."elementtree"."0.1.5"; by-version."elementtree"."0.1.5" = self.buildNodePackage { name = "elementtree-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz"; @@ -8716,12 +11442,17 @@ deps = { "sax-0.3.5" = self.by-version."sax"."0.3.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."elliptic"."^1.0.0" = self.by-version."elliptic"."1.0.1"; by-version."elliptic"."1.0.1" = self.buildNodePackage { name = "elliptic-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz"; @@ -8734,12 +11465,17 @@ "hash.js-1.0.2" = self.by-version."hash.js"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."embedly".">=1.0.2" = self.by-version."embedly"."1.0.4"; by-version."embedly"."1.0.4" = self.buildNodePackage { name = "embedly-1.0.4"; + version = "1.0.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/embedly/-/embedly-1.0.4.tgz"; @@ -8752,12 +11488,17 @@ "sprintf-0.1.1" = self.by-version."sprintf"."0.1.1"; "hashish-0.0.4" = self.by-version."hashish"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."emitter"."http://github.com/component/emitter/archive/1.0.1.tar.gz" = self.by-version."emitter"."1.0.1"; by-version."emitter"."1.0.1" = self.buildNodePackage { name = "emitter-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://github.com/component/emitter/archive/1.0.1.tar.gz"; @@ -8767,12 +11508,17 @@ deps = { "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."empty-trash"."*" = self.by-version."empty-trash"."1.1.3"; by-version."empty-trash"."1.1.3" = self.buildNodePackage { name = "empty-trash-1.1.3"; + version = "1.1.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.3.tgz"; @@ -8785,13 +11531,18 @@ "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0"; "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "empty-trash" = self.by-version."empty-trash"."1.1.3"; by-spec."encoding"."~0.1.7" = self.by-version."encoding"."0.1.11"; by-version."encoding"."0.1.11" = self.buildNodePackage { name = "encoding-0.1.11"; + version = "0.1.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz"; @@ -8801,12 +11552,17 @@ deps = { "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."end-of-stream"."1.0.0" = self.by-version."end-of-stream"."1.0.0"; by-version."end-of-stream"."1.0.0" = self.buildNodePackage { name = "end-of-stream-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; @@ -8816,12 +11572,17 @@ deps = { "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."end-of-stream"."^0.1.4" = self.by-version."end-of-stream"."0.1.5"; by-version."end-of-stream"."0.1.5" = self.buildNodePackage { name = "end-of-stream-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; @@ -8831,12 +11592,17 @@ deps = { "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."end-of-stream"."^1.0.0" = self.by-version."end-of-stream"."1.1.0"; by-version."end-of-stream"."1.1.0" = self.buildNodePackage { name = "end-of-stream-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; @@ -8846,7 +11612,11 @@ deps = { "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."end-of-stream"."~0.1.5" = self.by-version."end-of-stream"."0.1.5"; @@ -8856,6 +11626,7 @@ self.by-version."engine.io"."1.3.1"; by-version."engine.io"."1.3.1" = self.buildNodePackage { name = "engine.io-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; @@ -8868,12 +11639,17 @@ "engine.io-parser-1.0.6" = self.by-version."engine.io-parser"."1.0.6"; "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."engine.io-client"."1.3.1" = self.by-version."engine.io-client"."1.3.1"; by-version."engine.io-client"."1.3.1" = self.buildNodePackage { name = "engine.io-client-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; @@ -8893,12 +11669,17 @@ "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2"; "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."engine.io-parser"."1.0.6" = self.by-version."engine.io-parser"."1.0.6"; by-version."engine.io-parser"."1.0.6" = self.buildNodePackage { name = "engine.io-parser-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; @@ -8912,12 +11693,39 @@ "blob-0.0.2" = self.by-version."blob"."0.0.2"; "utf8-2.0.0" = self.by-version."utf8"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."enhanced-resolve"."~0.8.2" = + self.by-version."enhanced-resolve"."0.8.4"; + by-version."enhanced-resolve"."0.8.4" = self.buildNodePackage { + name = "enhanced-resolve-0.8.4"; + version = "0.8.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.4.tgz"; + name = "enhanced-resolve-0.8.4.tgz"; + sha1 = "4dae8ed556e5312256a9dd317919478e904b5387"; + }; + deps = { + "tapable-0.1.8" = self.by-version."tapable"."0.1.8"; + "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."entities"."1.0" = self.by-version."entities"."1.0.0"; by-version."entities"."1.0.0" = self.buildNodePackage { name = "entities-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; @@ -8926,12 +11734,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."entities"."~1.1.1" = self.by-version."entities"."1.1.1"; by-version."entities"."1.1.1" = self.buildNodePackage { name = "entities-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; @@ -8940,12 +11753,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."envify"."^3.0.0" = self.by-version."envify"."3.2.0"; by-version."envify"."3.2.0" = self.buildNodePackage { name = "envify-3.2.0"; + version = "3.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/envify/-/envify-3.2.0.tgz"; @@ -8956,12 +11774,17 @@ "through-2.3.6" = self.by-version."through"."2.3.6"; "jstransform-7.0.0" = self.by-version."jstransform"."7.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."errno"."^0.1.1" = self.by-version."errno"."0.1.1"; by-version."errno"."0.1.1" = self.buildNodePackage { name = "errno-0.1.1"; + version = "0.1.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/errno/-/errno-0.1.1.tgz"; @@ -8971,12 +11794,17 @@ deps = { "prr-0.0.0" = self.by-version."prr"."0.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."errorhandler"."1.0.0" = self.by-version."errorhandler"."1.0.0"; by-version."errorhandler"."1.0.0" = self.buildNodePackage { name = "errorhandler-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz"; @@ -8985,12 +11813,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."errorhandler"."1.1.1" = self.by-version."errorhandler"."1.1.1"; by-version."errorhandler"."1.1.1" = self.buildNodePackage { name = "errorhandler-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz"; @@ -9001,12 +11834,17 @@ "accepts-1.0.7" = self.by-version."accepts"."1.0.7"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."errorhandler"."^1.1.1" = self.by-version."errorhandler"."1.3.4"; by-version."errorhandler"."1.3.4" = self.buildNodePackage { name = "errorhandler-1.3.4"; + version = "1.3.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.4.tgz"; @@ -9017,12 +11855,17 @@ "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."errorhandler"."~1.2.2" = + by-spec."errorhandler"."~1.2.0" = self.by-version."errorhandler"."1.2.4"; by-version."errorhandler"."1.2.4" = self.buildNodePackage { name = "errorhandler-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz"; @@ -9033,16 +11876,21 @@ "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."errorhandler"."~1.3.3" = - self.by-version."errorhandler"."1.3.4"; + by-spec."errorhandler"."~1.2.2" = + self.by-version."errorhandler"."1.2.4"; by-spec."errorhandler"."~1.3.4" = self.by-version."errorhandler"."1.3.4"; by-spec."es5-ext"."~0.10.2" = self.by-version."es5-ext"."0.10.6"; by-version."es5-ext"."0.10.6" = self.buildNodePackage { name = "es5-ext-0.10.6"; + version = "0.10.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz"; @@ -9053,7 +11901,11 @@ "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3"; "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es5-ext"."~0.10.4" = self.by-version."es5-ext"."0.10.6"; @@ -9063,6 +11915,7 @@ self.by-version."es6-iterator"."0.1.3"; by-version."es6-iterator"."0.1.3" = self.buildNodePackage { name = "es6-iterator-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz"; @@ -9074,42 +11927,57 @@ "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es6-iterator"."~0.1.3" = self.by-version."es6-iterator"."0.1.3"; - by-spec."es6-promise"."^2.0.0" = - self.by-version."es6-promise"."2.0.1"; - by-version."es6-promise"."2.0.1" = self.buildNodePackage { - name = "es6-promise-2.0.1"; + by-spec."es6-promise"."^1.0.0" = + self.by-version."es6-promise"."1.0.0"; + by-version."es6-promise"."1.0.0" = self.buildNodePackage { + name = "es6-promise-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.0.1.tgz"; - name = "es6-promise-2.0.1.tgz"; - sha1 = "ccc4963e679f0ca9fb187c777b9e583d3c7573c2"; + url = "http://registry.npmjs.org/es6-promise/-/es6-promise-1.0.0.tgz"; + name = "es6-promise-1.0.0.tgz"; + sha1 = "f90d3629faa7c26166ae4df77c89bacdeb8dca7f"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es6-shim".">=0.10.0 <1.0.0-0" = - self.by-version."es6-shim"."0.25.0"; - by-version."es6-shim"."0.25.0" = self.buildNodePackage { - name = "es6-shim-0.25.0"; + self.by-version."es6-shim"."0.25.3"; + by-version."es6-shim"."0.25.3" = self.buildNodePackage { + name = "es6-shim-0.25.3"; + version = "0.25.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.25.0.tgz"; - name = "es6-shim-0.25.0.tgz"; - sha1 = "62eea13af4aba9d3e4cb1c79e4b05556132a7a95"; + url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.25.3.tgz"; + name = "es6-shim-0.25.3.tgz"; + sha1 = "774d24aa33be5ba9404ba4de1086bf87a6302f66"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es6-shim"."~0.16.0" = self.by-version."es6-shim"."0.16.0"; by-version."es6-shim"."0.16.0" = self.buildNodePackage { name = "es6-shim-0.16.0"; + version = "0.16.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.16.0.tgz"; @@ -9118,12 +11986,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es6-symbol"."0.1.x" = self.by-version."es6-symbol"."0.1.1"; by-version."es6-symbol"."0.1.1" = self.buildNodePackage { name = "es6-symbol-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz"; @@ -9134,12 +12007,17 @@ "d-0.1.1" = self.by-version."d"."0.1.1"; "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es6-symbol"."~2.0.1" = self.by-version."es6-symbol"."2.0.1"; by-version."es6-symbol"."2.0.1" = self.buildNodePackage { name = "es6-symbol-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"; @@ -9150,12 +12028,17 @@ "d-0.1.1" = self.by-version."d"."0.1.1"; "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."es6-weak-map"."~0.1.2" = self.by-version."es6-weak-map"."0.1.2"; by-version."es6-weak-map"."0.1.2" = self.buildNodePackage { name = "es6-weak-map-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz"; @@ -9168,12 +12051,17 @@ "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3"; "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = self.buildNodePackage { name = "escape-html-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; @@ -9182,7 +12070,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escape-html"."1.0.1" = @@ -9191,6 +12083,7 @@ self.by-version."escape-string-applescript"."1.0.0"; by-version."escape-string-applescript"."1.0.0" = self.buildNodePackage { name = "escape-string-applescript-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz"; @@ -9199,12 +12092,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escape-string-regexp"."1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage { name = "escape-string-regexp-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; @@ -9213,14 +12111,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escape-string-regexp"."^1.0.0" = - self.by-version."escape-string-regexp"."1.0.2"; + self.by-version."escape-string-regexp"."1.0.3"; + by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { + name = "escape-string-regexp-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; + name = "escape-string-regexp-1.0.3.tgz"; + sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."escodegen"."0.0.15" = self.by-version."escodegen"."0.0.15"; by-version."escodegen"."0.0.15" = self.buildNodePackage { name = "escodegen-0.0.15"; + version = "0.0.15"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz"; @@ -9229,14 +12149,19 @@ }; deps = { "esprima-2.0.0" = self.by-version."esprima"."2.0.0"; + }; + optionalDependencies = { "source-map-0.3.0" = self.by-version."source-map"."0.3.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escodegen"."0.0.17" = self.by-version."escodegen"."0.0.17"; by-version."escodegen"."0.0.17" = self.buildNodePackage { name = "escodegen-0.0.17"; + version = "0.0.17"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz"; @@ -9246,14 +12171,19 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; + }; + optionalDependencies = { "source-map-0.3.0" = self.by-version."source-map"."0.3.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escodegen"."1.3.x" = self.by-version."escodegen"."1.3.3"; by-version."escodegen"."1.3.3" = self.buildNodePackage { name = "escodegen-1.3.3"; + version = "1.3.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; @@ -9264,14 +12194,19 @@ "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; + }; + optionalDependencies = { "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escodegen"."^1.4.1" = self.by-version."escodegen"."1.6.1"; by-version."escodegen"."1.6.1" = self.buildNodePackage { name = "escodegen-1.6.1"; + version = "1.6.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz"; @@ -9283,9 +12218,13 @@ "esutils-1.1.6" = self.by-version."esutils"."1.1.6"; "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; "optionator-0.5.0" = self.by-version."optionator"."0.5.0"; + }; + optionalDependencies = { "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."escodegen"."~1.3.1" = self.by-version."escodegen"."1.3.3"; @@ -9293,6 +12232,7 @@ self.by-version."escope"."0.0.16"; by-version."escope"."0.0.16" = self.buildNodePackage { name = "escope-0.0.16"; + version = "0.0.16"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz"; @@ -9302,12 +12242,17 @@ deps = { "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esprima"."1.0.2" = self.by-version."esprima"."1.0.2"; by-version."esprima"."1.0.2" = self.buildNodePackage { name = "esprima-1.0.2"; + version = "1.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz"; @@ -9316,26 +12261,17 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."esprima"."1.2.2" = - self.by-version."esprima"."1.2.2"; - by-version."esprima"."1.2.2" = self.buildNodePackage { - name = "esprima-1.2.2"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; - name = "esprima-1.2.2.tgz"; - sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esprima"."1.2.x" = self.by-version."esprima"."1.2.4"; by-version."esprima"."1.2.4" = self.buildNodePackage { name = "esprima-1.2.4"; + version = "1.2.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-1.2.4.tgz"; @@ -9344,12 +12280,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."esprima".">= 1.0.0" = + by-spec."esprima"."2.0.x" = self.by-version."esprima"."2.0.0"; by-version."esprima"."2.0.0" = self.buildNodePackage { name = "esprima-2.0.0"; + version = "2.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz"; @@ -9358,30 +12299,40 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."esprima".">= 1.0.0" = + self.by-version."esprima"."2.0.0"; by-spec."esprima"."^1.2.2" = self.by-version."esprima"."1.2.4"; - by-spec."esprima"."git+https://github.com/ariya/esprima.git#harmony" = + by-spec."esprima"."git://github.com/ariya/esprima.git#harmony" = self.by-version."esprima"."1.1.0-dev-harmony"; by-version."esprima"."1.1.0-dev-harmony" = self.buildNodePackage { name = "esprima-1.1.0-dev-harmony"; + version = "1.1.0-dev-harmony"; bin = true; src = fetchgit { - url = "https://github.com/ariya/esprima.git"; + url = "git://github.com/ariya/esprima.git"; rev = "a41a40b49046747b3af57341cda048bbd3d9df79"; sha256 = "a304effb5bc8e53d0752aeb7e10ab15afd8381ef09056d0fc98d94a43e5c748a"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."esprima"."git://github.com/ariya/esprima.git#harmony" = - self.by-version."esprima"."1.1.0-dev-harmony"; by-spec."esprima"."~ 1.0.2" = self.by-version."esprima"."1.0.4"; by-version."esprima"."1.0.4" = self.buildNodePackage { name = "esprima-1.0.4"; + version = "1.0.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; @@ -9390,12 +12341,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."esprima"."~ 2.0.0" = + self.by-version."esprima"."2.0.0"; by-spec."esprima"."~0.9.9" = self.by-version."esprima"."0.9.9"; by-version."esprima"."0.9.9" = self.buildNodePackage { name = "esprima-0.9.9"; + version = "0.9.9"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-0.9.9.tgz"; @@ -9404,10 +12362,12 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."esprima"."~1.0.0" = - self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.4" = @@ -9416,6 +12376,7 @@ self.by-version."esprima"."1.1.1"; by-version."esprima"."1.1.1" = self.buildNodePackage { name = "esprima-1.1.1"; + version = "1.1.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; @@ -9424,12 +12385,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."esprima"."~1.2.0" = + self.by-version."esprima"."1.2.4"; by-spec."esprima-fb"."12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb"; by-version."esprima-fb"."12001.1.0-dev-harmony-fb" = self.buildNodePackage { name = "esprima-fb-12001.1.0-dev-harmony-fb"; + version = "12001.1.0-dev-harmony-fb"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz"; @@ -9438,12 +12406,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; 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" = self.buildNodePackage { name = "esprima-fb-3001.1.0-dev-harmony-fb"; + version = "3001.1.0-dev-harmony-fb"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"; @@ -9452,12 +12425,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esprima-fb"."~10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb"; by-version."esprima-fb"."10001.1.0-dev-harmony-fb" = self.buildNodePackage { name = "esprima-fb-10001.1.0-dev-harmony-fb"; + version = "10001.1.0-dev-harmony-fb"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz"; @@ -9466,12 +12444,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."esprima-fb"."~12001.1.0-dev-harmony-fb" = + self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb"; by-spec."esprima-fb"."~7001.0001.0000-dev-harmony-fb" = self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb"; by-version."esprima-fb"."7001.1.0-dev-harmony-fb" = self.buildNodePackage { name = "esprima-fb-7001.1.0-dev-harmony-fb"; + version = "7001.1.0-dev-harmony-fb"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-7001.1.0-dev-harmony-fb.tgz"; @@ -9480,12 +12465,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima-fb"."~8001.1001.0-dev-harmony-fb" = + self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb"; + by-version."esprima-fb"."8001.1001.0-dev-harmony-fb" = self.buildNodePackage { + name = "esprima-fb-8001.1001.0-dev-harmony-fb"; + version = "8001.1001.0-dev-harmony-fb"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz"; + name = "esprima-fb-8001.1001.0-dev-harmony-fb.tgz"; + sha1 = "c3190b05341d45643e093af70485ab4988e34d5e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esprima-six"."0.0.3" = self.by-version."esprima-six"."0.0.3"; by-version."esprima-six"."0.0.3" = self.buildNodePackage { name = "esprima-six-0.0.3"; + version = "0.0.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz"; @@ -9494,7 +12503,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esprima-six"."~0.0.3" = self.by-version."esprima-six"."0.0.3"; @@ -9502,6 +12515,7 @@ self.by-version."esrefactor"."0.1.0"; by-version."esrefactor"."0.1.0" = self.buildNodePackage { name = "esrefactor-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz"; @@ -9513,12 +12527,17 @@ "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; "escope-0.0.16" = self.by-version."escope"."0.0.16"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."estraverse".">= 0.0.2" = self.by-version."estraverse"."1.9.1"; by-version."estraverse"."1.9.1" = self.buildNodePackage { name = "estraverse-1.9.1"; + version = "1.9.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.1.tgz"; @@ -9527,7 +12546,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."estraverse"."^1.9.1" = self.by-version."estraverse"."1.9.1"; @@ -9535,6 +12558,7 @@ self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = self.buildNodePackage { name = "estraverse-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz"; @@ -9543,12 +12567,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."estraverse"."~1.5.0" = self.by-version."estraverse"."1.5.1"; by-version."estraverse"."1.5.1" = self.buildNodePackage { name = "estraverse-1.5.1"; + version = "1.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; @@ -9557,12 +12586,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."estraverse"."~1.8.0" = self.by-version."estraverse"."1.8.0"; by-version."estraverse"."1.8.0" = self.buildNodePackage { name = "estraverse-1.8.0"; + version = "1.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; @@ -9571,12 +12605,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esutils"."^1.1.6" = self.by-version."esutils"."1.1.6"; by-version."esutils"."1.1.6" = self.buildNodePackage { name = "esutils-1.1.6"; + version = "1.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"; @@ -9585,12 +12624,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."esutils"."~1.0.0" = self.by-version."esutils"."1.0.0"; by-version."esutils"."1.0.0" = self.buildNodePackage { name = "esutils-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; @@ -9599,12 +12643,37 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."etag"."~1.3.1" = + self.by-version."etag"."1.3.1"; + by-version."etag"."1.3.1" = self.buildNodePackage { + name = "etag-1.3.1"; + version = "1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.3.1.tgz"; + name = "etag-1.3.1.tgz"; + sha1 = "e51925728688a32dc4eea1cfa9ab4f734d055567"; + }; + deps = { + "crc-3.0.0" = self.by-version."crc"."3.0.0"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."etag"."~1.4.0" = self.by-version."etag"."1.4.0"; by-version."etag"."1.4.0" = self.buildNodePackage { name = "etag-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; @@ -9614,12 +12683,17 @@ deps = { "crc-3.0.0" = self.by-version."crc"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."etag"."~1.5.0" = self.by-version."etag"."1.5.1"; by-version."etag"."1.5.1" = self.buildNodePackage { name = "etag-1.5.1"; + version = "1.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; @@ -9629,7 +12703,11 @@ deps = { "crc-3.2.1" = self.by-version."crc"."3.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."etag"."~1.5.1" = self.by-version."etag"."1.5.1"; @@ -9637,6 +12715,7 @@ self.by-version."event-emitter"."0.3.3"; by-version."event-emitter"."0.3.3" = self.buildNodePackage { name = "event-emitter-0.3.3"; + version = "0.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz"; @@ -9647,12 +12726,17 @@ "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "d-0.1.1" = self.by-version."d"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."event-stream"."~0.5" = self.by-version."event-stream"."0.5.3"; by-version."event-stream"."0.5.3" = self.buildNodePackage { name = "event-stream-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; @@ -9662,12 +12746,17 @@ deps = { "optimist-0.2.8" = self.by-version."optimist"."0.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."eventemitter2"."0.4.14" = self.by-version."eventemitter2"."0.4.14"; by-version."eventemitter2"."0.4.14" = self.buildNodePackage { name = "eventemitter2-0.4.14"; + version = "0.4.14"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; @@ -9676,7 +12765,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.14"; @@ -9686,6 +12779,7 @@ self.by-version."eventemitter3"."0.1.6"; by-version."eventemitter3"."0.1.6" = self.buildNodePackage { name = "eventemitter3-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; @@ -9694,12 +12788,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."events"."~1.0.0" = + by-spec."events"."^1.0.0" = self.by-version."events"."1.0.2"; by-version."events"."1.0.2" = self.buildNodePackage { name = "events-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/events/-/events-1.0.2.tgz"; @@ -9708,12 +12807,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."events"."~1.0.0" = + self.by-version."events"."1.0.2"; by-spec."events.node".">= 0.4.0" = self.by-version."events.node"."0.4.9"; by-version."events.node"."0.4.9" = self.buildNodePackage { name = "events.node-0.4.9"; + version = "0.4.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; @@ -9722,12 +12828,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."evernote"."^1.25.3" = self.by-version."evernote"."1.25.4"; by-version."evernote"."1.25.4" = self.buildNodePackage { name = "evernote-1.25.4"; + version = "1.25.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/evernote/-/evernote-1.25.4.tgz"; @@ -9737,12 +12848,17 @@ deps = { "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."everyauth"."0.4.5" = self.by-version."everyauth"."0.4.5"; by-version."everyauth"."0.4.5" = self.buildNodePackage { name = "everyauth-0.4.5"; + version = "0.4.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; @@ -9758,14 +12874,19 @@ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.19.2" = self.by-version."express"."3.19.2"; + "express-3.20.0" = self.by-version."express"."3.20.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."execSync"."^1.0.2" = self.by-version."execSync"."1.0.2"; by-version."execSync"."1.0.2" = self.buildNodePackage { name = "execSync-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/execSync/-/execSync-1.0.2.tgz"; @@ -9775,12 +12896,17 @@ deps = { "temp-0.5.1" = self.by-version."temp"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."exit"."0.1.2" = self.by-version."exit"."0.1.2"; by-version."exit"."0.1.2" = self.buildNodePackage { name = "exit-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; @@ -9789,7 +12915,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."exit"."0.1.x" = self.by-version."exit"."0.1.2"; @@ -9799,6 +12929,7 @@ self.by-version."express"."5.0.0-alpha.1"; by-version."express"."5.0.0-alpha.1" = self.buildNodePackage { name = "express-5.0.0-alpha.1"; + version = "5.0.0-alpha.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-5.0.0-alpha.1.tgz"; @@ -9831,13 +12962,18 @@ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "express" = self.by-version."express"."5.0.0-alpha.1"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = self.buildNodePackage { name = "express-2.5.11"; + version = "2.5.11"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; @@ -9850,47 +12986,95 @@ "qs-0.4.2" = self.by-version."qs"."0.4.2"; "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express"."3.*" = - self.by-version."express"."3.19.2"; - by-version."express"."3.19.2" = self.buildNodePackage { - name = "express-3.19.2"; + self.by-version."express"."3.20.0"; + by-version."express"."3.20.0" = self.buildNodePackage { + name = "express-3.20.0"; + version = "3.20.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.19.2.tgz"; - name = "express-3.19.2.tgz"; - sha1 = "7f9b3ad8ae0f29d2df98cb3d8649dec8bcc47bf6"; + url = "http://registry.npmjs.org/express/-/express-3.20.0.tgz"; + name = "express-3.20.0.tgz"; + sha1 = "9dac561e31a08e7d2852790d86d17c7b70bdd9ac"; }; deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.28.3" = self.by-version."connect"."2.28.3"; + "connect-2.29.0" = self.by-version."connect"."2.29.0"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; "commander-2.6.0" = self.by-version."commander"."2.6.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "methods-1.1.1" = self.by-version."methods"."1.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.11.1" = self.by-version."send"."0.11.1"; + "send-0.12.1" = self.by-version."send"."0.12.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."express"."3.17.2" = + self.by-version."express"."3.17.2"; + by-version."express"."3.17.2" = self.buildNodePackage { + name = "express-3.17.2"; + version = "3.17.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.17.2.tgz"; + name = "express-3.17.2.tgz"; + sha1 = "9593dd94af5d4776ea2b6dbff8c4d850a3381353"; + }; + deps = { + "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; + "connect-2.26.1" = self.by-version."connect"."2.26.1"; + "commander-1.3.2" = self.by-version."commander"."1.3.2"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "crc-3.0.0" = self.by-version."crc"."3.0.0"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "methods-1.1.0" = self.by-version."methods"."1.1.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "proxy-addr-1.0.1" = self.by-version."proxy-addr"."1.0.1"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.9.2" = self.by-version."send"."0.9.2"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express"."3.2.0" = self.by-version."express"."3.2.0"; by-version."express"."3.2.0" = self.buildNodePackage { name = "express-3.2.0"; + version = "3.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz"; @@ -9910,12 +13094,17 @@ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express"."3.4.4" = self.by-version."express"."3.4.4"; by-version."express"."3.4.4" = self.buildNodePackage { name = "express-3.4.4"; + version = "3.4.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; @@ -9935,14 +13124,19 @@ "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.19.2"; + self.by-version."express"."3.20.0"; by-spec."express"."4.6.1" = self.by-version."express"."4.6.1"; by-version."express"."4.6.1" = self.buildNodePackage { name = "express-4.6.1"; + version = "4.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-4.6.1.tgz"; @@ -9973,33 +13167,34 @@ "qs-0.6.6" = self.by-version."qs"."0.6.6"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express".">=3.0.0" = - self.by-version."express"."5.0.0-alpha.1"; - by-spec."express".">=4.0.0" = - self.by-version."express"."5.0.0-alpha.1"; - by-spec."express"."^4.0" = - self.by-version."express"."4.11.2"; - by-version."express"."4.11.2" = self.buildNodePackage { - name = "express-4.11.2"; + self.by-version."express"."4.12.0"; + by-version."express"."4.12.0" = self.buildNodePackage { + name = "express-4.12.0"; + version = "4.12.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz"; - name = "express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; + url = "http://registry.npmjs.org/express/-/express-4.12.0.tgz"; + name = "express-4.12.0.tgz"; + sha1 = "739660fce86acbc11ba9c37dc96ff009dc9975e8"; }; deps = { "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "methods-1.1.1" = self.by-version."methods"."1.1.1"; "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; @@ -10007,22 +13202,31 @@ "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.11.1" = self.by-version."send"."0.11.1"; - "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; - "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; + "send-0.12.1" = self.by-version."send"."0.12.1"; + "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1"; + "type-is-1.6.0" = self.by-version."type-is"."1.6.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."express".">=4.0.0" = + self.by-version."express"."4.12.0"; + by-spec."express"."^4.0" = + self.by-version."express"."4.12.0"; by-spec."express"."~2.5.11" = self.by-version."express"."2.5.11"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = self.buildNodePackage { name = "express-3.1.2"; + version = "3.1.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz"; @@ -10042,12 +13246,17 @@ "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express"."~3.5.1" = self.by-version."express"."3.5.3"; by-version."express"."3.5.3" = self.buildNodePackage { name = "express-3.5.3"; + version = "3.5.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-3.5.3.tgz"; @@ -10068,12 +13277,17 @@ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express"."~4.10.3" = self.by-version."express"."4.10.8"; by-version."express"."4.10.8" = self.buildNodePackage { name = "express-4.10.8"; + version = "4.10.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express/-/express-4.10.8.tgz"; @@ -10106,12 +13320,17 @@ "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express-form"."*" = self.by-version."express-form"."0.12.4"; by-version."express-form"."0.12.4" = self.buildNodePackage { name = "express-form-0.12.4"; + version = "0.12.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express-form/-/express-form-0.12.4.tgz"; @@ -10123,14 +13342,19 @@ "object-additions-0.5.1" = self.by-version."object-additions"."0.5.1"; "validator-2.1.0" = self.by-version."validator"."2.1.0"; }; + optionalDependencies = { + }; peerDependencies = [ - self.by-version."express"."5.0.0-alpha.1"]; + self.by-version."express"."4.12.0"]; + os = [ ]; + cpu = [ ]; }; "express-form" = self.by-version."express-form"."0.12.4"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = self.buildNodePackage { name = "express-partials-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; @@ -10139,12 +13363,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express-session"."1.0.2" = self.by-version."express-session"."1.0.2"; by-version."express-session"."1.0.2" = self.buildNodePackage { name = "express-session-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; @@ -10159,12 +13388,17 @@ "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; "debug-0.7.4" = self.by-version."debug"."0.7.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express-session"."^1.0.4" = self.by-version."express-session"."1.10.3"; by-version."express-session"."1.10.3" = self.buildNodePackage { name = "express-session-1.10.3"; + version = "1.10.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express-session/-/express-session-1.10.3.tgz"; @@ -10182,16 +13416,19 @@ "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."express-session"."~1.10.2" = - self.by-version."express-session"."1.10.3"; by-spec."express-session"."~1.10.3" = self.by-version."express-session"."1.10.3"; by-spec."express-session"."~1.8.2" = self.by-version."express-session"."1.8.2"; by-version."express-session"."1.8.2" = self.buildNodePackage { name = "express-session-1.8.2"; + version = "1.8.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz"; @@ -10209,12 +13446,17 @@ "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."express-session"."~1.9.2" = self.by-version."express-session"."1.9.3"; by-version."express-session"."1.9.3" = self.buildNodePackage { name = "express-session-1.9.3"; + version = "1.9.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz"; @@ -10232,12 +13474,17 @@ "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extend"."*" = self.by-version."extend"."2.0.0"; by-version."extend"."2.0.0" = self.buildNodePackage { name = "extend-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extend/-/extend-2.0.0.tgz"; @@ -10246,7 +13493,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "extend" = self.by-version."extend"."2.0.0"; by-spec."extend".">=1.1.3" = @@ -10257,6 +13508,7 @@ self.by-version."extend"."1.2.1"; by-version."extend"."1.2.1" = self.buildNodePackage { name = "extend-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; @@ -10265,12 +13517,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extend"."~1.3.0" = self.by-version."extend"."1.3.0"; by-version."extend"."1.3.0" = self.buildNodePackage { name = "extend-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz"; @@ -10279,12 +13536,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extend.js"."0.0.2" = self.by-version."extend.js"."0.0.2"; by-version."extend.js"."0.0.2" = self.buildNodePackage { name = "extend.js-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz"; @@ -10293,12 +13555,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extract-opts"."~2.2.0" = self.by-version."extract-opts"."2.2.0"; by-version."extract-opts"."2.2.0" = self.buildNodePackage { name = "extract-opts-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz"; @@ -10308,12 +13575,17 @@ deps = { "typechecker-2.0.8" = self.by-version."typechecker"."2.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extsprintf"."1.0.0" = self.by-version."extsprintf"."1.0.0"; by-version."extsprintf"."1.0.0" = self.buildNodePackage { name = "extsprintf-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; @@ -10322,12 +13594,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extsprintf"."1.0.2" = self.by-version."extsprintf"."1.0.2"; by-version."extsprintf"."1.0.2" = self.buildNodePackage { name = "extsprintf-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; @@ -10336,12 +13613,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."extsprintf"."1.2.0" = self.by-version."extsprintf"."1.2.0"; by-version."extsprintf"."1.2.0" = self.buildNodePackage { name = "extsprintf-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; @@ -10350,12 +13632,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."eyes"."0.1.x" = self.by-version."eyes"."0.1.8"; by-version."eyes"."0.1.8" = self.buildNodePackage { name = "eyes-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; @@ -10364,7 +13651,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."eyes"."~0.1.6" = self.by-version."eyes"."0.1.8"; @@ -10374,6 +13665,7 @@ self.by-version."falafel"."0.1.6"; by-version."falafel"."0.1.6" = self.buildNodePackage { name = "falafel-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz"; @@ -10383,12 +13675,17 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fast-levenshtein"."~1.0.0" = self.by-version."fast-levenshtein"."1.0.6"; by-version."fast-levenshtein"."1.0.6" = self.buildNodePackage { name = "fast-levenshtein-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"; @@ -10397,12 +13694,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."favitest"."^1.0.3" = self.by-version."favitest"."1.0.7"; by-version."favitest"."1.0.7" = self.buildNodePackage { name = "favitest-1.0.7"; + version = "1.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/favitest/-/favitest-1.0.7.tgz"; @@ -10412,38 +13714,48 @@ deps = { "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "q-1.1.2" = self.by-version."q"."1.1.2"; + "q-1.2.0" = self.by-version."q"."1.2.0"; "request-2.53.0" = self.by-version."request"."2.53.0"; "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."favitest"."^1.0.7" = self.by-version."favitest"."1.0.7"; by-spec."faye-websocket"."*" = - self.by-version."faye-websocket"."0.9.2"; - by-version."faye-websocket"."0.9.2" = self.buildNodePackage { - name = "faye-websocket-0.9.2"; + self.by-version."faye-websocket"."0.9.3"; + by-version."faye-websocket"."0.9.3" = self.buildNodePackage { + name = "faye-websocket-0.9.3"; + version = "0.9.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.2.tgz"; - name = "faye-websocket-0.9.2.tgz"; - sha1 = "872e633049fa10c3a55381f9ecac80bfb3053405"; + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz"; + name = "faye-websocket-0.9.3.tgz"; + sha1 = "482a505b0df0ae626b969866d3bd740cdb962e83"; }; deps = { - "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; + "websocket-driver-0.5.3" = self.by-version."websocket-driver"."0.5.3"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.9.2"; + "faye-websocket" = self.by-version."faye-websocket"."0.9.3"; by-spec."faye-websocket".">= 0.4.1" = - self.by-version."faye-websocket"."0.9.2"; + self.by-version."faye-websocket"."0.9.3"; by-spec."faye-websocket"."^0.7.3 || ^0.8.0 || ^0.9.0" = - self.by-version."faye-websocket"."0.9.2"; + self.by-version."faye-websocket"."0.9.3"; by-spec."faye-websocket"."~0.7.0" = self.by-version."faye-websocket"."0.7.3"; by-version."faye-websocket"."0.7.3" = self.buildNodePackage { name = "faye-websocket-0.7.3"; + version = "0.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz"; @@ -10451,14 +13763,19 @@ sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11"; }; deps = { - "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; + "websocket-driver-0.5.3" = self.by-version."websocket-driver"."0.5.3"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fb".">=0.0.9" = self.by-version."fb"."0.7.0"; by-version."fb"."0.7.0" = self.buildNodePackage { name = "fb-0.7.0"; + version = "0.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fb/-/fb-0.7.0.tgz"; @@ -10469,12 +13786,17 @@ "request-2.9.203" = self.by-version."request"."2.9.203"; "crypto-0.0.3" = self.by-version."crypto"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."feedparser".">=0.16.2" = + by-spec."feedparser"."0.19.2" = self.by-version."feedparser"."0.19.2"; by-version."feedparser"."0.19.2" = self.buildNodePackage { name = "feedparser-0.19.2"; + version = "0.19.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/feedparser/-/feedparser-0.19.2.tgz"; @@ -10488,12 +13810,19 @@ "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "resanitize-0.3.0" = self.by-version."resanitize"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."feedparser".">=0.16.2" = + self.by-version."feedparser"."0.19.2"; by-spec."fetch-bower"."*" = self.by-version."fetch-bower"."2.0.0"; by-version."fetch-bower"."2.0.0" = self.buildNodePackage { name = "fetch-bower-2.0.0"; + version = "2.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz"; @@ -10506,29 +13835,20 @@ "bower-1.3.12" = self.by-version."bower"."1.3.12"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "fetch-bower" = self.by-version."fetch-bower"."2.0.0"; by-spec."fetch-bower".">=2 <3" = self.by-version."fetch-bower"."2.0.0"; - by-spec."fibers"."1.0.5" = - self.by-version."fibers"."1.0.5"; - by-version."fibers"."1.0.5" = self.buildNodePackage { - name = "fibers-1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fibers/-/fibers-1.0.5.tgz"; - name = "fibers-1.0.5.tgz"; - sha1 = "3bea1f697d8540bb3904961ad50939bdee1df678"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."fields"."~0.1.11" = self.by-version."fields"."0.1.23"; by-version."fields"."0.1.23" = self.buildNodePackage { name = "fields-0.1.23"; + version = "0.1.23"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fields/-/fields-0.1.23.tgz"; @@ -10540,12 +13860,17 @@ "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fifo"."^0.1.4" = self.by-version."fifo"."0.1.4"; by-version."fifo"."0.1.4" = self.buildNodePackage { name = "fifo-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; @@ -10554,12 +13879,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."figures"."^1.0.1" = self.by-version."figures"."1.3.5"; by-version."figures"."1.3.5" = self.buildNodePackage { name = "figures-1.3.5"; + version = "1.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz"; @@ -10568,7 +13898,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."figures"."^1.3.2" = self.by-version."figures"."1.3.5"; @@ -10576,6 +13910,7 @@ self.by-version."file-uri-to-path"."0.0.2"; by-version."file-uri-to-path"."0.0.2" = self.buildNodePackage { name = "file-uri-to-path-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz"; @@ -10584,12 +13919,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = self.buildNodePackage { name = "fileset-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; @@ -10600,12 +13940,17 @@ "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finalhandler"."0.0.2" = self.by-version."finalhandler"."0.0.2"; by-version."finalhandler"."0.0.2" = self.buildNodePackage { name = "finalhandler-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.2.tgz"; @@ -10616,12 +13961,17 @@ "debug-1.0.2" = self.by-version."debug"."1.0.2"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finalhandler"."0.0.3" = self.by-version."finalhandler"."0.0.3"; by-version."finalhandler"."0.0.3" = self.buildNodePackage { name = "finalhandler-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.3.tgz"; @@ -10632,12 +13982,17 @@ "debug-1.0.3" = self.by-version."debug"."1.0.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finalhandler"."0.2.0" = self.by-version."finalhandler"."0.2.0"; by-version."finalhandler"."0.2.0" = self.buildNodePackage { name = "finalhandler-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; @@ -10648,12 +14003,17 @@ "debug-2.0.0" = self.by-version."debug"."2.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finalhandler"."0.3.2" = self.by-version."finalhandler"."0.3.2"; by-version."finalhandler"."0.3.2" = self.buildNodePackage { name = "finalhandler-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz"; @@ -10665,12 +14025,17 @@ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finalhandler"."0.3.3" = self.by-version."finalhandler"."0.3.3"; by-version."finalhandler"."0.3.3" = self.buildNodePackage { name = "finalhandler-0.3.3"; + version = "0.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; @@ -10682,12 +14047,17 @@ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."find-index"."^0.1.1" = self.by-version."find-index"."0.1.1"; by-version."find-index"."0.1.1" = self.buildNodePackage { name = "find-index-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; @@ -10696,12 +14066,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."findit".">=1.1.0 <2.0.0" = self.by-version."findit"."1.2.0"; by-version."findit"."1.2.0" = self.buildNodePackage { name = "findit-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; @@ -10710,12 +14085,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."findup-sync"."~0.1.0" = self.by-version."findup-sync"."0.1.3"; by-version."findup-sync"."0.1.3" = self.buildNodePackage { name = "findup-sync-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz"; @@ -10726,7 +14106,11 @@ "glob-3.2.11" = self.by-version."glob"."3.2.11"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.3"; @@ -10734,6 +14118,7 @@ self.by-version."findup-sync"."0.2.1"; by-version."findup-sync"."0.2.1" = self.buildNodePackage { name = "findup-sync-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz"; @@ -10743,12 +14128,17 @@ deps = { "glob-4.3.5" = self.by-version."glob"."4.3.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finished"."1.2.2" = self.by-version."finished"."1.2.2"; by-version."finished"."1.2.2" = self.buildNodePackage { name = "finished-1.2.2"; + version = "1.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz"; @@ -10758,7 +14148,11 @@ deps = { "ee-first-1.0.3" = self.by-version."ee-first"."1.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."finished"."~1.2.2" = self.by-version."finished"."1.2.2"; @@ -10766,6 +14160,7 @@ self.by-version."first-chunk-stream"."1.0.0"; by-version."first-chunk-stream"."1.0.0" = self.buildNodePackage { name = "first-chunk-stream-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; @@ -10774,12 +14169,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."flagged-respawn"."~0.3.0" = self.by-version."flagged-respawn"."0.3.1"; by-version."flagged-respawn"."0.3.1" = self.buildNodePackage { name = "flagged-respawn-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"; @@ -10788,12 +14188,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."flatiron"."*" = self.by-version."flatiron"."0.4.3"; by-version."flatiron"."0.4.3" = self.buildNodePackage { name = "flatiron-0.4.3"; + version = "0.4.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; @@ -10806,7 +14211,11 @@ "prompt-0.2.14" = self.by-version."prompt"."0.2.14"; "director-1.2.7" = self.by-version."director"."1.2.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "flatiron" = self.by-version."flatiron"."0.4.3"; by-spec."flatiron"."~0.4.2" = @@ -10815,6 +14224,7 @@ self.by-version."flickrapi"."0.3.28"; by-version."flickrapi"."0.3.28" = self.buildNodePackage { name = "flickrapi-0.3.28"; + version = "0.3.28"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/flickrapi/-/flickrapi-0.3.28.tgz"; @@ -10829,12 +14239,17 @@ "prompt-0.2.14" = self.by-version."prompt"."0.2.14"; "request-2.26.0" = self.by-version."request"."2.26.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fluent-ffmpeg"."^2.0.0-rc3" = self.by-version."fluent-ffmpeg"."2.0.0-rc3"; by-version."fluent-ffmpeg"."2.0.0-rc3" = self.buildNodePackage { name = "fluent-ffmpeg-2.0.0-rc3"; + version = "2.0.0-rc3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.0.0-rc3.tgz"; @@ -10844,12 +14259,17 @@ deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = self.buildNodePackage { name = "follow-redirects-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; @@ -10857,14 +14277,19 @@ sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; deps = { - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."foreachasync"."^3.0.0" = self.by-version."foreachasync"."3.0.0"; by-version."foreachasync"."3.0.0" = self.buildNodePackage { name = "foreachasync-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; @@ -10873,12 +14298,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."forever"."*" = self.by-version."forever"."0.14.1"; by-version."forever"."0.14.1" = self.buildNodePackage { name = "forever-0.14.1"; + version = "0.14.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/forever/-/forever-0.14.1.tgz"; @@ -10897,13 +14327,18 @@ "utile-0.2.1" = self.by-version."utile"."0.2.1"; "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "forever" = self.by-version."forever"."0.14.1"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = self.buildNodePackage { name = "forever-agent-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; @@ -10912,12 +14347,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; by-version."forever-agent"."0.5.2" = self.buildNodePackage { name = "forever-agent-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; @@ -10926,12 +14366,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."forever-monitor"."*" = self.by-version."forever-monitor"."1.5.2"; by-version."forever-monitor"."1.5.2" = self.buildNodePackage { name = "forever-monitor-1.5.2"; + version = "1.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.5.2.tgz"; @@ -10945,13 +14390,18 @@ "watch-0.13.0" = self.by-version."watch"."0.13.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "forever-monitor" = self.by-version."forever-monitor"."1.5.2"; by-spec."forever-monitor"."1.1.0" = self.by-version."forever-monitor"."1.1.0"; by-version."forever-monitor"."1.1.0" = self.buildNodePackage { name = "forever-monitor-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; @@ -10966,7 +14416,11 @@ "watch-0.5.1" = self.by-version."watch"."0.5.1"; "utile-0.1.7" = self.by-version."utile"."0.1.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."forever-monitor"."~1.5.1" = self.by-version."forever-monitor"."1.5.2"; @@ -10974,6 +14428,7 @@ self.by-version."form-data"."0.1.3"; by-version."form-data"."0.1.3" = self.buildNodePackage { name = "form-data-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; @@ -10985,12 +14440,17 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "async-0.9.0" = self.by-version."async"."0.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."form-data".">=0.1.2" = self.by-version."form-data"."0.2.0"; by-version."form-data"."0.2.0" = self.buildNodePackage { name = "form-data-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; @@ -11002,12 +14462,17 @@ "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."form-data"."^0.1.2" = self.by-version."form-data"."0.1.4"; by-version."form-data"."0.1.4" = self.buildNodePackage { name = "form-data-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; @@ -11019,12 +14484,17 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "async-0.9.0" = self.by-version."async"."0.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."form-data"."~0.0.3" = self.by-version."form-data"."0.0.10"; by-version."form-data"."0.0.10" = self.buildNodePackage { name = "form-data-0.0.10"; + version = "0.0.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; @@ -11036,7 +14506,11 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "async-0.2.10" = self.by-version."async"."0.2.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.4"; @@ -11046,6 +14520,7 @@ self.by-version."formatio"."1.1.1"; by-version."formatio"."1.1.1" = self.buildNodePackage { name = "formatio-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; @@ -11055,12 +14530,17 @@ deps = { "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."formidable"."1.0.11" = self.by-version."formidable"."1.0.11"; by-version."formidable"."1.0.11" = self.buildNodePackage { name = "formidable-1.0.11"; + version = "1.0.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; @@ -11069,12 +14549,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."formidable"."1.0.13" = self.by-version."formidable"."1.0.13"; by-version."formidable"."1.0.13" = self.buildNodePackage { name = "formidable-1.0.13"; + version = "1.0.13"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz"; @@ -11083,12 +14568,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."formidable"."1.0.14" = self.by-version."formidable"."1.0.14"; by-version."formidable"."1.0.14" = self.buildNodePackage { name = "formidable-1.0.14"; + version = "1.0.14"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; @@ -11097,12 +14587,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."formidable"."1.0.x" = self.by-version."formidable"."1.0.17"; by-version."formidable"."1.0.17" = self.buildNodePackage { name = "formidable-1.0.17"; + version = "1.0.17"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; @@ -11111,12 +14606,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."forwarded"."~0.1.0" = self.by-version."forwarded"."0.1.0"; by-version."forwarded"."0.1.0" = self.buildNodePackage { name = "forwarded-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; @@ -11125,12 +14625,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fresh"."0.1.0" = self.by-version."fresh"."0.1.0"; by-version."fresh"."0.1.0" = self.buildNodePackage { name = "fresh-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; @@ -11139,12 +14644,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fresh"."0.2.0" = self.by-version."fresh"."0.2.0"; by-version."fresh"."0.2.0" = self.buildNodePackage { name = "fresh-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; @@ -11153,12 +14663,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fresh"."0.2.2" = self.by-version."fresh"."0.2.2"; by-version."fresh"."0.2.2" = self.buildNodePackage { name = "fresh-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; @@ -11167,12 +14682,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = self.buildNodePackage { name = "fresh-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; @@ -11181,7 +14701,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fresh"."~0.2.1" = self.by-version."fresh"."0.2.4"; @@ -11189,6 +14713,7 @@ self.by-version."fs-extended"."0.2.0"; by-version."fs-extended"."0.2.0" = self.buildNodePackage { name = "fs-extended-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-extended/-/fs-extended-0.2.0.tgz"; @@ -11197,12 +14722,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."fs-extra"."^0.16.0" = + by-spec."fs-extra"."0.16.3" = self.by-version."fs-extra"."0.16.3"; by-version."fs-extra"."0.16.3" = self.buildNodePackage { name = "fs-extra-0.16.3"; + version = "0.16.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.3.tgz"; @@ -11214,14 +14744,21 @@ "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."fs-extra"."^0.16.0" = + self.by-version."fs-extra"."0.16.3"; by-spec."fs-extra"."~0.16.0" = self.by-version."fs-extra"."0.16.3"; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = self.buildNodePackage { name = "fs-extra-0.6.4"; + version = "0.6.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; @@ -11234,12 +14771,17 @@ "jsonfile-1.0.1" = self.by-version."jsonfile"."1.0.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fs-extra"."~0.7.0" = self.by-version."fs-extra"."0.7.1"; by-version."fs-extra"."0.7.1" = self.buildNodePackage { name = "fs-extra-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.7.1.tgz"; @@ -11252,12 +14794,17 @@ "jsonfile-1.1.1" = self.by-version."jsonfile"."1.1.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fs-vacuum"."~1.2.5" = self.by-version."fs-vacuum"."1.2.5"; by-version."fs-vacuum"."1.2.5" = self.buildNodePackage { name = "fs-vacuum-1.2.5"; + version = "1.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz"; @@ -11269,12 +14816,17 @@ "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fs-walk"."*" = self.by-version."fs-walk"."0.0.1"; by-version."fs-walk"."0.0.1" = self.buildNodePackage { name = "fs-walk-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz"; @@ -11284,13 +14836,18 @@ deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "fs-walk" = self.by-version."fs-walk"."0.0.1"; by-spec."fs-write-stream-atomic"."~1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; by-version."fs-write-stream-atomic"."1.0.2" = self.buildNodePackage { name = "fs-write-stream-atomic-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz"; @@ -11300,12 +14857,17 @@ deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fs.extra".">=1.2.0 <2.0.0" = self.by-version."fs.extra"."1.3.2"; by-version."fs.extra"."1.3.2" = self.buildNodePackage { name = "fs.extra-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; @@ -11317,14 +14879,40 @@ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "walk-2.3.9" = self.by-version."walk"."2.3.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fs.extra".">=1.2.1 <2" = self.by-version."fs.extra"."1.3.2"; + by-spec."fs.notify"."0.0.4" = + self.by-version."fs.notify"."0.0.4"; + by-version."fs.notify"."0.0.4" = self.buildNodePackage { + name = "fs.notify-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; + name = "fs.notify-0.0.4.tgz"; + sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; + }; + deps = { + "async-0.1.22" = self.by-version."async"."0.1.22"; + "retry-0.6.1" = self.by-version."retry"."0.6.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."fsevents"."^0.3.1" = self.by-version."fsevents"."0.3.5"; by-version."fsevents"."0.3.5" = self.buildNodePackage { name = "fsevents-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz"; @@ -11334,12 +14922,19 @@ deps = { "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ "darwin" ]; + cpu = [ ]; }; + by-spec."fsevents"."~0.3.1" = + self.by-version."fsevents"."0.3.5"; by-spec."fstream"."^1.0.0" = self.by-version."fstream"."1.0.4"; by-version."fstream"."1.0.4" = self.buildNodePackage { name = "fstream-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz"; @@ -11352,7 +14947,11 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fstream"."^1.0.2" = self.by-version."fstream"."1.0.4"; @@ -11360,6 +14959,7 @@ self.by-version."fstream"."0.1.31"; by-version."fstream"."0.1.31" = self.buildNodePackage { name = "fstream-0.1.31"; + version = "0.1.31"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; @@ -11372,7 +14972,11 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fstream"."~0.1.22" = self.by-version."fstream"."0.1.31"; @@ -11388,6 +14992,7 @@ self.by-version."fstream-ignore"."0.0.7"; by-version."fstream-ignore"."0.0.7" = self.buildNodePackage { name = "fstream-ignore-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; @@ -11399,12 +15004,17 @@ "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fstream-ignore"."^1.0.0" = self.by-version."fstream-ignore"."1.0.2"; by-version."fstream-ignore"."1.0.2" = self.buildNodePackage { name = "fstream-ignore-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"; @@ -11416,7 +15026,11 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fstream-ignore"."~1.0.1" = self.by-version."fstream-ignore"."1.0.2"; @@ -11424,6 +15038,7 @@ self.by-version."fstream-npm"."1.0.1"; by-version."fstream-npm"."1.0.1" = self.buildNodePackage { name = "fstream-npm-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz"; @@ -11434,7 +15049,11 @@ "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."fstream-npm"."~1.0.1" = self.by-version."fstream-npm"."1.0.1"; @@ -11442,6 +15061,7 @@ self.by-version."ftp"."0.3.8"; by-version."ftp"."0.3.8" = self.buildNodePackage { name = "ftp-0.3.8"; + version = "0.3.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ftp/-/ftp-0.3.8.tgz"; @@ -11452,12 +15072,17 @@ "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gapitoken"."~0.1.2" = self.by-version."gapitoken"."0.1.3"; by-version."gapitoken"."0.1.3" = self.buildNodePackage { name = "gapitoken-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.3.tgz"; @@ -11467,12 +15092,17 @@ deps = { "jws-0.0.2" = self.by-version."jws"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gauge"."~1.1.0" = self.by-version."gauge"."1.1.0"; by-version."gauge"."1.1.0" = self.buildNodePackage { name = "gauge-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gauge/-/gauge-1.1.0.tgz"; @@ -11486,12 +15116,17 @@ "lodash.padleft-3.0.0" = self.by-version."lodash.padleft"."3.0.0"; "lodash.padright-3.0.0" = self.by-version."lodash.padright"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gaze"."^0.5.1" = self.by-version."gaze"."0.5.1"; by-version."gaze"."0.5.1" = self.buildNodePackage { name = "gaze-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz"; @@ -11501,12 +15136,17 @@ deps = { "globule-0.1.0" = self.by-version."globule"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gelf-stream"."~0.2.4" = self.by-version."gelf-stream"."0.2.4"; by-version."gelf-stream"."0.2.4" = self.buildNodePackage { name = "gelf-stream-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; @@ -11516,12 +15156,17 @@ deps = { "gelfling-0.2.0" = self.by-version."gelfling"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gelfling"."~0.2.0" = self.by-version."gelfling"."0.2.0"; by-version."gelfling"."0.2.0" = self.buildNodePackage { name = "gelfling-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; @@ -11530,12 +15175,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."get-stdin"."*" = self.by-version."get-stdin"."4.0.1"; by-version."get-stdin"."4.0.1" = self.buildNodePackage { name = "get-stdin-4.0.1"; + version = "4.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; @@ -11544,7 +15194,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."get-stdin"."^4.0.1" = self.by-version."get-stdin"."4.0.1"; @@ -11552,6 +15206,7 @@ self.by-version."get-uri"."0.1.3"; by-version."get-uri"."0.1.3" = self.buildNodePackage { name = "get-uri-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/get-uri/-/get-uri-0.1.3.tgz"; @@ -11566,12 +15221,17 @@ "file-uri-to-path-0.0.2" = self.by-version."file-uri-to-path"."0.0.2"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."get-youtube-id"."^0.1.3" = self.by-version."get-youtube-id"."0.1.3"; by-version."get-youtube-id"."0.1.3" = self.buildNodePackage { name = "get-youtube-id-0.1.3"; + version = "0.1.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz"; @@ -11580,12 +15240,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = self.buildNodePackage { name = "getmac-1.0.6"; + version = "1.0.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz"; @@ -11595,12 +15260,17 @@ deps = { "extract-opts-2.2.0" = self.by-version."extract-opts"."2.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."getobject"."~0.1.0" = self.by-version."getobject"."0.1.0"; by-version."getobject"."0.1.0" = self.buildNodePackage { name = "getobject-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"; @@ -11609,12 +15279,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."git-run"."*" = self.by-version."git-run"."0.3.1"; by-version."git-run"."0.3.1" = self.buildNodePackage { name = "git-run-0.3.1"; + version = "0.3.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz"; @@ -11625,13 +15300,18 @@ "minilog-2.0.6" = self.by-version."minilog"."2.0.6"; "tabtab-0.0.2" = self.by-version."tabtab"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "git-run" = self.by-version."git-run"."0.3.1"; by-spec."github-url-from-git"."^1.3.0" = self.by-version."github-url-from-git"."1.4.0"; by-version."github-url-from-git"."1.4.0" = self.buildNodePackage { name = "github-url-from-git-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"; @@ -11640,7 +15320,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."github-url-from-git"."~1.4.0" = self.by-version."github-url-from-git"."1.4.0"; @@ -11648,6 +15332,7 @@ self.by-version."github-url-from-username-repo"."1.0.2"; by-version."github-url-from-username-repo"."1.0.2" = self.buildNodePackage { name = "github-url-from-username-repo-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz"; @@ -11656,7 +15341,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."github-url-from-username-repo"."~1.0.0" = self.by-version."github-url-from-username-repo"."1.0.2"; @@ -11666,6 +15355,7 @@ self.by-version."glob"."4.4.0"; by-version."glob"."4.4.0" = self.buildNodePackage { name = "glob-4.4.0"; + version = "4.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-4.4.0.tgz"; @@ -11678,12 +15368,17 @@ "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob"."3.2.3" = self.by-version."glob"."3.2.3"; by-version."glob"."3.2.3" = self.buildNodePackage { name = "glob-3.2.3"; + version = "3.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; @@ -11695,12 +15390,17 @@ "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob"."3.2.x" = self.by-version."glob"."3.2.11"; by-version."glob"."3.2.11" = self.buildNodePackage { name = "glob-3.2.11"; + version = "3.2.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; @@ -11711,7 +15411,11 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob"."3.x" = self.by-version."glob"."3.2.11"; @@ -11719,6 +15423,7 @@ self.by-version."glob"."4.0.6"; by-version."glob"."4.0.6" = self.buildNodePackage { name = "glob-4.0.6"; + version = "4.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; @@ -11731,26 +15436,31 @@ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob"."4.x" = self.by-version."glob"."4.4.0"; by-spec."glob".">=3.2.7 <4" = self.by-version."glob"."3.2.11"; - by-spec."glob"."^3.2.1" = - self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.2" = self.by-version."glob"."4.4.0"; by-spec."glob"."^4.0.5" = self.by-version."glob"."4.4.0"; by-spec."glob"."^4.3.1" = self.by-version."glob"."4.4.0"; + by-spec."glob"."^4.3.5" = + self.by-version."glob"."4.4.0"; by-spec."glob"."~ 3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = self.buildNodePackage { name = "glob-3.1.21"; + version = "3.1.21"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; @@ -11762,7 +15472,11 @@ "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; "inherits-1.0.0" = self.by-version."inherits"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob"."~3.2.6" = self.by-version."glob"."3.2.11"; @@ -11780,6 +15494,7 @@ self.by-version."glob"."4.2.2"; by-version."glob"."4.2.2" = self.buildNodePackage { name = "glob-4.2.2"; + version = "4.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz"; @@ -11792,12 +15507,17 @@ "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob"."~4.3.0" = self.by-version."glob"."4.3.5"; by-version."glob"."4.3.5" = self.buildNodePackage { name = "glob-4.3.5"; + version = "4.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob/-/glob-4.3.5.tgz"; @@ -11810,16 +15530,19 @@ "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."glob"."~4.3.1" = - self.by-version."glob"."4.3.5"; - by-spec."glob"."~4.3.5" = - self.by-version."glob"."4.3.5"; + by-spec."glob"."~4.4.0" = + self.by-version."glob"."4.4.0"; by-spec."glob-parent"."^1.0.0" = self.by-version."glob-parent"."1.0.0"; by-version."glob-parent"."1.0.0" = self.buildNodePackage { name = "glob-parent-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob-parent/-/glob-parent-1.0.0.tgz"; @@ -11829,12 +15552,17 @@ deps = { "is-glob-0.3.0" = self.by-version."is-glob"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob-stream"."^3.1.5" = self.by-version."glob-stream"."3.1.18"; by-version."glob-stream"."3.1.18" = self.buildNodePackage { name = "glob-stream-3.1.18"; + version = "3.1.18"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; @@ -11849,12 +15577,17 @@ "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob-watcher"."^0.0.6" = self.by-version."glob-watcher"."0.0.6"; by-version."glob-watcher"."0.0.6" = self.buildNodePackage { name = "glob-watcher-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; @@ -11864,12 +15597,17 @@ deps = { "gaze-0.5.1" = self.by-version."gaze"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."glob2base"."^0.0.12" = self.by-version."glob2base"."0.0.12"; by-version."glob2base"."0.0.12" = self.buildNodePackage { name = "glob2base-0.0.12"; + version = "0.0.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; @@ -11879,12 +15617,17 @@ deps = { "find-index-0.1.1" = self.by-version."find-index"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."global"."https://github.com/component/global/archive/v2.0.1.tar.gz" = self.by-version."global"."2.0.1"; by-version."global"."2.0.1" = self.buildNodePackage { name = "global-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "https://github.com/component/global/archive/v2.0.1.tar.gz"; @@ -11893,12 +15636,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."globule"."~0.1.0" = self.by-version."globule"."0.1.0"; by-version."globule"."0.1.0" = self.buildNodePackage { name = "globule-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; @@ -11910,12 +15658,17 @@ "glob-3.1.21" = self.by-version."glob"."3.1.21"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."googleapis"."0.8.0" = self.by-version."googleapis"."0.8.0"; by-version."googleapis"."0.8.0" = self.buildNodePackage { name = "googleapis-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/googleapis/-/googleapis-0.8.0.tgz"; @@ -11927,12 +15680,17 @@ "async-0.2.10" = self.by-version."async"."0.2.10"; "gapitoken-0.1.3" = self.by-version."gapitoken"."0.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."googleapis"."^1.0.20" = self.by-version."googleapis"."1.1.3"; by-version."googleapis"."1.1.3" = self.buildNodePackage { name = "googleapis-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.3.tgz"; @@ -11945,12 +15703,17 @@ "request-2.51.0" = self.by-version."request"."2.51.0"; "string-template-0.2.0" = self.by-version."string-template"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."got"."^0.3.0" = self.by-version."got"."0.3.0"; by-version."got"."0.3.0" = self.buildNodePackage { name = "got-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz"; @@ -11960,12 +15723,17 @@ deps = { "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."got"."^1.2.2" = self.by-version."got"."1.2.2"; by-version."got"."1.2.2" = self.buildNodePackage { name = "got-1.2.2"; + version = "1.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz"; @@ -11975,12 +15743,17 @@ deps = { "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."got"."^2.3.2" = + by-spec."got"."^2.4.0" = self.by-version."got"."2.4.0"; by-version."got"."2.4.0" = self.buildNodePackage { name = "got-2.4.0"; + version = "2.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/got/-/got-2.4.0.tgz"; @@ -11998,14 +15771,17 @@ "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."got"."^2.4.0" = - self.by-version."got"."2.4.0"; by-spec."graceful-fs"."1.2" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = self.buildNodePackage { name = "graceful-fs-1.2.3"; + version = "1.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; @@ -12014,12 +15790,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.3"; by-version."graceful-fs"."2.0.3" = self.buildNodePackage { name = "graceful-fs-2.0.3"; + version = "2.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; @@ -12028,12 +15809,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."graceful-fs"."2 || 3" = self.by-version."graceful-fs"."3.0.5"; by-version."graceful-fs"."3.0.5" = self.buildNodePackage { name = "graceful-fs-3.0.5"; + version = "3.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"; @@ -12042,7 +15828,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."graceful-fs"."3" = self.by-version."graceful-fs"."3.0.5"; @@ -12080,6 +15870,7 @@ self.by-version."gridfs-stream"."1.0.1"; by-version."gridfs-stream"."1.0.1" = self.buildNodePackage { name = "gridfs-stream-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.0.1.tgz"; @@ -12088,13 +15879,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "gridfs-stream" = self.by-version."gridfs-stream"."1.0.1"; by-spec."growl"."1.7.x" = self.by-version."growl"."1.7.0"; by-version."growl"."1.7.0" = self.buildNodePackage { name = "growl-1.7.0"; + version = "1.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz"; @@ -12103,12 +15899,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."growl"."1.8.1" = self.by-version."growl"."1.8.1"; by-version."growl"."1.8.1" = self.buildNodePackage { name = "growl-1.8.1"; + version = "1.8.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz"; @@ -12117,12 +15918,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."grunt"."0.4.x" = self.by-version."grunt"."0.4.5"; by-version."grunt"."0.4.5" = self.buildNodePackage { name = "grunt-0.4.5"; + version = "0.4.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz"; @@ -12151,7 +15957,11 @@ "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0"; "grunt-legacy-log-0.1.1" = self.by-version."grunt-legacy-log"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."grunt".">=0.4.0" = self.by-version."grunt"."0.4.5"; @@ -12165,6 +15975,7 @@ self.by-version."grunt-cli"."0.1.13"; by-version."grunt-cli"."0.1.13" = self.buildNodePackage { name = "grunt-cli-0.1.13"; + version = "0.1.13"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz"; @@ -12176,32 +15987,42 @@ "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; "resolve-0.3.1" = self.by-version."resolve"."0.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "grunt-cli" = self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-contrib-cssmin"."*" = - self.by-version."grunt-contrib-cssmin"."0.12.1"; - by-version."grunt-contrib-cssmin"."0.12.1" = self.buildNodePackage { - name = "grunt-contrib-cssmin-0.12.1"; + self.by-version."grunt-contrib-cssmin"."0.12.2"; + by-version."grunt-contrib-cssmin"."0.12.2" = self.buildNodePackage { + name = "grunt-contrib-cssmin-0.12.2"; + version = "0.12.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.12.1.tgz"; - name = "grunt-contrib-cssmin-0.12.1.tgz"; - sha1 = "8a14644bdd60ee2d66a5a7b941a37de7c8fe532a"; + url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.12.2.tgz"; + name = "grunt-contrib-cssmin-0.12.2.tgz"; + sha1 = "254957427abdf63cd18f0690d34c0083fb544cff"; }; deps = { "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "clean-css-3.0.10" = self.by-version."clean-css"."3.0.10"; "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; }; - "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.1"; + "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.2"; by-spec."grunt-contrib-jshint"."*" = self.by-version."grunt-contrib-jshint"."0.11.0"; by-version."grunt-contrib-jshint"."0.11.0" = self.buildNodePackage { name = "grunt-contrib-jshint-0.11.0"; + version = "0.11.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.0.tgz"; @@ -12212,14 +16033,19 @@ "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; "jshint-2.6.0" = self.by-version."jshint"."2.6.0"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.11.0"; by-spec."grunt-contrib-less"."*" = self.by-version."grunt-contrib-less"."1.0.0"; by-version."grunt-contrib-less"."1.0.0" = self.buildNodePackage { name = "grunt-contrib-less-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz"; @@ -12232,14 +16058,19 @@ "less-2.4.0" = self.by-version."less"."2.4.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; }; "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.0.0"; by-spec."grunt-contrib-requirejs"."*" = self.by-version."grunt-contrib-requirejs"."0.4.4"; by-version."grunt-contrib-requirejs"."0.4.4" = self.buildNodePackage { name = "grunt-contrib-requirejs-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz"; @@ -12249,35 +16080,45 @@ deps = { "requirejs-2.1.16" = self.by-version."requirejs"."2.1.16"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; }; "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4"; by-spec."grunt-contrib-uglify"."*" = - self.by-version."grunt-contrib-uglify"."0.7.0"; - by-version."grunt-contrib-uglify"."0.7.0" = self.buildNodePackage { - name = "grunt-contrib-uglify-0.7.0"; + self.by-version."grunt-contrib-uglify"."0.8.0"; + by-version."grunt-contrib-uglify"."0.8.0" = self.buildNodePackage { + name = "grunt-contrib-uglify-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.7.0.tgz"; - name = "grunt-contrib-uglify-0.7.0.tgz"; - sha1 = "79dde81a62cec6ffa35b47a32833706744f8e787"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.8.0.tgz"; + name = "grunt-contrib-uglify-0.8.0.tgz"; + sha1 = "6897a450fab8563c9885e388bd705a5ff2c3937e"; }; deps = { "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "lodash-3.3.0" = self.by-version."lodash"."3.3.0"; "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0"; "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; }; - "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.7.0"; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.8.0"; by-spec."grunt-karma"."*" = self.by-version."grunt-karma"."0.10.1"; by-version."grunt-karma"."0.10.1" = self.buildNodePackage { name = "grunt-karma-0.10.1"; + version = "0.10.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.10.1.tgz"; @@ -12287,15 +16128,20 @@ deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5" self.by-version."karma"."0.12.31"]; + os = [ ]; + cpu = [ ]; }; "grunt-karma" = self.by-version."grunt-karma"."0.10.1"; by-spec."grunt-legacy-log"."~0.1.0" = self.by-version."grunt-legacy-log"."0.1.1"; by-version."grunt-legacy-log"."0.1.1" = self.buildNodePackage { name = "grunt-legacy-log-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz"; @@ -12308,12 +16154,17 @@ "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; "colors-0.6.2" = self.by-version."colors"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."grunt-legacy-util"."~0.2.0" = self.by-version."grunt-legacy-util"."0.2.0"; by-version."grunt-legacy-util"."0.2.0" = self.buildNodePackage { name = "grunt-legacy-util-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"; @@ -12329,12 +16180,17 @@ "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."grunt-sed"."*" = self.by-version."grunt-sed"."0.1.1"; by-version."grunt-sed"."0.1.1" = self.buildNodePackage { name = "grunt-sed-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz"; @@ -12344,14 +16200,19 @@ deps = { "replace-0.2.10" = self.by-version."replace"."0.2.10"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; + os = [ ]; + cpu = [ ]; }; "grunt-sed" = self.by-version."grunt-sed"."0.1.1"; by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = self.by-version."guifi-earth"."0.2.1"; by-version."guifi-earth"."0.2.1" = self.buildNodePackage { name = "guifi-earth-0.2.1"; + version = "0.2.1"; bin = true; src = fetchurl { url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854"; @@ -12359,19 +16220,24 @@ sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; deps = { - "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0"; + "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1"; "jade-1.9.2" = self.by-version."jade"."1.9.2"; "q-2.0.3" = self.by-version."q"."2.0.3"; "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; "msgpack-0.2.6" = self.by-version."msgpack"."0.2.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; by-spec."gulp"."*" = self.by-version."gulp"."3.8.11"; by-version."gulp"."3.8.11" = self.buildNodePackage { name = "gulp-3.8.11"; + version = "3.8.11"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz"; @@ -12393,13 +16259,18 @@ "v8flags-2.0.2" = self.by-version."v8flags"."2.0.2"; "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "gulp" = self.by-version."gulp"."3.8.11"; by-spec."gulp-util"."^3.0.0" = self.by-version."gulp-util"."3.0.3"; by-version."gulp-util"."3.0.3" = self.buildNodePackage { name = "gulp-util-3.0.3"; + version = "3.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz"; @@ -12415,7 +16286,7 @@ "lodash.reescape-3.0.1" = self.by-version."lodash.reescape"."3.0.1"; "lodash.reevaluate-3.0.1" = self.by-version."lodash.reevaluate"."3.0.1"; "lodash.reinterpolate-3.0.1" = self.by-version."lodash.reinterpolate"."3.0.1"; - "lodash.template-3.2.0" = self.by-version."lodash.template"."3.2.0"; + "lodash.template-3.3.0" = self.by-version."lodash.template"."3.3.0"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2"; "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; @@ -12423,12 +16294,17 @@ "through2-0.6.3" = self.by-version."through2"."0.6.3"; "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gzip-size"."^1.0.0" = self.by-version."gzip-size"."1.0.0"; by-version."gzip-size"."1.0.0" = self.buildNodePackage { name = "gzip-size-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz"; @@ -12439,12 +16315,17 @@ "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."gzippo"."*" = self.by-version."gzippo"."0.2.0"; by-version."gzippo"."0.2.0" = self.buildNodePackage { name = "gzippo-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz"; @@ -12454,13 +16335,18 @@ deps = { "send-0.12.1" = self.by-version."send"."0.12.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "gzippo" = self.by-version."gzippo"."0.2.0"; by-spec."handlebars"."1.3.x" = self.by-version."handlebars"."1.3.0"; by-version."handlebars"."1.3.0" = self.buildNodePackage { name = "handlebars-1.3.0"; + version = "1.3.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz"; @@ -12469,9 +16355,13 @@ }; deps = { "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."handlebars"."~1.3.0" = self.by-version."handlebars"."1.3.0"; @@ -12479,6 +16369,7 @@ self.by-version."handlebars"."2.0.0"; by-version."handlebars"."2.0.0" = self.buildNodePackage { name = "handlebars-2.0.0"; + version = "2.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; @@ -12487,14 +16378,38 @@ }; deps = { "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has"."^1.0.0" = + self.by-version."has"."1.0.0"; + by-version."has"."1.0.0" = self.buildNodePackage { + name = "has-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/has/-/has-1.0.0.tgz"; + name = "has-1.0.0.tgz"; + sha1 = "56c6582d23b40f3a5458f68ba79bc6c4bef203b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."has-ansi"."^0.1.0" = self.by-version."has-ansi"."0.1.0"; by-version."has-ansi"."0.1.0" = self.buildNodePackage { name = "has-ansi-0.1.0"; + version = "0.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; @@ -12504,12 +16419,17 @@ deps = { "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."has-binary-data"."0.1.1" = self.by-version."has-binary-data"."0.1.1"; by-version."has-binary-data"."0.1.1" = self.buildNodePackage { name = "has-binary-data-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz"; @@ -12519,12 +16439,17 @@ deps = { "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."has-cors"."1.0.3" = self.by-version."has-cors"."1.0.3"; by-version."has-cors"."1.0.3" = self.buildNodePackage { name = "has-cors-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; @@ -12534,12 +16459,17 @@ deps = { "global-2.0.1" = self.by-version."global"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."has-unicode"."^1.0.0" = self.by-version."has-unicode"."1.0.0"; by-version."has-unicode"."1.0.0" = self.buildNodePackage { name = "has-unicode-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"; @@ -12548,12 +16478,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hash.js"."^1.0.0" = self.by-version."hash.js"."1.0.2"; by-version."hash.js"."1.0.2" = self.buildNodePackage { name = "hash.js-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"; @@ -12563,12 +16498,17 @@ deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hasher"."~1.2.0" = self.by-version."hasher"."1.2.0"; by-version."hasher"."1.2.0" = self.buildNodePackage { name = "hasher-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; @@ -12578,12 +16518,17 @@ deps = { "signals-1.0.0" = self.by-version."signals"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hashish"."*" = self.by-version."hashish"."0.0.4"; by-version."hashish"."0.0.4" = self.buildNodePackage { name = "hashish-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz"; @@ -12593,14 +16538,21 @@ deps = { "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hashish"."0.0.4" = self.by-version."hashish"."0.0.4"; + by-spec."hashish"."0.0.x" = + self.by-version."hashish"."0.0.4"; by-spec."hashring"."1.0.1" = self.by-version."hashring"."1.0.1"; by-version."hashring"."1.0.1" = self.buildNodePackage { name = "hashring-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; @@ -12611,12 +16563,17 @@ "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7"; "simple-lru-cache-0.0.1" = self.by-version."simple-lru-cache"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hat"."*" = self.by-version."hat"."0.0.3"; by-version."hat"."0.0.3" = self.buildNodePackage { name = "hat-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; @@ -12625,7 +16582,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hat"."0.0.3" = self.by-version."hat"."0.0.3"; @@ -12637,6 +16598,7 @@ self.by-version."hawk"."1.1.1"; by-version."hawk"."1.1.1" = self.buildNodePackage { name = "hawk-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; @@ -12649,12 +16611,17 @@ "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hawk"."~0.10.2" = self.by-version."hawk"."0.10.2"; by-version."hawk"."0.10.2" = self.buildNodePackage { name = "hawk-0.10.2"; + version = "0.10.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; @@ -12667,12 +16634,17 @@ "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3"; "sntp-0.1.4" = self.by-version."sntp"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; by-version."hawk"."1.0.0" = self.buildNodePackage { name = "hawk-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; @@ -12685,12 +16657,17 @@ "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hawk"."~2.3.0" = self.by-version."hawk"."2.3.1"; by-version."hawk"."2.3.1" = self.buildNodePackage { name = "hawk-2.3.1"; + version = "2.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; @@ -12703,12 +16680,17 @@ "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hbo-dnsd"."0.9.8" = self.by-version."hbo-dnsd"."0.9.8"; by-version."hbo-dnsd"."0.9.8" = self.buildNodePackage { name = "hbo-dnsd-0.9.8"; + version = "0.9.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hbo-dnsd/-/hbo-dnsd-0.9.8.tgz"; @@ -12719,12 +16701,17 @@ "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; "defaultable-0.7.2" = self.by-version."defaultable"."0.7.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."he"."~0.3.6" = self.by-version."he"."0.3.6"; by-version."he"."0.3.6" = self.buildNodePackage { name = "he-0.3.6"; + version = "0.3.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz"; @@ -12733,12 +16720,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."headless"."^0.1.7" = + self.by-version."headless"."0.1.7"; + by-version."headless"."0.1.7" = self.buildNodePackage { + name = "headless-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; + name = "headless-0.1.7.tgz"; + sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."heapdump"."^0.2.9" = self.by-version."heapdump"."0.2.10"; by-version."heapdump"."0.2.10" = self.buildNodePackage { name = "heapdump-0.2.10"; + version = "0.2.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/heapdump/-/heapdump-0.2.10.tgz"; @@ -12747,12 +16758,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hipache"."*" = self.by-version."hipache"."0.3.1"; by-version."hipache"."0.3.1" = self.buildNodePackage { name = "hipache-0.3.1"; + version = "0.3.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz"; @@ -12765,13 +16781,18 @@ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "hipache" = self.by-version."hipache"."0.3.1"; by-spec."hiredis"."*" = self.by-version."hiredis"."0.2.0"; by-version."hiredis"."0.2.0" = self.buildNodePackage { name = "hiredis-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hiredis/-/hiredis-0.2.0.tgz"; @@ -12782,12 +16803,17 @@ "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hoek"."0.7.x" = self.by-version."hoek"."0.7.6"; by-version."hoek"."0.7.6" = self.buildNodePackage { name = "hoek-0.7.6"; + version = "0.7.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; @@ -12796,12 +16822,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; by-version."hoek"."0.9.1" = self.buildNodePackage { name = "hoek-0.9.1"; + version = "0.9.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; @@ -12810,12 +16841,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hoek"."2.x.x" = self.by-version."hoek"."2.11.0"; by-version."hoek"."2.11.0" = self.buildNodePackage { name = "hoek-2.11.0"; + version = "2.11.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz"; @@ -12824,12 +16860,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hooker"."~0.2.3" = self.by-version."hooker"."0.2.3"; by-version."hooker"."0.2.3" = self.buildNodePackage { name = "hooker-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"; @@ -12838,12 +16879,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hooks"."0.2.1" = self.by-version."hooks"."0.2.1"; by-version."hooks"."0.2.1" = self.buildNodePackage { name = "hooks-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; @@ -12852,12 +16898,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hooks"."0.3.2" = self.by-version."hooks"."0.3.2"; by-version."hooks"."0.3.2" = self.buildNodePackage { name = "hooks-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz"; @@ -12866,12 +16917,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."hosted-git-info"."^1.5.3" = self.by-version."hosted-git-info"."1.5.3"; by-version."hosted-git-info"."1.5.3" = self.buildNodePackage { name = "hosted-git-info-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-1.5.3.tgz"; @@ -12880,12 +16936,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."html-md"."^3.0.2" = self.by-version."html-md"."3.0.2"; by-version."html-md"."3.0.2" = self.buildNodePackage { name = "html-md-3.0.2"; + version = "3.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/html-md/-/html-md-3.0.2.tgz"; @@ -12897,12 +16958,17 @@ "fs-extra-0.7.1" = self.by-version."fs-extra"."0.7.1"; "jsdom-0.8.11" = self.by-version."jsdom"."0.8.11"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."html5"."~1.0.5" = self.by-version."html5"."1.0.5"; by-version."html5"."1.0.5" = self.buildNodePackage { name = "html5-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/html5/-/html5-1.0.5.tgz"; @@ -12912,14 +16978,19 @@ deps = { "opts-1.2.2" = self.by-version."opts"."1.2.2"; "html5-entities-1.0.0" = self.by-version."html5-entities"."1.0.0"; + }; + optionalDependencies = { "jsdom-0.11.1" = self.by-version."jsdom"."0.11.1"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."html5-entities"."^1.0.0" = self.by-version."html5-entities"."1.0.0"; by-version."html5-entities"."1.0.0" = self.buildNodePackage { name = "html5-entities-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz"; @@ -12928,7 +16999,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."html5-entities"."~1.0.0" = self.by-version."html5-entities"."1.0.0"; @@ -12936,6 +17011,7 @@ self.by-version."htmlparser2"."3.8.2"; by-version."htmlparser2"."3.8.2" = self.buildNodePackage { name = "htmlparser2-3.8.2"; + version = "3.8.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz"; @@ -12949,7 +17025,11 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "entities-1.0.0" = self.by-version."entities"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."htmlparser2".">= 3.1.5 <4" = self.by-version."htmlparser2"."3.8.2"; @@ -12961,6 +17041,7 @@ self.by-version."htmlparser2"."3.7.3"; by-version."htmlparser2"."3.7.3" = self.buildNodePackage { name = "htmlparser2-3.7.3"; + version = "3.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; @@ -12974,12 +17055,19 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "entities-1.0.0" = self.by-version."entities"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."htmlparser2"."~3.8.1" = + self.by-version."htmlparser2"."3.8.2"; by-spec."http-auth"."2.0.7" = self.by-version."http-auth"."2.0.7"; by-version."http-auth"."2.0.7" = self.buildNodePackage { name = "http-auth-2.0.7"; + version = "2.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; @@ -12990,12 +17078,17 @@ "coffee-script-1.6.3" = self.by-version."coffee-script"."1.6.3"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."http-browserify"."^1.4.0" = + by-spec."http-browserify"."^1.3.2" = self.by-version."http-browserify"."1.7.0"; by-version."http-browserify"."1.7.0" = self.buildNodePackage { name = "http-browserify-1.7.0"; + version = "1.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz"; @@ -13006,12 +17099,19 @@ "Base64-0.2.1" = self.by-version."Base64"."0.2.1"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."http-browserify"."^1.4.0" = + self.by-version."http-browserify"."1.7.0"; by-spec."http-browserify"."~1.1.0" = self.by-version."http-browserify"."1.1.0"; by-version."http-browserify"."1.1.0" = self.buildNodePackage { name = "http-browserify-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.1.0.tgz"; @@ -13022,12 +17122,17 @@ "Base64-0.2.1" = self.by-version."Base64"."0.2.1"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-errors"."~1.2.8" = self.by-version."http-errors"."1.2.8"; by-version."http-errors"."1.2.8" = self.buildNodePackage { name = "http-errors-1.2.8"; + version = "1.2.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz"; @@ -13038,12 +17143,17 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-errors"."~1.3.1" = self.by-version."http-errors"."1.3.1"; by-version."http-errors"."1.3.1" = self.buildNodePackage { name = "http-errors-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; @@ -13054,12 +17164,17 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-proxy"."1.0.2" = self.by-version."http-proxy"."1.0.2"; by-version."http-proxy"."1.0.2" = self.buildNodePackage { name = "http-proxy-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; @@ -13069,12 +17184,17 @@ deps = { "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-proxy"."~0.10" = self.by-version."http-proxy"."0.10.4"; by-version."http-proxy"."0.10.4" = self.buildNodePackage { name = "http-proxy-0.10.4"; + version = "0.10.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz"; @@ -13087,12 +17207,17 @@ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-proxy-agent"."0" = self.by-version."http-proxy-agent"."0.2.6"; by-version."http-proxy-agent"."0.2.6" = self.buildNodePackage { name = "http-proxy-agent-0.2.6"; + version = "0.2.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.6.tgz"; @@ -13104,12 +17229,17 @@ "extend-1.2.1" = self.by-version."extend"."1.2.1"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-signature"."0.9.11" = self.by-version."http-signature"."0.9.11"; by-version."http-signature"."0.9.11" = self.buildNodePackage { name = "http-signature-0.9.11"; + version = "0.9.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; @@ -13121,12 +17251,17 @@ "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; "ctype-0.5.2" = self.by-version."ctype"."0.5.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."http-signature"."~0.10.0" = self.by-version."http-signature"."0.10.1"; by-version."http-signature"."0.10.1" = self.buildNodePackage { name = "http-signature-0.10.1"; + version = "0.10.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; @@ -13138,12 +17273,17 @@ "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."https-browserify"."~0.0.0" = + by-spec."https-browserify"."0.0.0" = self.by-version."https-browserify"."0.0.0"; by-version."https-browserify"."0.0.0" = self.buildNodePackage { name = "https-browserify-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; @@ -13152,12 +17292,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."https-browserify"."~0.0.0" = + self.by-version."https-browserify"."0.0.0"; by-spec."https-proxy-agent"."0" = self.by-version."https-proxy-agent"."0.3.5"; by-version."https-proxy-agent"."0.3.5" = self.buildNodePackage { name = "https-proxy-agent-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.5.tgz"; @@ -13169,12 +17316,17 @@ "debug-1.0.4" = self.by-version."debug"."1.0.4"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."humanize"."~0.0.9" = self.by-version."humanize"."0.0.9"; by-version."humanize"."0.0.9" = self.buildNodePackage { name = "humanize-0.0.9"; + version = "0.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; @@ -13183,12 +17335,38 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hyperquest"."^0.3.0" = + self.by-version."hyperquest"."0.3.0"; + by-version."hyperquest"."0.3.0" = self.buildNodePackage { + name = "hyperquest-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hyperquest/-/hyperquest-0.3.0.tgz"; + name = "hyperquest-0.3.0.tgz"; + sha1 = "4c3c06c074755e921f09a2db51aea5e6e7ee155f"; + }; + deps = { + "through-2.2.7" = self.by-version."through"."2.2.7"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."i"."0.3.x" = self.by-version."i"."0.3.2"; by-version."i"."0.3.2" = self.buildNodePackage { name = "i-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz"; @@ -13197,12 +17375,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."i18next"."*" = self.by-version."i18next"."1.7.10"; by-version."i18next"."1.7.10" = self.buildNodePackage { name = "i18next-1.7.10"; + version = "1.7.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/i18next/-/i18next-1.7.10.tgz"; @@ -13213,13 +17396,18 @@ "cookies-0.5.0" = self.by-version."cookies"."0.5.0"; "json5-0.2.0" = self.by-version."json5"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "i18next" = self.by-version."i18next"."1.7.10"; by-spec."ibrik"."~2.0.0" = self.by-version."ibrik"."2.0.0"; by-version."ibrik"."2.0.0" = self.buildNodePackage { name = "ibrik-2.0.0"; + version = "2.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ibrik/-/ibrik-2.0.0.tgz"; @@ -13229,7 +17417,7 @@ deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; + "istanbul-0.3.6" = self.by-version."istanbul"."0.3.6"; "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; "which-1.0.8" = self.by-version."which"."1.0.8"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; @@ -13237,12 +17425,17 @@ "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."iconv"."~2.1.5" = + by-spec."iconv"."~2.1.4" = self.by-version."iconv"."2.1.6"; by-version."iconv"."2.1.6" = self.buildNodePackage { name = "iconv-2.1.6"; + version = "2.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/iconv/-/iconv-2.1.6.tgz"; @@ -13252,12 +17445,19 @@ deps = { "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."iconv"."~2.1.5" = + self.by-version."iconv"."2.1.6"; by-spec."iconv-lite"."0.4.4" = self.by-version."iconv-lite"."0.4.4"; by-version."iconv-lite"."0.4.4" = self.buildNodePackage { name = "iconv-lite-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; @@ -13266,12 +17466,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."iconv-lite"."0.4.5" = self.by-version."iconv-lite"."0.4.5"; by-version."iconv-lite"."0.4.5" = self.buildNodePackage { name = "iconv-lite-0.4.5"; + version = "0.4.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz"; @@ -13280,12 +17485,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."iconv-lite"."0.4.6" = self.by-version."iconv-lite"."0.4.6"; by-version."iconv-lite"."0.4.6" = self.buildNodePackage { name = "iconv-lite-0.4.6"; + version = "0.4.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.6.tgz"; @@ -13294,12 +17504,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."iconv-lite"."0.4.7" = self.by-version."iconv-lite"."0.4.7"; by-version."iconv-lite"."0.4.7" = self.buildNodePackage { name = "iconv-lite-0.4.7"; + version = "0.4.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"; @@ -13308,12 +17523,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."iconv-lite"."^0.4.4" = + self.by-version."iconv-lite"."0.4.7"; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; by-version."iconv-lite"."0.2.11" = self.buildNodePackage { name = "iconv-lite-0.2.11"; + version = "0.2.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; @@ -13322,7 +17544,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."iconv-lite"."~0.4.4" = self.by-version."iconv-lite"."0.4.7"; @@ -13332,6 +17558,7 @@ self.by-version."ieee754"."1.1.4"; by-version."ieee754"."1.1.4" = self.buildNodePackage { name = "ieee754-1.1.4"; + version = "1.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz"; @@ -13340,7 +17567,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ieee754"."~1.1.1" = self.by-version."ieee754"."1.1.4"; @@ -13348,6 +17579,7 @@ self.by-version."image-size"."0.3.5"; by-version."image-size"."0.3.5" = self.buildNodePackage { name = "image-size-0.3.5"; + version = "0.3.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz"; @@ -13356,12 +17588,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."imagemagick".">=0.1.3" = self.by-version."imagemagick"."0.1.3"; by-version."imagemagick"."0.1.3" = self.buildNodePackage { name = "imagemagick-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/imagemagick/-/imagemagick-0.1.3.tgz"; @@ -13370,12 +17607,38 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."imap"."0.8.14" = + self.by-version."imap"."0.8.14"; + by-version."imap"."0.8.14" = self.buildNodePackage { + name = "imap-0.8.14"; + version = "0.8.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/imap/-/imap-0.8.14.tgz"; + name = "imap-0.8.14.tgz"; + sha1 = "d4e6b333163ba0bb5be33cab98e5b19db3e9aa54"; + }; + deps = { + "utf7-1.0.0" = self.by-version."utf7"."1.0.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."indent-string"."^1.1.0" = self.by-version."indent-string"."1.2.1"; by-version."indent-string"."1.2.1" = self.buildNodePackage { name = "indent-string-1.2.1"; + version = "1.2.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz"; @@ -13387,12 +17650,17 @@ "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "repeating-1.1.2" = self.by-version."repeating"."1.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."indexof"."0.0.1" = self.by-version."indexof"."0.0.1"; by-version."indexof"."0.0.1" = self.buildNodePackage { name = "indexof-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; @@ -13401,12 +17669,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."infinity-agent"."^1.0.0" = self.by-version."infinity-agent"."1.0.2"; by-version."infinity-agent"."1.0.2" = self.buildNodePackage { name = "infinity-agent-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/infinity-agent/-/infinity-agent-1.0.2.tgz"; @@ -13415,12 +17688,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inflection"."~1.3.0" = self.by-version."inflection"."1.3.8"; by-version."inflection"."1.3.8" = self.buildNodePackage { name = "inflection-1.3.8"; + version = "1.3.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz"; @@ -13429,12 +17707,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inflection"."~1.5.3" = self.by-version."inflection"."1.5.3"; by-version."inflection"."1.5.3" = self.buildNodePackage { name = "inflection-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inflection/-/inflection-1.5.3.tgz"; @@ -13443,12 +17726,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inflight"."^1.0.4" = self.by-version."inflight"."1.0.4"; by-version."inflight"."1.0.4" = self.buildNodePackage { name = "inflight-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; @@ -13459,7 +17747,11 @@ "once-1.3.1" = self.by-version."once"."1.3.1"; "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inflight"."~1.0.1" = self.by-version."inflight"."1.0.4"; @@ -13469,6 +17761,7 @@ self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = self.buildNodePackage { name = "inherits-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; @@ -13477,12 +17770,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = self.buildNodePackage { name = "inherits-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; @@ -13491,7 +17789,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inherits"."1.x" = self.by-version."inherits"."1.0.0"; @@ -13511,6 +17813,7 @@ self.by-version."ini"."1.3.3"; by-version."ini"."1.3.3" = self.buildNodePackage { name = "ini-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz"; @@ -13519,7 +17822,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ini"."1.x.x" = self.by-version."ini"."1.3.3"; @@ -13529,6 +17836,7 @@ self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = self.buildNodePackage { name = "ini-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; @@ -13537,12 +17845,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ini"."~1.2.0" = self.by-version."ini"."1.2.1"; by-version."ini"."1.2.1" = self.buildNodePackage { name = "ini-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz"; @@ -13551,7 +17864,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ini"."~1.3.0" = self.by-version."ini"."1.3.3"; @@ -13561,6 +17878,7 @@ self.by-version."init-package-json"."1.0.1"; by-version."init-package-json"."1.0.1" = self.buildNodePackage { name = "init-package-json-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.0.1.tgz"; @@ -13574,12 +17892,17 @@ "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."init-package-json"."~1.2.0" = self.by-version."init-package-json"."1.2.0"; by-version."init-package-json"."1.2.0" = self.buildNodePackage { name = "init-package-json-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.2.0.tgz"; @@ -13593,27 +17916,37 @@ "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inline-source-map"."~0.3.0" = - self.by-version."inline-source-map"."0.3.0"; - by-version."inline-source-map"."0.3.0" = self.buildNodePackage { - name = "inline-source-map-0.3.0"; + self.by-version."inline-source-map"."0.3.1"; + by-version."inline-source-map"."0.3.1" = self.buildNodePackage { + name = "inline-source-map-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz"; - name = "inline-source-map-0.3.0.tgz"; - sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a"; + url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz"; + name = "inline-source-map-0.3.1.tgz"; + sha1 = "a528b514e689fce90db3089e870d92f527acb5eb"; }; deps = { - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + "source-map-0.3.0" = self.by-version."source-map"."0.3.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inquirer"."0.7.1" = self.by-version."inquirer"."0.7.1"; by-version."inquirer"."0.7.1" = self.buildNodePackage { name = "inquirer-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz"; @@ -13627,15 +17960,20 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.1" = self.by-version."readline2"."0.1.1"; - "rx-2.3.25" = self.by-version."rx"."2.3.25"; + "rx-2.4.0" = self.by-version."rx"."2.4.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inquirer".">=0.2.4" = self.by-version."inquirer"."0.8.0"; by-version."inquirer"."0.8.0" = self.buildNodePackage { name = "inquirer-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.0.tgz"; @@ -13643,22 +17981,27 @@ sha1 = "525d4dd827d4f3d506b453726068f90deb99b443"; }; deps = { - "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0"; + "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2"; "figures-1.3.5" = self.by-version."figures"."1.3.5"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.1" = self.by-version."readline2"."0.1.1"; - "rx-2.3.25" = self.by-version."rx"."2.3.25"; + "rx-2.4.0" = self.by-version."rx"."2.4.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."inquirer"."^0.6.0" = self.by-version."inquirer"."0.6.0"; by-version."inquirer"."0.6.0" = self.buildNodePackage { name = "inquirer-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz"; @@ -13671,15 +18014,20 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.1" = self.by-version."readline2"."0.1.1"; - "rx-2.3.25" = self.by-version."rx"."2.3.25"; + "rx-2.4.0" = self.by-version."rx"."2.4.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."insert-module-globals"."^6.1.0" = self.by-version."insert-module-globals"."6.2.0"; by-version."insert-module-globals"."6.2.0" = self.buildNodePackage { name = "insert-module-globals-6.2.0"; + version = "6.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.0.tgz"; @@ -13695,7 +18043,11 @@ "through-2.3.6" = self.by-version."through"."2.3.6"; "xtend-3.0.0" = self.by-version."xtend"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."insert-module-globals"."^6.2.0" = self.by-version."insert-module-globals"."6.2.0"; @@ -13703,6 +18055,7 @@ self.by-version."insert-module-globals"."2.3.4"; by-version."insert-module-globals"."2.3.4" = self.buildNodePackage { name = "insert-module-globals-2.3.4"; + version = "2.3.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-2.3.4.tgz"; @@ -13720,12 +18073,17 @@ "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17"; "browserify-3.24.13" = self.by-version."browserify"."3.24.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."insert-module-globals"."~3.1.2" = self.by-version."insert-module-globals"."3.1.3"; by-version."insert-module-globals"."3.1.3" = self.buildNodePackage { name = "insert-module-globals-3.1.3"; + version = "3.1.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.1.3.tgz"; @@ -13739,12 +18097,17 @@ "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."insight"."0.4.3" = self.by-version."insight"."0.4.3"; by-version."insight"."0.4.3" = self.buildNodePackage { name = "insight-0.4.3"; + version = "0.4.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/insight/-/insight-0.4.3.tgz"; @@ -13762,12 +18125,17 @@ "request-2.53.0" = self.by-version."request"."2.53.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."install"."~0.1.7" = self.by-version."install"."0.1.8"; by-version."install"."0.1.8" = self.buildNodePackage { name = "install-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/install/-/install-0.1.8.tgz"; @@ -13776,12 +18144,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."internal-ip"."^1.0.0" = self.by-version."internal-ip"."1.0.0"; by-version."internal-ip"."1.0.0" = self.buildNodePackage { name = "internal-ip-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/internal-ip/-/internal-ip-1.0.0.tgz"; @@ -13790,12 +18163,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."interpret"."^0.3.2" = self.by-version."interpret"."0.3.10"; by-version."interpret"."0.3.10" = self.buildNodePackage { name = "interpret-0.3.10"; + version = "0.3.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; @@ -13804,12 +18182,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."intersect"."~0.0.3" = self.by-version."intersect"."0.0.3"; by-version."intersect"."0.0.3" = self.buildNodePackage { name = "intersect-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz"; @@ -13818,12 +18201,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ip"."^0.3.0" = self.by-version."ip"."0.3.2"; by-version."ip"."0.3.2" = self.buildNodePackage { name = "ip-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ip/-/ip-0.3.2.tgz"; @@ -13832,12 +18220,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ip-regex"."^1.0.0" = self.by-version."ip-regex"."1.0.3"; by-version."ip-regex"."1.0.3" = self.buildNodePackage { name = "ip-regex-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"; @@ -13846,12 +18239,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ip-set"."^1.0.0" = self.by-version."ip-set"."1.0.0"; by-version."ip-set"."1.0.0" = self.buildNodePackage { name = "ip-set-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz"; @@ -13861,12 +18259,17 @@ deps = { "ip-0.3.2" = self.by-version."ip"."0.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ipaddr.js"."0.1.2" = self.by-version."ipaddr.js"."0.1.2"; by-version."ipaddr.js"."0.1.2" = self.buildNodePackage { name = "ipaddr.js-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; @@ -13875,12 +18278,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ipaddr.js"."0.1.8" = self.by-version."ipaddr.js"."0.1.8"; by-version."ipaddr.js"."0.1.8" = self.buildNodePackage { name = "ipaddr.js-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.8.tgz"; @@ -13889,7 +18297,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ipaddr.js".">= 0.1.1" = self.by-version."ipaddr.js"."0.1.8"; @@ -13899,10 +18311,54 @@ self.by-version."ipaddr.js"."0.1.8"; by-spec."ipaddr.js"."^0.1.5" = self.by-version."ipaddr.js"."0.1.8"; + by-spec."irc"."0.3.9" = + self.by-version."irc"."0.3.9"; + by-version."irc"."0.3.9" = self.buildNodePackage { + name = "irc-0.3.9"; + version = "0.3.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/irc/-/irc-0.3.9.tgz"; + name = "irc-0.3.9.tgz"; + sha1 = "9c0d846379dbc306b38de5d08cf354f4fc6c83d9"; + }; + deps = { + "ansi-color-0.2.1" = self.by-version."ansi-color"."0.2.1"; + "irc-colors-1.1.0" = self.by-version."irc-colors"."1.1.0"; + }; + optionalDependencies = { + "iconv-2.1.6" = self.by-version."iconv"."2.1.6"; + "node-icu-charset-detector-0.0.7" = self.by-version."node-icu-charset-detector"."0.0.7"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."irc-colors"."^1.1.0" = + self.by-version."irc-colors"."1.1.0"; + by-version."irc-colors"."1.1.0" = self.buildNodePackage { + name = "irc-colors-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/irc-colors/-/irc-colors-1.1.0.tgz"; + name = "irc-colors-1.1.0.tgz"; + sha1 = "f92f184c136e8893ad3fe55d130ed409b0dc0745"; + }; + deps = { + "hashish-0.0.4" = self.by-version."hashish"."0.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.10"; by-version."ironhorse"."0.0.10" = self.buildNodePackage { name = "ironhorse-0.0.10"; + version = "0.0.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz"; @@ -13919,7 +18375,7 @@ "jade-1.9.2" = self.by-version."jade"."1.9.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; - "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6"; + "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7"; "mongoose-3.8.23" = self.by-version."mongoose"."3.8.23"; "gridfs-stream-1.0.1" = self.by-version."gridfs-stream"."1.0.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; @@ -13927,13 +18383,18 @@ "redis-0.12.1" = self.by-version."redis"."0.12.1"; "hiredis-0.2.0" = self.by-version."hiredis"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "ironhorse" = self.by-version."ironhorse"."0.0.10"; by-spec."is-array"."^1.0.1" = self.by-version."is-array"."1.0.1"; by-version."is-array"."1.0.1" = self.buildNodePackage { name = "is-array-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"; @@ -13942,12 +18403,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-binary-path"."^1.0.0" = self.by-version."is-binary-path"."1.0.0"; by-version."is-binary-path"."1.0.0" = self.buildNodePackage { name = "is-binary-path-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.0.tgz"; @@ -13957,12 +18423,17 @@ deps = { "binary-extensions-1.3.0" = self.by-version."binary-extensions"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-finite"."^1.0.0" = self.by-version."is-finite"."1.0.0"; by-version."is-finite"."1.0.0" = self.buildNodePackage { name = "is-finite-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"; @@ -13971,12 +18442,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-glob"."^0.3.0" = self.by-version."is-glob"."0.3.0"; by-version."is-glob"."0.3.0" = self.buildNodePackage { name = "is-glob-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-glob/-/is-glob-0.3.0.tgz"; @@ -13985,12 +18461,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-ip"."^1.0.0" = self.by-version."is-ip"."1.0.0"; by-version."is-ip"."1.0.0" = self.buildNodePackage { name = "is-ip-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz"; @@ -14000,12 +18481,17 @@ deps = { "ip-regex-1.0.3" = self.by-version."ip-regex"."1.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-npm"."^1.0.0" = self.by-version."is-npm"."1.0.0"; by-version."is-npm"."1.0.0" = self.buildNodePackage { name = "is-npm-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; @@ -14014,12 +18500,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.1"; by-version."is-promise"."1.0.1" = self.buildNodePackage { name = "is-promise-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; @@ -14028,12 +18519,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-root"."~1.0.0" = self.by-version."is-root"."1.0.0"; by-version."is-root"."1.0.0" = self.buildNodePackage { name = "is-root-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; @@ -14042,12 +18538,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."is-stream"."^1.0.0" = self.by-version."is-stream"."1.0.1"; by-version."is-stream"."1.0.1" = self.buildNodePackage { name = "is-stream-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz"; @@ -14056,12 +18557,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."is-utf8"."^0.2.0" = + by-spec."is-utf8"."0.2.0" = self.by-version."is-utf8"."0.2.0"; by-version."is-utf8"."0.2.0" = self.buildNodePackage { name = "is-utf8-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"; @@ -14070,12 +18576,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."is-utf8"."^0.2.0" = + self.by-version."is-utf8"."0.2.0"; by-spec."isarray"."0.0.1" = self.by-version."isarray"."0.0.1"; by-version."isarray"."0.0.1" = self.buildNodePackage { name = "isarray-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; @@ -14084,7 +18597,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."isarray"."~0.0.1" = self.by-version."isarray"."0.0.1"; @@ -14092,6 +18609,7 @@ self.by-version."isstream"."0.1.1"; by-version."isstream"."0.1.1" = self.buildNodePackage { name = "isstream-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"; @@ -14100,22 +18618,27 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."isstream"."~0.1.1" = self.by-version."isstream"."0.1.1"; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.3.5"; - by-version."istanbul"."0.3.5" = self.buildNodePackage { - name = "istanbul-0.3.5"; + self.by-version."istanbul"."0.3.6"; + by-version."istanbul"."0.3.6" = self.buildNodePackage { + name = "istanbul-0.3.6"; + version = "0.3.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz"; - name = "istanbul-0.3.5.tgz"; - sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.6.tgz"; + name = "istanbul-0.3.6.tgz"; + sha1 = "e63ffc1d61de2f6344a899f80abdc0ef6491b17b"; }; deps = { - "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; + "esprima-2.0.0" = self.by-version."esprima"."2.0.0"; "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; @@ -14123,23 +18646,29 @@ "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; "which-1.0.8" = self.by-version."which"."1.0.8"; "async-0.9.0" = self.by-version."async"."0.9.0"; + "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1"; "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6"; + "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "istanbul" = self.by-version."istanbul"."0.3.5"; + "istanbul" = self.by-version."istanbul"."0.3.6"; by-spec."istanbul"."~0.3.0" = - self.by-version."istanbul"."0.3.5"; + self.by-version."istanbul"."0.3.6"; by-spec."istanbul"."~0.3.2" = - self.by-version."istanbul"."0.3.5"; + self.by-version."istanbul"."0.3.6"; by-spec."jade"."*" = self.by-version."jade"."1.9.2"; by-version."jade"."1.9.2" = self.buildNodePackage { name = "jade-1.9.2"; + version = "1.9.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jade/-/jade-1.9.2.tgz"; @@ -14155,13 +18684,18 @@ "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1"; "with-4.0.1" = self.by-version."with"."4.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "jade" = self.by-version."jade"."1.9.2"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = self.buildNodePackage { name = "jade-0.26.3"; + version = "0.26.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; @@ -14172,12 +18706,17 @@ "commander-0.6.1" = self.by-version."commander"."0.6.1"; "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jade"."0.27.0" = self.by-version."jade"."0.27.0"; by-version."jade"."0.27.0" = self.buildNodePackage { name = "jade-0.27.0"; + version = "0.27.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; @@ -14188,12 +18727,17 @@ "commander-0.6.1" = self.by-version."commander"."0.6.1"; "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jade"."1.1.5" = self.by-version."jade"."1.1.5"; by-version."jade"."1.1.5" = self.buildNodePackage { name = "jade-1.1.5"; + version = "1.1.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; @@ -14209,7 +18753,11 @@ "with-2.0.0" = self.by-version."with"."2.0.0"; "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jade".">= 0.0.1" = self.by-version."jade"."1.9.2"; @@ -14217,6 +18765,7 @@ self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = self.buildNodePackage { name = "jade-0.35.0"; + version = "0.35.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz"; @@ -14232,12 +18781,17 @@ "with-1.1.1" = self.by-version."with"."1.1.1"; "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jayschema"."*" = self.by-version."jayschema"."0.3.1"; by-version."jayschema"."0.3.1" = self.buildNodePackage { name = "jayschema-0.3.1"; + version = "0.3.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; @@ -14247,13 +18801,18 @@ deps = { "when-3.4.6" = self.by-version."when"."3.4.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "jayschema" = self.by-version."jayschema"."0.3.1"; by-spec."jfs"."*" = self.by-version."jfs"."0.2.5"; by-version."jfs"."0.2.5" = self.buildNodePackage { name = "jfs-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jfs/-/jfs-0.2.5.tgz"; @@ -14266,13 +18825,18 @@ "async-0.9.0" = self.by-version."async"."0.9.0"; "clone-0.2.0" = self.by-version."clone"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "jfs" = self.by-version."jfs"."0.2.5"; by-spec."js-string-escape"."^1.0.0" = self.by-version."js-string-escape"."1.0.0"; by-version."js-string-escape"."1.0.0" = self.buildNodePackage { name = "js-string-escape-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.0.tgz"; @@ -14281,29 +18845,39 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.2.6"; - by-version."js-yaml"."3.2.6" = self.buildNodePackage { - name = "js-yaml-3.2.6"; + self.by-version."js-yaml"."3.2.7"; + by-version."js-yaml"."3.2.7" = self.buildNodePackage { + name = "js-yaml-3.2.7"; + version = "3.2.7"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.6.tgz"; - name = "js-yaml-3.2.6.tgz"; - sha1 = "dde1ffbe2726e3fff97efb65fd02dbd6647b8309"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz"; + name = "js-yaml-3.2.7.tgz"; + sha1 = "102790f265d986fe95a4d0f2a792e7a7bd886eec"; }; deps = { - "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; - "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + "argparse-1.0.1" = self.by-version."argparse"."1.0.1"; + "esprima-2.0.0" = self.by-version."esprima"."2.0.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "js-yaml" = self.by-version."js-yaml"."3.2.6"; + "js-yaml" = self.by-version."js-yaml"."3.2.7"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = self.buildNodePackage { name = "js-yaml-0.3.7"; + version = "0.3.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; @@ -14312,12 +18886,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."js-yaml"."2.1.0" = self.by-version."js-yaml"."2.1.0"; by-version."js-yaml"."2.1.0" = self.buildNodePackage { name = "js-yaml-2.1.0"; + version = "2.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; @@ -14328,12 +18907,17 @@ "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."js-yaml"."3.0.1" = self.by-version."js-yaml"."3.0.1"; by-version."js-yaml"."3.0.1" = self.buildNodePackage { name = "js-yaml-3.0.1"; + version = "3.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; @@ -14344,16 +18928,21 @@ "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.2.6"; + self.by-version."js-yaml"."3.2.7"; by-spec."js-yaml"."^3.1.0" = - self.by-version."js-yaml"."3.2.6"; + self.by-version."js-yaml"."3.2.7"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = self.buildNodePackage { name = "js-yaml-2.0.5"; + version = "2.0.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"; @@ -14364,12 +18953,17 @@ "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsdom"."^0.10.5" = self.by-version."jsdom"."0.10.6"; by-version."jsdom"."0.10.6" = self.buildNodePackage { name = "jsdom-0.10.6"; + version = "0.10.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsdom/-/jsdom-0.10.6.tgz"; @@ -14385,12 +18979,17 @@ "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22"; "contextify-0.1.13" = self.by-version."contextify"."0.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsdom"."^0.11.0" = self.by-version."jsdom"."0.11.1"; by-version."jsdom"."0.11.1" = self.buildNodePackage { name = "jsdom-0.11.1"; + version = "0.11.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz"; @@ -14406,12 +19005,17 @@ "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22"; "contextify-0.1.13" = self.by-version."contextify"."0.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsdom"."~0.8.6" = self.by-version."jsdom"."0.8.11"; by-version."jsdom"."0.8.11" = self.buildNodePackage { name = "jsdom-0.8.11"; + version = "0.8.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsdom/-/jsdom-0.8.11.tgz"; @@ -14427,12 +19031,17 @@ "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22"; "contextify-0.1.13" = self.by-version."contextify"."0.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = self.buildNodePackage { name = "jsesc-0.4.3"; + version = "0.4.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz"; @@ -14441,7 +19050,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; @@ -14449,6 +19062,7 @@ self.by-version."jshint"."2.6.0"; by-version."jshint"."2.6.0" = self.buildNodePackage { name = "jshint-2.6.0"; + version = "2.6.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jshint/-/jshint-2.6.0.tgz"; @@ -14465,7 +19079,11 @@ "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2"; "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "jshint" = self.by-version."jshint"."2.6.0"; by-spec."jshint"."~2.6.0" = @@ -14474,6 +19092,7 @@ self.by-version."json"."9.0.3"; by-version."json"."9.0.3" = self.buildNodePackage { name = "json-9.0.3"; + version = "9.0.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/json/-/json-9.0.3.tgz"; @@ -14482,13 +19101,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "json" = self.by-version."json"."9.0.3"; by-spec."json-middleware"."^1.0.2" = self.by-version."json-middleware"."1.0.2"; by-version."json-middleware"."1.0.2" = self.buildNodePackage { name = "json-middleware-1.0.2"; + version = "1.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/json-middleware/-/json-middleware-1.0.2.tgz"; @@ -14497,12 +19121,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = self.buildNodePackage { name = "json-schema-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; @@ -14511,12 +19140,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."json-stable-stringify"."~0.0.0" = self.by-version."json-stable-stringify"."0.0.1"; by-version."json-stable-stringify"."0.0.1" = self.buildNodePackage { name = "json-stable-stringify-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; @@ -14526,12 +19160,17 @@ deps = { "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."json-stringify-safe"."~3.0.0" = self.by-version."json-stringify-safe"."3.0.0"; by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage { name = "json-stringify-safe-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; @@ -14540,12 +19179,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."json-stringify-safe"."~5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage { name = "json-stringify-safe-5.0.0"; + version = "5.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; @@ -14554,12 +19198,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."json3"."3.2.6" = self.by-version."json3"."3.2.6"; by-version."json3"."3.2.6" = self.buildNodePackage { name = "json3-3.2.6"; + version = "3.2.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; @@ -14568,12 +19217,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."json5"."^0.2.0" = self.by-version."json5"."0.2.0"; by-version."json5"."0.2.0" = self.buildNodePackage { name = "json5-0.2.0"; + version = "0.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; @@ -14582,12 +19236,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsonfile"."^2.0.0" = self.by-version."jsonfile"."2.0.0"; by-version."jsonfile"."2.0.0" = self.buildNodePackage { name = "jsonfile-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; @@ -14596,12 +19255,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsonfile"."~1.0.1" = self.by-version."jsonfile"."1.0.1"; by-version."jsonfile"."1.0.1" = self.buildNodePackage { name = "jsonfile-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; @@ -14610,12 +19274,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsonfile"."~1.1.0" = self.by-version."jsonfile"."1.1.1"; by-version."jsonfile"."1.1.1" = self.buildNodePackage { name = "jsonfile-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz"; @@ -14624,12 +19293,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsonify"."~0.0.0" = self.by-version."jsonify"."0.0.0"; by-version."jsonify"."0.0.0" = self.buildNodePackage { name = "jsonify-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; @@ -14638,12 +19312,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsonparse"."0.0.5" = self.by-version."jsonparse"."0.0.5"; by-version."jsonparse"."0.0.5" = self.buildNodePackage { name = "jsonparse-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; @@ -14652,12 +19331,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsontool"."*" = self.by-version."jsontool"."7.0.2"; by-version."jsontool"."7.0.2" = self.buildNodePackage { name = "jsontool-7.0.2"; + version = "7.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; @@ -14666,13 +19350,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "jsontool" = self.by-version."jsontool"."7.0.2"; by-spec."jsonwebtoken"."^1.1.1" = self.by-version."jsonwebtoken"."1.3.0"; by-version."jsonwebtoken"."1.3.0" = self.buildNodePackage { name = "jsonwebtoken-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-1.3.0.tgz"; @@ -14682,12 +19371,17 @@ deps = { "jws-0.2.6" = self.by-version."jws"."0.2.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jsprim"."0.3.0" = self.by-version."jsprim"."0.3.0"; by-version."jsprim"."0.3.0" = self.buildNodePackage { name = "jsprim-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; @@ -14699,12 +19393,17 @@ "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2"; "verror-1.3.3" = self.by-version."verror"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jstransform"."^7.0.0" = self.by-version."jstransform"."7.0.0"; by-version."jstransform"."7.0.0" = self.buildNodePackage { name = "jstransform-7.0.0"; + version = "7.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jstransform/-/jstransform-7.0.0.tgz"; @@ -14716,43 +19415,58 @@ "esprima-fb-7001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb"; "source-map-0.1.31" = self.by-version."source-map"."0.1.31"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."jstransform"."^9.1.0" = - self.by-version."jstransform"."9.1.0"; - by-version."jstransform"."9.1.0" = self.buildNodePackage { - name = "jstransform-9.1.0"; + by-spec."jstransform"."^9.1.1" = + self.by-version."jstransform"."9.1.1"; + by-version."jstransform"."9.1.1" = self.buildNodePackage { + name = "jstransform-9.1.1"; + version = "9.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jstransform/-/jstransform-9.1.0.tgz"; - name = "jstransform-9.1.0.tgz"; - sha1 = "7b3903a1ba4aab972daa0540a4131c5386ad90dd"; + url = "http://registry.npmjs.org/jstransform/-/jstransform-9.1.1.tgz"; + name = "jstransform-9.1.1.tgz"; + sha1 = "2085ae83ac4e28d5f247c56bf6e43404a85c4b14"; }; deps = { "base62-0.1.1" = self.by-version."base62"."0.1.1"; "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb"; "source-map-0.1.31" = self.by-version."source-map"."0.1.31"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."junk"."~1.0.0" = - self.by-version."junk"."1.0.0"; - by-version."junk"."1.0.0" = self.buildNodePackage { - name = "junk-1.0.0"; + self.by-version."junk"."1.0.1"; + by-version."junk"."1.0.1" = self.buildNodePackage { + name = "junk-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/junk/-/junk-1.0.0.tgz"; - name = "junk-1.0.0.tgz"; - sha1 = "22b05ee710f40c44f82fb260602ffecd489223b8"; + url = "http://registry.npmjs.org/junk/-/junk-1.0.1.tgz"; + name = "junk-1.0.1.tgz"; + sha1 = "824ef8925f02026f61bc6e6fa346b25fa8f3938b"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jwa"."0.0.1" = self.by-version."jwa"."0.0.1"; by-version."jwa"."0.0.1" = self.buildNodePackage { name = "jwa-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jwa/-/jwa-0.0.1.tgz"; @@ -14762,12 +19476,17 @@ deps = { "base64url-0.0.6" = self.by-version."base64url"."0.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jws"."0.0.2" = self.by-version."jws"."0.0.2"; by-version."jws"."0.0.2" = self.buildNodePackage { name = "jws-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz"; @@ -14778,12 +19497,17 @@ "tap-0.3.3" = self.by-version."tap"."0.3.3"; "base64url-0.0.3" = self.by-version."base64url"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jws"."~0.2.6" = self.by-version."jws"."0.2.6"; by-version."jws"."0.2.6" = self.buildNodePackage { name = "jws-0.2.6"; + version = "0.2.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jws/-/jws-0.2.6.tgz"; @@ -14794,12 +19518,17 @@ "base64url-0.0.6" = self.by-version."base64url"."0.0.6"; "jwa-0.0.1" = self.by-version."jwa"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."jwt-simple"."0.1.x" = self.by-version."jwt-simple"."0.1.0"; by-version."jwt-simple"."0.1.0" = self.buildNodePackage { name = "jwt-simple-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/jwt-simple/-/jwt-simple-0.1.0.tgz"; @@ -14808,12 +19537,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."k-bucket"."^0.4.2" = self.by-version."k-bucket"."0.4.2"; by-version."k-bucket"."0.4.2" = self.buildNodePackage { name = "k-bucket-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.4.2.tgz"; @@ -14823,12 +19557,17 @@ deps = { "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kareem"."0.0.4" = self.by-version."kareem"."0.0.4"; by-version."kareem"."0.0.4" = self.buildNodePackage { name = "kareem-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kareem/-/kareem-0.0.4.tgz"; @@ -14837,12 +19576,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."karma"."*" = self.by-version."karma"."0.12.31"; by-version."karma"."0.12.31" = self.buildNodePackage { name = "karma-0.12.31"; + version = "0.12.31"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/karma/-/karma-0.12.31.tgz"; @@ -14852,7 +19596,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.16" = self.by-version."socket.io"."0.9.16"; - "chokidar-1.0.0-rc3" = self.by-version."chokidar"."1.0.0-rc3"; + "chokidar-0.12.6" = self.by-version."chokidar"."0.12.6"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -14868,7 +19612,11 @@ "connect-2.26.6" = self.by-version."connect"."2.26.6"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "karma" = self.by-version."karma"."0.12.31"; by-spec."karma".">=0.11.11" = @@ -14885,6 +19633,7 @@ self.by-version."karma-chrome-launcher"."0.1.7"; by-version."karma-chrome-launcher"."0.1.7" = self.buildNodePackage { name = "karma-chrome-launcher-0.1.7"; + version = "0.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz"; @@ -14893,14 +19642,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."karma"."0.12.31"]; + os = [ ]; + cpu = [ ]; }; "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7"; by-spec."karma-coverage"."*" = self.by-version."karma-coverage"."0.2.7"; by-version."karma-coverage"."0.2.7" = self.buildNodePackage { name = "karma-coverage-0.2.7"; + version = "0.2.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.7.tgz"; @@ -14908,19 +19662,24 @@ sha1 = "f76740b275bbf30a0ab9f41d8cf56843a0994576"; }; deps = { - "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; + "istanbul-0.3.6" = self.by-version."istanbul"."0.3.6"; "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0"; "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."karma"."0.12.31"]; + os = [ ]; + cpu = [ ]; }; "karma-coverage" = self.by-version."karma-coverage"."0.2.7"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.2"; by-version."karma-junit-reporter"."0.2.2" = self.buildNodePackage { name = "karma-junit-reporter-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz"; @@ -14930,14 +19689,19 @@ deps = { "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."karma"."0.12.31"]; + os = [ ]; + cpu = [ ]; }; "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2"; by-spec."karma-mocha"."*" = self.by-version."karma-mocha"."0.1.10"; by-version."karma-mocha"."0.1.10" = self.buildNodePackage { name = "karma-mocha-0.1.10"; + version = "0.1.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz"; @@ -14946,15 +19710,20 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."karma"."0.12.31" self.by-version."mocha"."2.1.0"]; + os = [ ]; + cpu = [ ]; }; "karma-mocha" = self.by-version."karma-mocha"."0.1.10"; by-spec."karma-requirejs"."*" = self.by-version."karma-requirejs"."0.2.2"; by-version."karma-requirejs"."0.2.2" = self.buildNodePackage { name = "karma-requirejs-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz"; @@ -14963,15 +19732,20 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."karma"."0.12.31" self.by-version."requirejs"."2.1.16"]; + os = [ ]; + cpu = [ ]; }; "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2"; by-spec."karma-sauce-launcher"."*" = self.by-version."karma-sauce-launcher"."0.2.10"; by-version."karma-sauce-launcher"."0.2.10" = self.buildNodePackage { name = "karma-sauce-launcher-0.2.10"; + version = "0.2.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz"; @@ -14984,14 +19758,19 @@ "q-0.9.7" = self.by-version."q"."0.9.7"; "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."karma"."0.12.31"]; + os = [ ]; + cpu = [ ]; }; "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.10"; by-spec."keen.io"."^0.1.2" = self.by-version."keen.io"."0.1.3"; by-version."keen.io"."0.1.3" = self.buildNodePackage { name = "keen.io-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz"; @@ -15002,7 +19781,11 @@ "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."keen.io"."~0.1.3" = self.by-version."keen.io"."0.1.3"; @@ -15010,6 +19793,7 @@ self.by-version."keep-alive-agent"."0.0.1"; by-version."keep-alive-agent"."0.0.1" = self.buildNodePackage { name = "keep-alive-agent-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; @@ -15018,12 +19802,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kerberos"."0.0.3" = self.by-version."kerberos"."0.0.3"; by-version."kerberos"."0.0.3" = self.buildNodePackage { name = "kerberos-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz"; @@ -15032,12 +19821,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kerberos"."0.0.4" = self.by-version."kerberos"."0.0.4"; by-version."kerberos"."0.0.4" = self.buildNodePackage { name = "kerberos-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz"; @@ -15046,12 +19840,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kerberos"."0.0.7" = self.by-version."kerberos"."0.0.7"; by-version."kerberos"."0.0.7" = self.buildNodePackage { name = "kerberos-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz"; @@ -15061,12 +19860,17 @@ deps = { "nan-1.3.0" = self.by-version."nan"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kerberos"."0.0.9" = self.by-version."kerberos"."0.0.9"; by-version."kerberos"."0.0.9" = self.buildNodePackage { name = "kerberos-0.0.9"; + version = "0.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz"; @@ -15076,12 +19880,17 @@ deps = { "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kew"."0.4.0" = self.by-version."kew"."0.4.0"; by-version."kew"."0.4.0" = self.buildNodePackage { name = "kew-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kew/-/kew-0.4.0.tgz"; @@ -15090,12 +19899,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."kew"."~0.1.7" = self.by-version."kew"."0.1.7"; by-version."kew"."0.1.7" = self.buildNodePackage { name = "kew-0.1.7"; + version = "0.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; @@ -15104,12 +19918,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."keygrip"."0.2.x" = self.by-version."keygrip"."0.2.4"; by-version."keygrip"."0.2.4" = self.buildNodePackage { name = "keygrip-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/keygrip/-/keygrip-0.2.4.tgz"; @@ -15118,12 +19937,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."keygrip"."~1.0.0" = self.by-version."keygrip"."1.0.1"; by-version."keygrip"."1.0.1" = self.buildNodePackage { name = "keygrip-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz"; @@ -15132,12 +19956,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."keypress"."0.1.x" = self.by-version."keypress"."0.1.0"; by-version."keypress"."0.1.0" = self.buildNodePackage { name = "keypress-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; @@ -15146,12 +19975,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."keypress"."^0.2.1" = self.by-version."keypress"."0.2.1"; by-version."keypress"."0.2.1" = self.buildNodePackage { name = "keypress-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; @@ -15160,7 +19994,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."keypress"."~0.2.1" = self.by-version."keypress"."0.2.1"; @@ -15168,6 +20006,7 @@ self.by-version."kibana-authentication-proxy"."1.1.0"; by-version."kibana-authentication-proxy"."1.1.0" = self.buildNodePackage { name = "kibana-authentication-proxy-1.1.0"; + version = "1.1.0"; bin = false; src = fetchgit { url = "git://github.com/fangli/kibana-authentication-proxy"; @@ -15175,19 +20014,24 @@ sha256 = "dd2e42da959c359bf48d16993c6caf1d810241f7f37dfa4da911dd284571236f"; }; deps = { - "express-3.19.2" = self.by-version."express"."3.19.2"; + "express-3.20.0" = self.by-version."express"."3.20.0"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "connect-restreamer-1.0.1" = self.by-version."connect-restreamer"."1.0.1"; "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "kibana-authentication-proxy" = self.by-version."kibana-authentication-proxy"."1.1.0"; by-spec."knockout"."~3.2.0" = self.by-version."knockout"."3.2.0"; by-version."knockout"."3.2.0" = self.buildNodePackage { name = "knockout-3.2.0"; + version = "3.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/knockout/-/knockout-3.2.0.tgz"; @@ -15196,12 +20040,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."knox"."*" = self.by-version."knox"."0.9.2"; by-version."knox"."0.9.2" = self.buildNodePackage { name = "knox-0.9.2"; + version = "0.9.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/knox/-/knox-0.9.2.tgz"; @@ -15215,13 +20064,18 @@ "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "knox" = self.by-version."knox"."0.9.2"; by-spec."kue"."*" = self.by-version."kue"."0.8.11"; by-version."kue"."0.8.11" = self.buildNodePackage { name = "kue-0.8.11"; + version = "0.8.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz"; @@ -15238,13 +20092,18 @@ "nib-0.5.0" = self.by-version."nib"."0.5.0"; "reds-0.2.5" = self.by-version."reds"."0.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "kue" = self.by-version."kue"."0.8.11"; by-spec."labeled-stream-splicer"."^1.0.0" = self.by-version."labeled-stream-splicer"."1.0.2"; by-version."labeled-stream-splicer"."1.0.2" = self.buildNodePackage { name = "labeled-stream-splicer-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz"; @@ -15256,12 +20115,17 @@ "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "stream-splicer-1.3.1" = self.by-version."stream-splicer"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."latest-version"."^0.2.0" = self.by-version."latest-version"."0.2.0"; by-version."latest-version"."0.2.0" = self.buildNodePackage { name = "latest-version-0.2.0"; + version = "0.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz"; @@ -15271,12 +20135,17 @@ deps = { "package-json-0.2.0" = self.by-version."package-json"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."latest-version"."^1.0.0" = self.by-version."latest-version"."1.0.0"; by-version."latest-version"."1.0.0" = self.buildNodePackage { name = "latest-version-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz"; @@ -15284,14 +20153,19 @@ sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9"; }; deps = { - "package-json-1.0.2" = self.by-version."package-json"."1.0.2"; + "package-json-1.1.0" = self.by-version."package-json"."1.1.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = self.buildNodePackage { name = "lazy-1.0.11"; + version = "1.0.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; @@ -15300,12 +20174,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lazystream"."~0.1.0" = self.by-version."lazystream"."0.1.0"; by-version."lazystream"."0.1.0" = self.buildNodePackage { name = "lazystream-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"; @@ -15315,12 +20194,17 @@ deps = { "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lcov-parse"."0.0.6" = self.by-version."lcov-parse"."0.0.6"; by-version."lcov-parse"."0.0.6" = self.buildNodePackage { name = "lcov-parse-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz"; @@ -15329,12 +20213,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lcov-result-merger"."*" = self.by-version."lcov-result-merger"."1.0.2"; by-version."lcov-result-merger"."1.0.2" = self.buildNodePackage { name = "lcov-result-merger-1.0.2"; + version = "1.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.2.tgz"; @@ -15346,13 +20235,18 @@ "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.2"; by-spec."ldapjs"."^0.7.1" = self.by-version."ldapjs"."0.7.1"; by-version."ldapjs"."0.7.1" = self.buildNodePackage { name = "ldapjs-0.7.1"; + version = "0.7.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz"; @@ -15365,14 +20259,19 @@ "bunyan-0.22.1" = self.by-version."bunyan"."0.22.1"; "nopt-2.1.1" = self.by-version."nopt"."2.1.1"; "pooling-0.4.6" = self.by-version."pooling"."0.4.6"; + }; + optionalDependencies = { "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."less"."*" = self.by-version."less"."2.4.0"; by-version."less"."2.4.0" = self.buildNodePackage { name = "less-2.4.0"; + version = "2.4.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/less/-/less-2.4.0.tgz"; @@ -15380,6 +20279,8 @@ sha1 = "ce51b38f1c05a0cdd47982fac40dd0a39cec2031"; }; deps = { + }; + optionalDependencies = { "errno-0.1.1" = self.by-version."errno"."0.1.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "image-size-0.3.5" = self.by-version."image-size"."0.3.5"; @@ -15390,6 +20291,8 @@ "source-map-0.2.0" = self.by-version."source-map"."0.2.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "less" = self.by-version."less"."2.4.0"; by-spec."less"."^2.1.0" = @@ -15398,6 +20301,7 @@ self.by-version."levn"."0.2.5"; by-version."levn"."0.2.5" = self.buildNodePackage { name = "levn-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; @@ -15408,12 +20312,17 @@ "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lexical-scope"."~0.0.14" = self.by-version."lexical-scope"."0.0.15"; by-version."lexical-scope"."0.0.15" = self.buildNodePackage { name = "lexical-scope-0.0.15"; + version = "0.0.15"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.0.15.tgz"; @@ -15423,12 +20332,17 @@ deps = { "astw-0.0.0" = self.by-version."astw"."0.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lexical-scope"."~0.1.0" = self.by-version."lexical-scope"."0.1.0"; by-version."lexical-scope"."0.1.0" = self.buildNodePackage { name = "lexical-scope-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz"; @@ -15438,12 +20352,17 @@ deps = { "astw-0.1.0" = self.by-version."astw"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lexical-scope"."~1.1.0" = self.by-version."lexical-scope"."1.1.0"; by-version."lexical-scope"."1.1.0" = self.buildNodePackage { name = "lexical-scope-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz"; @@ -15453,12 +20372,79 @@ deps = { "astw-1.1.0" = self.by-version."astw"."1.1.0"; }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."libbase64"."^0.1.0" = + self.by-version."libbase64"."0.1.0"; + by-version."libbase64"."0.1.0" = self.buildNodePackage { + name = "libbase64-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; + name = "libbase64-0.1.0.tgz"; + sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; + }; + deps = { + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."libmime"."^0.1.3" = + self.by-version."libmime"."0.1.7"; + by-version."libmime"."0.1.7" = self.buildNodePackage { + name = "libmime-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/libmime/-/libmime-0.1.7.tgz"; + name = "libmime-0.1.7.tgz"; + sha1 = "827b8d4df349e08c6cff1bc6d6b51ec57d349cb2"; + }; + deps = { + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0"; + "libqp-0.1.1" = self.by-version."libqp"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."libmime"."^0.1.5" = + self.by-version."libmime"."0.1.7"; + by-spec."libqp"."^0.1.1" = + self.by-version."libqp"."0.1.1"; + by-version."libqp"."0.1.1" = self.buildNodePackage { + name = "libqp-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/libqp/-/libqp-0.1.1.tgz"; + name = "libqp-0.1.1.tgz"; + sha1 = "2d10cabb96b14fe9649f4ae353a39baa90063b01"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."libxmljs"."~0.10.0" = self.by-version."libxmljs"."0.10.0"; by-version."libxmljs"."0.10.0" = self.buildNodePackage { name = "libxmljs-0.10.0"; + version = "0.10.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz"; @@ -15469,27 +20455,17 @@ "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; "nan-1.1.2" = self.by-version."nan"."1.1.2"; }; - peerDependencies = []; - }; - by-spec."libyaml"."*" = - self.by-version."libyaml"."0.2.5"; - by-version."libyaml"."0.2.5" = self.buildNodePackage { - name = "libyaml-0.2.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.5.tgz"; - name = "libyaml-0.2.5.tgz"; - sha1 = "f34a920b728d8c1eddea56a6fa8698c28ceab6df"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "libyaml" = self.by-version."libyaml"."0.2.5"; by-spec."liftoff"."^2.0.1" = self.by-version."liftoff"."2.0.1"; by-version."liftoff"."2.0.1" = self.buildNodePackage { name = "liftoff-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/liftoff/-/liftoff-2.0.1.tgz"; @@ -15503,12 +20479,17 @@ "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lockfile"."~1.0.0" = self.by-version."lockfile"."1.0.0"; by-version."lockfile"."1.0.0" = self.buildNodePackage { name = "lockfile-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz"; @@ -15517,26 +20498,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash"."*" = - self.by-version."lodash"."3.2.0"; - by-version."lodash"."3.2.0" = self.buildNodePackage { - name = "lodash-3.2.0"; + self.by-version."lodash"."3.3.0"; + by-version."lodash"."3.3.0" = self.buildNodePackage { + name = "lodash-3.3.0"; + version = "3.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"; - name = "lodash-3.2.0.tgz"; - sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb"; + url = "http://registry.npmjs.org/lodash/-/lodash-3.3.0.tgz"; + name = "lodash-3.3.0.tgz"; + sha1 = "011ce52d01b14e60eaeea76acb9b8ba42c70581b"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash"."2.4.1" = self.by-version."lodash"."2.4.1"; by-version."lodash"."2.4.1" = self.buildNodePackage { name = "lodash-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; @@ -15545,18 +20536,23 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash".">=2.4.1" = - self.by-version."lodash"."3.2.0"; + self.by-version."lodash"."3.3.0"; by-spec."lodash"."^2.4.1" = self.by-version."lodash"."2.4.1"; by-spec."lodash"."^3.2.0" = - self.by-version."lodash"."3.2.0"; + self.by-version."lodash"."3.3.0"; by-spec."lodash"."~0.9.2" = self.by-version."lodash"."0.9.2"; by-version."lodash"."0.9.2" = self.buildNodePackage { name = "lodash-0.9.2"; + version = "0.9.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"; @@ -15565,12 +20561,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash"."~1.0.1" = self.by-version."lodash"."1.0.1"; by-version."lodash"."1.0.1" = self.buildNodePackage { name = "lodash-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"; @@ -15579,12 +20580,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash"."~1.3.1" = self.by-version."lodash"."1.3.1"; by-version."lodash"."1.3.1" = self.buildNodePackage { name = "lodash-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; @@ -15593,16 +20599,40 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash"."~2.4.1" = self.by-version."lodash"."2.4.1"; - by-spec."lodash"."~3.2.0" = + by-spec."lodash"."~3.2" = self.by-version."lodash"."3.2.0"; + by-version."lodash"."3.2.0" = self.buildNodePackage { + name = "lodash-3.2.0"; + version = "3.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"; + name = "lodash-3.2.0.tgz"; + sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."~3.3.0" = + self.by-version."lodash"."3.3.0"; by-spec."lodash-deep"."^1.1.0" = self.by-version."lodash-deep"."1.5.3"; by-version."lodash-deep"."1.5.3" = self.buildNodePackage { name = "lodash-deep-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.5.3.tgz"; @@ -15610,14 +20640,19 @@ sha1 = "eeddfdd937ed24c2c903fc242cb15a26362321d2"; }; deps = { - "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; + "lodash-3.3.0" = self.by-version."lodash"."3.3.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash-node"."~2.4.1" = self.by-version."lodash-node"."2.4.1"; by-version."lodash-node"."2.4.1" = self.buildNodePackage { name = "lodash-node-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"; @@ -15626,12 +20661,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._basecopy"."^3.0.0" = self.by-version."lodash._basecopy"."3.0.0"; by-version."lodash._basecopy"."3.0.0" = self.buildNodePackage { name = "lodash._basecopy-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"; @@ -15640,26 +20680,17 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."lodash._baseslice"."^3.0.0" = - self.by-version."lodash._baseslice"."3.0.1"; - by-version."lodash._baseslice"."3.0.1" = self.buildNodePackage { - name = "lodash._baseslice-3.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-3.0.1.tgz"; - name = "lodash._baseslice-3.0.1.tgz"; - sha1 = "79c9a951f4b5a90f45f28a51664ab6532395e2f6"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._basetostring"."^3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage { name = "lodash._basetostring-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"; @@ -15668,12 +20699,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._basevalues"."^3.0.0" = self.by-version."lodash._basevalues"."3.0.0"; by-version."lodash._basevalues"."3.0.0" = self.buildNodePackage { name = "lodash._basevalues-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; @@ -15682,12 +20718,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._createpad"."^3.0.0" = self.by-version."lodash._createpad"."3.0.1"; by-version."lodash._createpad"."3.0.1" = self.buildNodePackage { name = "lodash._createpad-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz"; @@ -15697,26 +20738,36 @@ deps = { "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._isiterateecall"."^3.0.0" = - self.by-version."lodash._isiterateecall"."3.0.1"; - by-version."lodash._isiterateecall"."3.0.1" = self.buildNodePackage { - name = "lodash._isiterateecall-3.0.1"; + self.by-version."lodash._isiterateecall"."3.0.2"; + by-version."lodash._isiterateecall"."3.0.2" = self.buildNodePackage { + name = "lodash._isiterateecall-3.0.2"; + version = "3.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"; - name = "lodash._isiterateecall-3.0.1.tgz"; - sha1 = "3fb3284b7702ac22cb7d902c00a6fc26a3cd90e5"; + url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.2.tgz"; + name = "lodash._isiterateecall-3.0.2.tgz"; + sha1 = "08287668d0cb67dcd4e25194be3f4f563b16c013"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._isnative"."~2.4.1" = self.by-version."lodash._isnative"."2.4.1"; by-version."lodash._isnative"."2.4.1" = self.buildNodePackage { name = "lodash._isnative-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"; @@ -15725,12 +20776,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._objecttypes"."~2.4.1" = self.by-version."lodash._objecttypes"."2.4.1"; by-version."lodash._objecttypes"."2.4.1" = self.buildNodePackage { name = "lodash._objecttypes-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"; @@ -15739,12 +20795,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._reescape"."^3.0.0" = self.by-version."lodash._reescape"."3.0.0"; by-version."lodash._reescape"."3.0.0" = self.buildNodePackage { name = "lodash._reescape-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; @@ -15753,12 +20814,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._reevaluate"."^3.0.0" = self.by-version."lodash._reevaluate"."3.0.0"; by-version."lodash._reevaluate"."3.0.0" = self.buildNodePackage { name = "lodash._reevaluate-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; @@ -15767,12 +20833,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash._reinterpolate"."^3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; by-version."lodash._reinterpolate"."3.0.0" = self.buildNodePackage { name = "lodash._reinterpolate-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; @@ -15781,12 +20852,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.debounce"."^2.4.1" = self.by-version."lodash.debounce"."2.4.1"; by-version."lodash.debounce"."2.4.1" = self.buildNodePackage { name = "lodash.debounce-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz"; @@ -15798,12 +20874,17 @@ "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1"; "lodash.now-2.4.1" = self.by-version."lodash.now"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.escape"."^3.0.0" = self.by-version."lodash.escape"."3.0.0"; by-version."lodash.escape"."3.0.0" = self.buildNodePackage { name = "lodash.escape-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"; @@ -15813,12 +20894,17 @@ deps = { "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.isarguments"."^3.0.0" = self.by-version."lodash.isarguments"."3.0.0"; by-version."lodash.isarguments"."3.0.0" = self.buildNodePackage { name = "lodash.isarguments-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"; @@ -15827,12 +20913,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.isarray"."^3.0.0" = self.by-version."lodash.isarray"."3.0.0"; by-version."lodash.isarray"."3.0.0" = self.buildNodePackage { name = "lodash.isarray-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"; @@ -15841,12 +20932,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.isfunction"."~2.4.1" = self.by-version."lodash.isfunction"."2.4.1"; by-version."lodash.isfunction"."2.4.1" = self.buildNodePackage { name = "lodash.isfunction-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"; @@ -15855,12 +20951,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.isnative"."^3.0.0" = self.by-version."lodash.isnative"."3.0.0"; by-version."lodash.isnative"."3.0.0" = self.buildNodePackage { name = "lodash.isnative-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"; @@ -15869,12 +20970,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.isobject"."~2.4.1" = self.by-version."lodash.isobject"."2.4.1"; by-version."lodash.isobject"."2.4.1" = self.buildNodePackage { name = "lodash.isobject-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"; @@ -15884,12 +20990,17 @@ deps = { "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.keys"."^3.0.0" = self.by-version."lodash.keys"."3.0.3"; by-version."lodash.keys"."3.0.3" = self.buildNodePackage { name = "lodash.keys-3.0.3"; + version = "3.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz"; @@ -15901,12 +21012,17 @@ "lodash.isarray-3.0.0" = self.by-version."lodash.isarray"."3.0.0"; "lodash.isnative-3.0.0" = self.by-version."lodash.isnative"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.now"."~2.4.1" = self.by-version."lodash.now"."2.4.1"; by-version."lodash.now"."2.4.1" = self.buildNodePackage { name = "lodash.now-2.4.1"; + version = "2.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz"; @@ -15916,12 +21032,17 @@ deps = { "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.pad"."^3.0.0" = self.by-version."lodash.pad"."3.0.0"; by-version."lodash.pad"."3.0.0" = self.buildNodePackage { name = "lodash.pad-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.0.0.tgz"; @@ -15932,12 +21053,17 @@ "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.padleft"."^3.0.0" = self.by-version."lodash.padleft"."3.0.0"; by-version."lodash.padleft"."3.0.0" = self.buildNodePackage { name = "lodash.padleft-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.0.0.tgz"; @@ -15948,12 +21074,17 @@ "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.padright"."^3.0.0" = self.by-version."lodash.padright"."3.0.0"; by-version."lodash.padright"."3.0.0" = self.buildNodePackage { name = "lodash.padright-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.0.0.tgz"; @@ -15964,12 +21095,17 @@ "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.reescape"."^3.0.0" = self.by-version."lodash.reescape"."3.0.1"; by-version."lodash.reescape"."3.0.1" = self.buildNodePackage { name = "lodash.reescape-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz"; @@ -15979,12 +21115,17 @@ deps = { "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.reevaluate"."^3.0.0" = self.by-version."lodash.reevaluate"."3.0.1"; by-version."lodash.reevaluate"."3.0.1" = self.buildNodePackage { name = "lodash.reevaluate-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz"; @@ -15994,12 +21135,17 @@ deps = { "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.reinterpolate"."^3.0.0" = self.by-version."lodash.reinterpolate"."3.0.1"; by-version."lodash.reinterpolate"."3.0.1" = self.buildNodePackage { name = "lodash.reinterpolate-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz"; @@ -16009,12 +21155,17 @@ deps = { "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.repeat"."^3.0.0" = self.by-version."lodash.repeat"."3.0.0"; by-version."lodash.repeat"."3.0.0" = self.buildNodePackage { name = "lodash.repeat-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"; @@ -16024,51 +21175,65 @@ deps = { "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.template"."^3.0.0" = - self.by-version."lodash.template"."3.2.0"; - by-version."lodash.template"."3.2.0" = self.buildNodePackage { - name = "lodash.template-3.2.0"; + self.by-version."lodash.template"."3.3.0"; + by-version."lodash.template"."3.3.0" = self.buildNodePackage { + name = "lodash.template-3.3.0"; + version = "3.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.2.0.tgz"; - name = "lodash.template-3.2.0.tgz"; - sha1 = "04f6b39f4fd8aa2eb915a41adddd011ac41567c1"; + url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.3.0.tgz"; + name = "lodash.template-3.3.0.tgz"; + sha1 = "7392a42a6f18cf3cbaac587c01b7f922a0529b09"; }; deps = { "lodash._basecopy-3.0.0" = self.by-version."lodash._basecopy"."3.0.0"; - "lodash._baseslice-3.0.1" = self.by-version."lodash._baseslice"."3.0.1"; + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; "lodash._basevalues-3.0.0" = self.by-version."lodash._basevalues"."3.0.0"; - "lodash._isiterateecall-3.0.1" = self.by-version."lodash._isiterateecall"."3.0.1"; + "lodash._isiterateecall-3.0.2" = self.by-version."lodash._isiterateecall"."3.0.2"; "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; + "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0"; "lodash.keys-3.0.3" = self.by-version."lodash.keys"."3.0.3"; - "lodash.templatesettings-3.0.1" = self.by-version."lodash.templatesettings"."3.0.1"; + "lodash.templatesettings-3.1.0" = self.by-version."lodash.templatesettings"."3.1.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lodash.templatesettings"."^3.0.0" = - self.by-version."lodash.templatesettings"."3.0.1"; - by-version."lodash.templatesettings"."3.0.1" = self.buildNodePackage { - name = "lodash.templatesettings-3.0.1"; + self.by-version."lodash.templatesettings"."3.1.0"; + by-version."lodash.templatesettings"."3.1.0" = self.buildNodePackage { + name = "lodash.templatesettings-3.1.0"; + version = "3.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.1.tgz"; - name = "lodash.templatesettings-3.0.1.tgz"; - sha1 = "7e3e332d6216d475a9347eb929339c8ffa209cfe"; + url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"; + name = "lodash.templatesettings-3.1.0.tgz"; + sha1 = "53852fd832b920605a2eb61919bcbbfb8f385bb6"; }; deps = { - "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0"; - "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0"; "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."log-driver"."1.2.4" = self.by-version."log-driver"."1.2.4"; by-version."log-driver"."1.2.4" = self.buildNodePackage { name = "log-driver-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz"; @@ -16077,12 +21242,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."log4js"."~0.6.3" = self.by-version."log4js"."0.6.22"; by-version."log4js"."0.6.22" = self.buildNodePackage { name = "log4js-0.6.22"; + version = "0.6.22"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz"; @@ -16094,12 +21264,17 @@ "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "semver-1.1.4" = self.by-version."semver"."1.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."loggly"."0.3.x >=0.3.7" = self.by-version."loggly"."0.3.11"; by-version."loggly"."0.3.11" = self.buildNodePackage { name = "loggly-0.3.11"; + version = "0.3.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/loggly/-/loggly-0.3.11.tgz"; @@ -16110,12 +21285,17 @@ "request-2.9.203" = self.by-version."request"."2.9.203"; "timespan-2.3.0" = self.by-version."timespan"."2.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lolex"."1.1.0" = self.by-version."lolex"."1.1.0"; by-version."lolex"."1.1.0" = self.buildNodePackage { name = "lolex-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz"; @@ -16124,12 +21304,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."long"."~2 >=2.2.3" = self.by-version."long"."2.2.3"; by-version."long"."2.2.3" = self.buildNodePackage { name = "long-2.2.3"; + version = "2.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/long/-/long-2.2.3.tgz"; @@ -16138,12 +21323,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."longjohn"."~0.2.2" = self.by-version."longjohn"."0.2.4"; by-version."longjohn"."0.2.4" = self.buildNodePackage { name = "longjohn-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz"; @@ -16152,12 +21342,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lowercase-keys"."^1.0.0" = self.by-version."lowercase-keys"."1.0.0"; by-version."lowercase-keys"."1.0.0" = self.buildNodePackage { name = "lowercase-keys-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; @@ -16166,12 +21361,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."2" = self.by-version."lru-cache"."2.5.0"; by-version."lru-cache"."2.5.0" = self.buildNodePackage { name = "lru-cache-2.5.0"; + version = "2.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; @@ -16180,12 +21380,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."2.2.0" = self.by-version."lru-cache"."2.2.0"; by-version."lru-cache"."2.2.0" = self.buildNodePackage { name = "lru-cache-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; @@ -16194,12 +21399,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."2.2.x" = self.by-version."lru-cache"."2.2.4"; by-version."lru-cache"."2.2.4" = self.buildNodePackage { name = "lru-cache-2.2.4"; + version = "2.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; @@ -16208,12 +21418,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."2.3.0" = self.by-version."lru-cache"."2.3.0"; by-version."lru-cache"."2.3.0" = self.buildNodePackage { name = "lru-cache-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; @@ -16222,7 +21437,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."2.5.x" = self.by-version."lru-cache"."2.5.0"; @@ -16230,6 +21449,7 @@ self.by-version."lru-cache"."1.0.6"; by-version."lru-cache"."1.0.6" = self.buildNodePackage { name = "lru-cache-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; @@ -16238,12 +21458,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."~2.3.0" = self.by-version."lru-cache"."2.3.1"; by-version."lru-cache"."2.3.1" = self.buildNodePackage { name = "lru-cache-2.3.1"; + version = "2.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; @@ -16252,7 +21477,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; @@ -16260,6 +21489,7 @@ self.by-version."lru-queue"."0.1.0"; by-version."lru-queue"."0.1.0" = self.buildNodePackage { name = "lru-queue-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; @@ -16269,12 +21499,17 @@ deps = { "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."lsmod"."~0.0.3" = self.by-version."lsmod"."0.0.3"; by-version."lsmod"."0.0.3" = self.buildNodePackage { name = "lsmod-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz"; @@ -16283,12 +21518,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ltx"."*" = self.by-version."ltx"."0.9.0"; by-version."ltx"."0.9.0" = self.buildNodePackage { name = "ltx-0.9.0"; + version = "0.9.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ltx/-/ltx-0.9.0.tgz"; @@ -16299,7 +21539,11 @@ "sax-0.6.1" = self.by-version."sax"."0.6.1"; "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "ltx" = self.by-version."ltx"."0.9.0"; by-spec."ltx"."0.x" = @@ -16310,6 +21554,7 @@ self.by-version."ltx"."0.5.2"; by-version."ltx"."0.5.2" = self.buildNodePackage { name = "ltx-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ltx/-/ltx-0.5.2.tgz"; @@ -16320,7 +21565,11 @@ "sax-0.6.1" = self.by-version."sax"."0.6.1"; "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ltx"."^0.9.0" = self.by-version."ltx"."0.9.0"; @@ -16328,6 +21577,7 @@ self.by-version."ltx"."0.3.4"; by-version."ltx"."0.3.4" = self.buildNodePackage { name = "ltx-0.3.4"; + version = "0.3.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ltx/-/ltx-0.3.4.tgz"; @@ -16338,7 +21588,11 @@ "sax-0.6.1" = self.by-version."sax"."0.6.1"; "node-expat-2.1.4" = self.by-version."node-expat"."2.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ltx"."~0.3.3" = self.by-version."ltx"."0.3.4"; @@ -16346,6 +21600,7 @@ self.by-version."ltx"."0.6.0"; by-version."ltx"."0.6.0" = self.buildNodePackage { name = "ltx-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ltx/-/ltx-0.6.0.tgz"; @@ -16356,7 +21611,11 @@ "sax-0.6.1" = self.by-version."sax"."0.6.1"; "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ltx"."~0.x" = self.by-version."ltx"."0.9.0"; @@ -16364,6 +21623,7 @@ self.by-version."m8"."0.4.4"; by-version."m8"."0.4.4" = self.buildNodePackage { name = "m8-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/m8/-/m8-0.4.4.tgz"; @@ -16372,12 +21632,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."magnet-uri"."^2.0.1" = self.by-version."magnet-uri"."2.0.1"; by-version."magnet-uri"."2.0.1" = self.buildNodePackage { name = "magnet-uri-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; @@ -16387,7 +21652,11 @@ deps = { "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."magnet-uri"."~2.0.0" = self.by-version."magnet-uri"."2.0.1"; @@ -16395,6 +21664,7 @@ self.by-version."mailchimp"."1.1.0"; by-version."mailchimp"."1.1.0" = self.buildNodePackage { name = "mailchimp-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mailchimp/-/mailchimp-1.1.0.tgz"; @@ -16405,12 +21675,17 @@ "request-2.53.0" = self.by-version."request"."2.53.0"; "qs-0.5.6" = self.by-version."qs"."0.5.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mailcomposer".">= 0.1.27" = self.by-version."mailcomposer"."0.2.12"; by-version."mailcomposer"."0.2.12" = self.buildNodePackage { name = "mailcomposer-0.2.12"; + version = "0.2.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz"; @@ -16418,13 +21693,17 @@ sha1 = "4d02a604616adcb45fb36d37513f4c1bd0b75681"; }; deps = { - "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18"; + "mimelib-0.2.19" = self.by-version."mimelib"."0.2.19"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "he-0.3.6" = self.by-version."he"."0.3.6"; "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; "dkim-signer-0.1.2" = self.by-version."dkim-signer"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mailcomposer"."~0.2.10" = self.by-version."mailcomposer"."0.2.12"; @@ -16432,6 +21711,7 @@ self.by-version."mailgun-js"."0.6.8"; by-version."mailgun-js"."0.6.8" = self.buildNodePackage { name = "mailgun-js-0.6.8"; + version = "0.6.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.8.tgz"; @@ -16447,12 +21727,17 @@ "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."map-obj"."^1.0.0" = self.by-version."map-obj"."1.0.0"; by-version."map-obj"."1.0.0" = self.buildNodePackage { name = "map-obj-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"; @@ -16461,12 +21746,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."marked"."*" = self.by-version."marked"."0.3.3"; by-version."marked"."0.3.3" = self.buildNodePackage { name = "marked-0.3.3"; + version = "0.3.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz"; @@ -16475,19 +21765,22 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "marked" = self.by-version."marked"."0.3.3"; by-spec."marked".">=0.2.9" = self.by-version."marked"."0.3.3"; - by-spec."marked".">=0.3.1" = - self.by-version."marked"."0.3.3"; by-spec."marked"."^0.3.2" = self.by-version."marked"."0.3.3"; by-spec."mathjs"."~0.19.0" = self.by-version."mathjs"."0.19.0"; by-version."mathjs"."0.19.0" = self.buildNodePackage { name = "mathjs-0.19.0"; + version = "0.19.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mathjs/-/mathjs-0.19.0.tgz"; @@ -16497,12 +21790,17 @@ deps = { "bignumber.js-1.5.0" = self.by-version."bignumber.js"."1.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."maxmin"."^1.0.0" = self.by-version."maxmin"."1.0.0"; by-version."maxmin"."1.0.0" = self.buildNodePackage { name = "maxmin-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/maxmin/-/maxmin-1.0.0.tgz"; @@ -16515,28 +21813,17 @@ "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0"; "pretty-bytes-1.0.3" = self.by-version."pretty-bytes"."1.0.3"; }; - peerDependencies = []; - }; - by-spec."mdns-js"."0.2.x" = - self.by-version."mdns-js"."0.2.9"; - by-version."mdns-js"."0.2.9" = self.buildNodePackage { - name = "mdns-js-0.2.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mdns-js/-/mdns-js-0.2.9.tgz"; - name = "mdns-js-0.2.9.tgz"; - sha1 = "4b0a77da832fe3857736f584b99ee07912f0c1e0"; - }; - deps = { - "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" = self.by-version."mdns-js"."0.2.5"; by-version."mdns-js"."0.2.5" = self.buildNodePackage { name = "mdns-js-0.2.5"; + version = "0.2.5"; bin = false; src = fetchgit { url = "https://github.com/guerrerocarlos/node-mdns-js"; @@ -16547,12 +21834,39 @@ "debug-0.8.1" = self.by-version."debug"."0.8.1"; "mdns-js-packet-0.1.9" = self.by-version."mdns-js-packet"."0.1.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mdns-js"."git+https://github.com/xat/node-mdns-js#reuseAddr" = + self.by-version."mdns-js"."0.2.9"; + by-version."mdns-js"."0.2.9" = self.buildNodePackage { + name = "mdns-js-0.2.9"; + version = "0.2.9"; + bin = false; + src = fetchgit { + url = "https://github.com/xat/node-mdns-js"; + rev = "bc5598ff86c441cb256503e3d951e8b6b8079e8a"; + sha256 = "93595e09e7802a67c1923630be4ac20410f0ac8b89c34e200b943f7157f395f6"; + }; + deps = { + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mdns-js-packet"."0.1.x" = self.by-version."mdns-js-packet"."0.1.8"; by-version."mdns-js-packet"."0.1.8" = self.buildNodePackage { name = "mdns-js-packet-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz"; @@ -16563,12 +21877,17 @@ "debug-2.1.1" = self.by-version."debug"."2.1.1"; "qap-3.1.3" = self.by-version."qap"."3.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mdns-js-packet"."guerrerocarlos/node-mdns-js-packet" = self.by-version."mdns-js-packet"."0.1.9"; by-version."mdns-js-packet"."0.1.9" = self.buildNodePackage { name = "mdns-js-packet-0.1.9"; + version = "0.1.9"; bin = false; src = fetchgit { url = "git://github.com/guerrerocarlos/node-mdns-js-packet"; @@ -16579,12 +21898,17 @@ "debug-2.1.1" = self.by-version."debug"."2.1.1"; "qap-3.1.3" = self.by-version."qap"."3.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."meat"."*" = self.by-version."meat"."0.3.3"; by-version."meat"."0.3.3" = self.buildNodePackage { name = "meat-0.3.3"; + version = "0.3.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/meat/-/meat-0.3.3.tgz"; @@ -16599,13 +21923,18 @@ "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; "node.extend-1.0.0" = self.by-version."node.extend"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "meat" = self.by-version."meat"."0.3.3"; by-spec."media-typer"."0.2.0" = self.by-version."media-typer"."0.2.0"; by-version."media-typer"."0.2.0" = self.buildNodePackage { name = "media-typer-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; @@ -16614,12 +21943,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."media-typer"."0.3.0" = self.by-version."media-typer"."0.3.0"; by-version."media-typer"."0.3.0" = self.buildNodePackage { name = "media-typer-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; @@ -16628,12 +21962,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."memoizee"."0.3.x" = self.by-version."memoizee"."0.3.8"; by-version."memoizee"."0.3.8" = self.buildNodePackage { name = "memoizee-0.3.8"; + version = "0.3.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz"; @@ -16649,12 +21988,38 @@ "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."memory-fs"."^0.2.0" = + self.by-version."memory-fs"."0.2.0"; + by-version."memory-fs"."0.2.0" = self.buildNodePackage { + name = "memory-fs-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"; + name = "memory-fs-0.2.0.tgz"; + sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."memory-fs"."~0.2.0" = + self.by-version."memory-fs"."0.2.0"; by-spec."memwatch"."^0.2.2" = self.by-version."memwatch"."0.2.2"; by-version."memwatch"."0.2.2" = self.buildNodePackage { name = "memwatch-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/memwatch/-/memwatch-0.2.2.tgz"; @@ -16663,12 +22028,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."meow"."*" = self.by-version."meow"."3.0.0"; by-version."meow"."3.0.0" = self.buildNodePackage { name = "meow-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/meow/-/meow-3.0.0.tgz"; @@ -16681,7 +22051,11 @@ "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."meow"."^3.0.0" = self.by-version."meow"."3.0.0"; @@ -16689,6 +22063,7 @@ self.by-version."merge-descriptors"."0.0.2"; by-version."merge-descriptors"."0.0.2" = self.buildNodePackage { name = "merge-descriptors-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; @@ -16697,12 +22072,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."method-override"."1.0.0" = self.by-version."method-override"."1.0.0"; by-version."method-override"."1.0.0" = self.buildNodePackage { name = "method-override-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz"; @@ -16712,12 +22092,17 @@ deps = { "methods-1.1.1" = self.by-version."methods"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."method-override"."^1.0.0" = self.by-version."method-override"."1.0.2"; by-version."method-override"."1.0.2" = self.buildNodePackage { name = "method-override-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/method-override/-/method-override-1.0.2.tgz"; @@ -16727,12 +22112,17 @@ deps = { "methods-1.0.0" = self.by-version."methods"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."method-override"."~2.2.0" = self.by-version."method-override"."2.2.0"; by-version."method-override"."2.2.0" = self.buildNodePackage { name = "method-override-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz"; @@ -16745,12 +22135,17 @@ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."method-override"."~2.3.1" = self.by-version."method-override"."2.3.1"; by-version."method-override"."2.3.1" = self.buildNodePackage { name = "method-override-2.3.1"; + version = "2.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/method-override/-/method-override-2.3.1.tgz"; @@ -16763,12 +22158,17 @@ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."*" = self.by-version."methods"."1.1.1"; by-version."methods"."1.1.1" = self.buildNodePackage { name = "methods-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; @@ -16777,12 +22177,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = self.buildNodePackage { name = "methods-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; @@ -16791,12 +22196,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."0.1.0" = self.by-version."methods"."0.1.0"; by-version."methods"."0.1.0" = self.buildNodePackage { name = "methods-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; @@ -16805,12 +22215,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."1.0.0" = self.by-version."methods"."1.0.0"; by-version."methods"."1.0.0" = self.buildNodePackage { name = "methods-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz"; @@ -16819,12 +22234,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."1.0.1" = self.by-version."methods"."1.0.1"; by-version."methods"."1.0.1" = self.buildNodePackage { name = "methods-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; @@ -16833,12 +22253,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."1.1.0" = self.by-version."methods"."1.1.0"; by-version."methods"."1.1.0" = self.buildNodePackage { name = "methods-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; @@ -16847,7 +22272,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."methods"."1.1.1" = self.by-version."methods"."1.1.1"; @@ -16859,6 +22288,7 @@ self.by-version."microee"."0.0.2"; by-version."microee"."0.0.2" = self.buildNodePackage { name = "microee-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz"; @@ -16867,12 +22297,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."miller-rabin"."^1.1.2" = self.by-version."miller-rabin"."1.1.5"; by-version."miller-rabin"."1.1.5" = self.buildNodePackage { name = "miller-rabin-1.1.5"; + version = "1.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz"; @@ -16883,12 +22318,17 @@ "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "brorand-1.0.5" = self.by-version."brorand"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime"."*" = self.by-version."mime"."1.3.4"; by-version."mime"."1.3.4" = self.buildNodePackage { name = "mime-1.3.4"; + version = "1.3.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; @@ -16897,12 +22337,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime"."1.2.11" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = self.buildNodePackage { name = "mime-1.2.11"; + version = "1.2.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; @@ -16911,12 +22356,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime"."1.2.4" = self.by-version."mime"."1.2.4"; by-version."mime"."1.2.4" = self.buildNodePackage { name = "mime-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; @@ -16925,12 +22375,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime"."1.2.6" = self.by-version."mime"."1.2.6"; by-version."mime"."1.2.6" = self.buildNodePackage { name = "mime-1.2.6"; + version = "1.2.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; @@ -16939,12 +22394,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime"."1.2.9" = self.by-version."mime"."1.2.9"; by-version."mime"."1.2.9" = self.buildNodePackage { name = "mime-1.2.9"; + version = "1.2.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; @@ -16953,7 +22413,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime"."1.3.4" = self.by-version."mime"."1.3.4"; @@ -16975,6 +22439,7 @@ self.by-version."mime-db"."1.7.0"; by-version."mime-db"."1.7.0" = self.buildNodePackage { name = "mime-db-1.7.0"; + version = "1.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"; @@ -16983,7 +22448,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime-db"."~1.7.0" = self.by-version."mime-db"."1.7.0"; @@ -16991,6 +22460,7 @@ self.by-version."mime-types"."2.0.9"; by-version."mime-types"."2.0.9" = self.buildNodePackage { name = "mime-types-2.0.9"; + version = "2.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz"; @@ -17000,12 +22470,17 @@ deps = { "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime-types"."~1.0.0" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = self.buildNodePackage { name = "mime-types-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; @@ -17014,7 +22489,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; @@ -17027,25 +22506,31 @@ by-spec."mime-types"."~2.0.9" = self.by-version."mime-types"."2.0.9"; by-spec."mimelib"."~0.2.15" = - self.by-version."mimelib"."0.2.18"; - by-version."mimelib"."0.2.18" = self.buildNodePackage { - name = "mimelib-0.2.18"; + self.by-version."mimelib"."0.2.19"; + by-version."mimelib"."0.2.19" = self.buildNodePackage { + name = "mimelib-0.2.19"; + version = "0.2.19"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.18.tgz"; - name = "mimelib-0.2.18.tgz"; - sha1 = "2e631a3db449026fcb85099398b7bd750eac46a7"; + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz"; + name = "mimelib-0.2.19.tgz"; + sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee"; }; deps = { "encoding-0.1.11" = self.by-version."encoding"."0.1.11"; - "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; + "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mine"."~0.0.1" = self.by-version."mine"."0.0.2"; by-version."mine"."0.0.2" = self.buildNodePackage { name = "mine-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mine/-/mine-0.0.2.tgz"; @@ -17054,12 +22539,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minilog"."~2.0.2" = self.by-version."minilog"."2.0.6"; by-version."minilog"."2.0.6" = self.buildNodePackage { name = "minilog-2.0.6"; + version = "2.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minilog/-/minilog-2.0.6.tgz"; @@ -17069,12 +22559,17 @@ deps = { "microee-0.0.2" = self.by-version."microee"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimalistic-assert"."^1.0.0" = self.by-version."minimalistic-assert"."1.0.0"; by-version."minimalistic-assert"."1.0.0" = self.buildNodePackage { name = "minimalistic-assert-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; @@ -17083,12 +22578,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."0.0.x" = self.by-version."minimatch"."0.0.5"; by-version."minimatch"."0.0.5" = self.buildNodePackage { name = "minimatch-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; @@ -17098,12 +22598,17 @@ deps = { "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."0.3" = self.by-version."minimatch"."0.3.0"; by-version."minimatch"."0.3.0" = self.buildNodePackage { name = "minimatch-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; @@ -17114,12 +22619,17 @@ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."0.x" = self.by-version."minimatch"."0.4.0"; by-version."minimatch"."0.4.0" = self.buildNodePackage { name = "minimatch-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz"; @@ -17130,12 +22640,17 @@ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."1" = self.by-version."minimatch"."1.0.0"; by-version."minimatch"."1.0.0" = self.buildNodePackage { name = "minimatch-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; @@ -17146,7 +22661,11 @@ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."1.0.x" = self.by-version."minimatch"."1.0.0"; @@ -17154,6 +22673,7 @@ self.by-version."minimatch"."2.0.1"; by-version."minimatch"."2.0.1" = self.buildNodePackage { name = "minimatch-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz"; @@ -17163,7 +22683,11 @@ deps = { "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."^1.0.0" = self.by-version."minimatch"."1.0.0"; @@ -17173,6 +22697,7 @@ self.by-version."minimatch"."0.2.14"; by-version."minimatch"."0.2.14" = self.buildNodePackage { name = "minimatch-0.2.14"; + version = "0.2.14"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; @@ -17183,7 +22708,11 @@ "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimatch"."~0.2.0" = self.by-version."minimatch"."0.2.14"; @@ -17203,6 +22732,7 @@ self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = self.buildNodePackage { name = "minimist-0.0.8"; + version = "0.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; @@ -17211,12 +22741,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."minimist"."^1.1.0" = + by-spec."minimist"."1.1.0" = self.by-version."minimist"."1.1.0"; by-version."minimist"."1.1.0" = self.buildNodePackage { name = "minimist-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"; @@ -17225,12 +22760,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."minimist"."^1.1.0" = + self.by-version."minimist"."1.1.0"; by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.10"; by-version."minimist"."0.0.10" = self.buildNodePackage { name = "minimist-0.0.10"; + version = "0.0.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; @@ -17239,7 +22781,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimist"."~0.0.5" = self.by-version."minimist"."0.0.10"; @@ -17249,6 +22795,7 @@ self.by-version."minimist"."0.2.0"; by-version."minimist"."0.2.0" = self.buildNodePackage { name = "minimist-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; @@ -17257,7 +22804,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."minimist"."~1.1.0" = self.by-version."minimist"."1.1.0"; @@ -17265,6 +22816,7 @@ self.by-version."ministyle"."0.1.4"; by-version."ministyle"."0.1.4" = self.buildNodePackage { name = "ministyle-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz"; @@ -17273,12 +22825,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."miniwrite"."~0.1.3" = self.by-version."miniwrite"."0.1.4"; by-version."miniwrite"."0.1.4" = self.buildNodePackage { name = "miniwrite-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz"; @@ -17288,12 +22845,17 @@ deps = { "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mkdirp"."*" = self.by-version."mkdirp"."0.5.0"; by-version."mkdirp"."0.5.0" = self.buildNodePackage { name = "mkdirp-0.5.0"; + version = "0.5.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; @@ -17303,13 +22865,18 @@ deps = { "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "mkdirp" = self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."0.0.x" = self.by-version."mkdirp"."0.0.7"; by-version."mkdirp"."0.0.7" = self.buildNodePackage { name = "mkdirp-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz"; @@ -17318,12 +22885,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mkdirp"."0.3.0" = self.by-version."mkdirp"."0.3.0"; by-version."mkdirp"."0.3.0" = self.buildNodePackage { name = "mkdirp-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; @@ -17332,12 +22904,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mkdirp"."0.3.5" = self.by-version."mkdirp"."0.3.5"; by-version."mkdirp"."0.3.5" = self.buildNodePackage { name = "mkdirp-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; @@ -17346,7 +22923,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mkdirp"."0.3.x" = self.by-version."mkdirp"."0.3.5"; @@ -17354,6 +22935,7 @@ self.by-version."mkdirp"."0.4.0"; by-version."mkdirp"."0.4.0" = self.buildNodePackage { name = "mkdirp-0.4.0"; + version = "0.4.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz"; @@ -17362,7 +22944,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mkdirp"."0.5" = self.by-version."mkdirp"."0.5.0"; @@ -17394,6 +22980,7 @@ self.by-version."mkpath"."0.1.0"; by-version."mkpath"."0.1.0" = self.buildNodePackage { name = "mkpath-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; @@ -17402,12 +22989,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mocha"."*" = self.by-version."mocha"."2.1.0"; by-version."mocha"."2.1.0" = self.buildNodePackage { name = "mocha-2.1.0"; + version = "2.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mocha/-/mocha-2.1.0.tgz"; @@ -17424,13 +23016,18 @@ "jade-0.26.3" = self.by-version."jade"."0.26.3"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "mocha" = self.by-version."mocha"."2.1.0"; by-spec."mocha"."~1.20.1" = self.by-version."mocha"."1.20.1"; by-version."mocha"."1.20.1" = self.buildNodePackage { name = "mocha-1.20.1"; + version = "1.20.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz"; @@ -17446,12 +23043,17 @@ "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "glob-3.2.3" = self.by-version."glob"."3.2.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mocha-phantomjs"."*" = self.by-version."mocha-phantomjs"."3.5.3"; by-version."mocha-phantomjs"."3.5.3" = self.buildNodePackage { name = "mocha-phantomjs-3.5.3"; + version = "3.5.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.3.tgz"; @@ -17462,14 +23064,19 @@ "mocha-1.20.1" = self.by-version."mocha"."1.20.1"; "commander-2.0.0" = self.by-version."commander"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = [ self.by-version."phantomjs"."1.9.15"]; + os = [ ]; + cpu = [ ]; }; "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.3"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = self.buildNodePackage { name = "mocha-unfunk-reporter-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz"; @@ -17482,22 +23089,27 @@ "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-spec."module-deps"."^3.6.3" = - self.by-version."module-deps"."3.7.1"; - by-version."module-deps"."3.7.1" = self.buildNodePackage { - name = "module-deps-3.7.1"; + self.by-version."module-deps"."3.7.2"; + by-version."module-deps"."3.7.2" = self.buildNodePackage { + name = "module-deps-3.7.2"; + version = "3.7.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.1.tgz"; - name = "module-deps-3.7.1.tgz"; - sha1 = "5bbaaf9e6ba252cf0912b9839f47a3b1e46e0a42"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.2.tgz"; + name = "module-deps-3.7.2.tgz"; + sha1 = "bd4ceaca556b16032ac5abbf47ac61bc0ff5c349"; }; deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0"; + "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "detective-4.0.0" = self.by-version."detective"."4.0.0"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; @@ -17505,18 +23117,26 @@ "minimist-0.2.0" = self.by-version."minimist"."0.2.0"; "parents-1.0.1" = self.by-version."parents"."1.0.1"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "resolve-1.1.3" = self.by-version."resolve"."1.1.3"; + "resolve-1.1.5" = self.by-version."resolve"."1.1.5"; "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2"; "subarg-0.0.1" = self.by-version."subarg"."0.0.1"; "through2-0.4.2" = self.by-version."through2"."0.4.2"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."module-deps"."^3.7.0" = + self.by-version."module-deps"."3.7.2"; by-spec."module-deps"."~1.2.2" = self.by-version."module-deps"."1.2.2"; by-version."module-deps"."1.2.2" = self.buildNodePackage { name = "module-deps-1.2.2"; + version = "1.2.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/module-deps/-/module-deps-1.2.2.tgz"; @@ -17533,12 +23153,17 @@ "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; "parents-0.0.2" = self.by-version."parents"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."module-deps"."~1.4.0" = self.by-version."module-deps"."1.4.2"; by-version."module-deps"."1.4.2" = self.buildNodePackage { name = "module-deps-1.4.2"; + version = "1.4.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/module-deps/-/module-deps-1.4.2.tgz"; @@ -17555,12 +23180,17 @@ "parents-0.0.2" = self.by-version."parents"."0.0.2"; "mine-0.0.2" = self.by-version."mine"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = self.buildNodePackage { name = "moment-2.1.0"; + version = "2.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; @@ -17569,12 +23199,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment".">= 2.1.0" = self.by-version."moment"."2.9.0"; by-version."moment"."2.9.0" = self.buildNodePackage { name = "moment-2.9.0"; + version = "2.9.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.9.0.tgz"; @@ -17583,7 +23218,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment".">= 2.6.0" = self.by-version."moment"."2.9.0"; @@ -17597,6 +23236,7 @@ self.by-version."moment"."2.4.0"; by-version."moment"."2.4.0" = self.buildNodePackage { name = "moment-2.4.0"; + version = "2.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz"; @@ -17605,12 +23245,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment"."~2.5.1" = self.by-version."moment"."2.5.1"; by-version."moment"."2.5.1" = self.buildNodePackage { name = "moment-2.5.1"; + version = "2.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz"; @@ -17619,12 +23264,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment"."~2.8.4" = self.by-version."moment"."2.8.4"; by-version."moment"."2.8.4" = self.buildNodePackage { name = "moment-2.8.4"; + version = "2.8.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.8.4.tgz"; @@ -17633,12 +23283,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment-timezone"."0.0.3" = self.by-version."moment-timezone"."0.0.3"; by-version."moment-timezone"."0.0.3" = self.buildNodePackage { name = "moment-timezone-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.0.3.tgz"; @@ -17648,12 +23303,17 @@ deps = { "moment-2.9.0" = self.by-version."moment"."2.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."moment-timezone"."0.2.4" = self.by-version."moment-timezone"."0.2.4"; by-version."moment-timezone"."0.2.4" = self.buildNodePackage { name = "moment-timezone-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.2.4.tgz"; @@ -17663,12 +23323,17 @@ deps = { "moment-2.9.0" = self.by-version."moment"."2.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = self.buildNodePackage { name = "mongodb-1.2.14"; + version = "1.2.14"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; @@ -17678,12 +23343,17 @@ deps = { "bson-0.1.8" = self.by-version."bson"."0.1.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongodb"."1.3.19" = self.by-version."mongodb"."1.3.19"; by-version."mongodb"."1.3.19" = self.buildNodePackage { name = "mongodb-1.3.19"; + version = "1.3.19"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; @@ -17692,14 +23362,19 @@ }; deps = { "bson-0.2.2" = self.by-version."bson"."0.2.2"; + }; + optionalDependencies = { "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongodb"."1.4.12" = self.by-version."mongodb"."1.4.12"; by-version."mongodb"."1.4.12" = self.buildNodePackage { name = "mongodb-1.4.12"; + version = "1.4.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz"; @@ -17708,15 +23383,20 @@ }; deps = { "bson-0.2.19" = self.by-version."bson"."0.2.19"; + }; + optionalDependencies = { "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongodb"."1.4.28" = self.by-version."mongodb"."1.4.28"; by-version."mongodb"."1.4.28" = self.buildNodePackage { name = "mongodb-1.4.28"; + version = "1.4.28"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.28.tgz"; @@ -17725,15 +23405,20 @@ }; deps = { "bson-0.2.19" = self.by-version."bson"."0.2.19"; + }; + optionalDependencies = { "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongodb".">= 1.2.0 <2.1.0" = self.by-version."mongodb"."2.0.16"; by-version."mongodb"."2.0.16" = self.buildNodePackage { name = "mongodb-2.0.16"; + version = "2.0.16"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.16.tgz"; @@ -17744,7 +23429,11 @@ "mongodb-core-1.1.12" = self.by-version."mongodb-core"."1.1.12"; "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongodb"."~2.0" = self.by-version."mongodb"."2.0.16"; @@ -17752,6 +23441,7 @@ self.by-version."mongodb-core"."1.1.12"; by-version."mongodb-core"."1.1.12" = self.buildNodePackage { name = "mongodb-core-1.1.12"; + version = "1.1.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.12.tgz"; @@ -17762,14 +23452,19 @@ "bson-0.2.19" = self.by-version."bson"."0.2.19"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6"; + }; + optionalDependencies = { "kerberos-0.0.9" = self.by-version."kerberos"."0.0.9"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongoose"."3.6.7" = self.by-version."mongoose"."3.6.7"; by-version."mongoose"."3.6.7" = self.buildNodePackage { name = "mongoose-3.6.7"; + version = "3.6.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; @@ -17785,12 +23480,17 @@ "mpromise-0.2.1" = self.by-version."mpromise"."0.2.1"; "mpath-0.1.1" = self.by-version."mpath"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongoose"."3.6.x" = self.by-version."mongoose"."3.6.20"; by-version."mongoose"."3.6.20" = self.buildNodePackage { name = "mongoose-3.6.20"; + version = "3.6.20"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz"; @@ -17807,13 +23507,18 @@ "mpath-0.1.1" = self.by-version."mpath"."0.1.1"; "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "mongoose" = self.by-version."mongoose"."3.6.20"; by-spec."mongoose"."3.8.x" = self.by-version."mongoose"."3.8.23"; by-version."mongoose"."3.8.23" = self.buildNodePackage { name = "mongoose-3.8.23"; + version = "3.8.23"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.23.tgz"; @@ -17831,12 +23536,17 @@ "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1"; "mquery-0.8.0" = self.by-version."mquery"."0.8.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongoose"."3.9.7" = self.by-version."mongoose"."3.9.7"; by-version."mongoose"."3.9.7" = self.buildNodePackage { name = "mongoose-3.9.7"; + version = "3.9.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.7.tgz"; @@ -17856,12 +23566,17 @@ "mquery-1.0.0" = self.by-version."mquery"."1.0.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongoose-lifecycle"."1.0.0" = self.by-version."mongoose-lifecycle"."1.0.0"; by-version."mongoose-lifecycle"."1.0.0" = self.buildNodePackage { name = "mongoose-lifecycle-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; @@ -17870,12 +23585,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mongoose-schema-extend"."*" = self.by-version."mongoose-schema-extend"."0.1.7"; by-version."mongoose-schema-extend"."0.1.7" = self.buildNodePackage { name = "mongoose-schema-extend-0.1.7"; + version = "0.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz"; @@ -17885,13 +23605,18 @@ deps = { "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.7"; by-spec."monocle"."1.1.50" = self.by-version."monocle"."1.1.50"; by-version."monocle"."1.1.50" = self.buildNodePackage { name = "monocle-1.1.50"; + version = "1.1.50"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz"; @@ -17901,12 +23626,17 @@ deps = { "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."monocle"."1.1.51" = self.by-version."monocle"."1.1.51"; by-version."monocle"."1.1.51" = self.buildNodePackage { name = "monocle-1.1.51"; + version = "1.1.51"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz"; @@ -17916,12 +23646,17 @@ deps = { "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."morgan"."1.0.0" = self.by-version."morgan"."1.0.0"; by-version."morgan"."1.0.0" = self.buildNodePackage { name = "morgan-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; @@ -17931,12 +23666,17 @@ deps = { "bytes-0.2.1" = self.by-version."bytes"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."morgan"."1.2.0" = self.by-version."morgan"."1.2.0"; by-version."morgan"."1.2.0" = self.buildNodePackage { name = "morgan-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/morgan/-/morgan-1.2.0.tgz"; @@ -17949,12 +23689,17 @@ "depd-0.4.2" = self.by-version."depd"."0.4.2"; "finished-1.2.2" = self.by-version."finished"."1.2.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."morgan"."~1.3.2" = + by-spec."morgan"."~1.3.1" = self.by-version."morgan"."1.3.2"; by-version."morgan"."1.3.2" = self.buildNodePackage { name = "morgan-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz"; @@ -17966,12 +23711,19 @@ "depd-0.4.5" = self.by-version."depd"."0.4.5"; "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."morgan"."~1.3.2" = + self.by-version."morgan"."1.3.2"; by-spec."morgan"."~1.5.1" = self.by-version."morgan"."1.5.1"; by-version."morgan"."1.5.1" = self.buildNodePackage { name = "morgan-1.5.1"; + version = "1.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/morgan/-/morgan-1.5.1.tgz"; @@ -17984,12 +23736,17 @@ "depd-1.0.0" = self.by-version."depd"."1.0.0"; "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mount-point"."^1.0.0" = self.by-version."mount-point"."1.0.3"; by-version."mount-point"."1.0.3" = self.buildNodePackage { name = "mount-point-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz"; @@ -17999,12 +23756,17 @@ deps = { "node-df-0.1.1" = self.by-version."node-df"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mout"."~0.9.0" = self.by-version."mout"."0.9.1"; by-version."mout"."0.9.1" = self.buildNodePackage { name = "mout-0.9.1"; + version = "0.9.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; @@ -18013,12 +23775,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = self.buildNodePackage { name = "mpath-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; @@ -18027,12 +23794,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mpromise"."0.2.1" = self.by-version."mpromise"."0.2.1"; by-version."mpromise"."0.2.1" = self.buildNodePackage { name = "mpromise-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; @@ -18042,12 +23814,17 @@ deps = { "sliced-0.0.4" = self.by-version."sliced"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mpromise"."0.4.3" = self.by-version."mpromise"."0.4.3"; by-version."mpromise"."0.4.3" = self.buildNodePackage { name = "mpromise-0.4.3"; + version = "0.4.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz"; @@ -18056,12 +23833,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mpromise"."0.5.4" = self.by-version."mpromise"."0.5.4"; by-version."mpromise"."0.5.4" = self.buildNodePackage { name = "mpromise-0.5.4"; + version = "0.5.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz"; @@ -18070,12 +23852,37 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mqtt"."0.3.x" = + self.by-version."mqtt"."0.3.13"; + by-version."mqtt"."0.3.13" = self.buildNodePackage { + name = "mqtt-0.3.13"; + version = "0.3.13"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mqtt/-/mqtt-0.3.13.tgz"; + name = "mqtt-0.3.13.tgz"; + sha1 = "f65fbe323901b664427b471658428dcfa1d5bee4"; + }; + deps = { + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mquery"."0.8.0" = self.by-version."mquery"."0.8.0"; by-version."mquery"."0.8.0" = self.buildNodePackage { name = "mquery-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz"; @@ -18087,12 +23894,17 @@ "debug-0.7.4" = self.by-version."debug"."0.7.4"; "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mquery"."1.0.0" = self.by-version."mquery"."1.0.0"; by-version."mquery"."1.0.0" = self.buildNodePackage { name = "mquery-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mquery/-/mquery-1.0.0.tgz"; @@ -18104,12 +23916,17 @@ "debug-0.7.4" = self.by-version."debug"."0.7.4"; "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ms"."0.1.0" = self.by-version."ms"."0.1.0"; by-version."ms"."0.1.0" = self.buildNodePackage { name = "ms-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; @@ -18118,12 +23935,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ms"."0.6.2" = self.by-version."ms"."0.6.2"; by-version."ms"."0.6.2" = self.buildNodePackage { name = "ms-0.6.2"; + version = "0.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; @@ -18132,12 +23954,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ms"."0.7.0" = self.by-version."ms"."0.7.0"; by-version."ms"."0.7.0" = self.buildNodePackage { name = "ms-0.7.0"; + version = "0.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; @@ -18146,12 +23973,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."msgpack".">= 0.0.1" = self.by-version."msgpack"."0.2.6"; by-version."msgpack"."0.2.6" = self.buildNodePackage { name = "msgpack-0.2.6"; + version = "0.2.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.6.tgz"; @@ -18161,17 +23993,22 @@ deps = { "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."multer".">=0.0.6" = - self.by-version."multer"."0.1.7"; - by-version."multer"."0.1.7" = self.buildNodePackage { - name = "multer-0.1.7"; + self.by-version."multer"."0.1.8"; + by-version."multer"."0.1.8" = self.buildNodePackage { + name = "multer-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/multer/-/multer-0.1.7.tgz"; - name = "multer-0.1.7.tgz"; - sha1 = "bc2b7f72a32ad08496e209881ee348f38c495b22"; + url = "http://registry.npmjs.org/multer/-/multer-0.1.8.tgz"; + name = "multer-0.1.8.tgz"; + sha1 = "551b8a6015093701bcacc964916b1ae06578f37b"; }; deps = { "busboy-0.2.9" = self.by-version."busboy"."0.2.9"; @@ -18179,12 +24016,17 @@ "qs-1.2.2" = self.by-version."qs"."1.2.2"; "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."multiparty"."2.2.0" = self.by-version."multiparty"."2.2.0"; by-version."multiparty"."2.2.0" = self.buildNodePackage { name = "multiparty-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; @@ -18195,12 +24037,17 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."multiparty"."3.3.2" = self.by-version."multiparty"."3.3.2"; by-version."multiparty"."3.3.2" = self.buildNodePackage { name = "multiparty-3.3.2"; + version = "3.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; @@ -18211,7 +24058,11 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."multiparty"."~3.3.2" = self.by-version."multiparty"."3.3.2"; @@ -18219,6 +24070,7 @@ self.by-version."multipipe"."0.1.2"; by-version."multipipe"."0.1.2" = self.buildNodePackage { name = "multipipe-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; @@ -18228,12 +24080,17 @@ deps = { "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."muri"."0.3.1" = self.by-version."muri"."0.3.1"; by-version."muri"."0.3.1" = self.buildNodePackage { name = "muri-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; @@ -18242,12 +24099,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mustache"."1.0.0" = + self.by-version."mustache"."1.0.0"; + by-version."mustache"."1.0.0" = self.buildNodePackage { + name = "mustache-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mustache/-/mustache-1.0.0.tgz"; + name = "mustache-1.0.0.tgz"; + sha1 = "8f5b8f68041dbead10997e0ba1d024771a03e15a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mutate.js"."^0.2.0" = self.by-version."mutate.js"."0.2.0"; by-version."mutate.js"."0.2.0" = self.buildNodePackage { name = "mutate.js-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz"; @@ -18256,12 +24137,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mute-stream"."0.0.4" = self.by-version."mute-stream"."0.0.4"; by-version."mute-stream"."0.0.4" = self.buildNodePackage { name = "mute-stream-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; @@ -18270,7 +24156,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mute-stream"."~0.0.4" = self.by-version."mute-stream"."0.0.4"; @@ -18278,6 +24168,7 @@ self.by-version."mv"."0.0.5"; by-version."mv"."0.0.5" = self.buildNodePackage { name = "mv-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz"; @@ -18286,12 +24177,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mv"."~2" = self.by-version."mv"."2.0.3"; by-version."mv"."2.0.3" = self.buildNodePackage { name = "mv-2.0.3"; + version = "2.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz"; @@ -18303,12 +24199,17 @@ "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."mz"."1" = self.by-version."mz"."1.3.0"; by-version."mz"."1.3.0" = self.buildNodePackage { name = "mz-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/mz/-/mz-1.3.0.tgz"; @@ -18320,12 +24221,36 @@ "thenify-3.1.0" = self.by-version."thenify"."3.1.0"; "thenify-all-1.6.0" = self.by-version."thenify-all"."1.6.0"; }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."*" = + self.by-version."nan"."1.6.2"; + by-version."nan"."1.6.2" = self.buildNodePackage { + name = "nan-1.6.2"; + version = "1.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz"; + name = "nan-1.6.2.tgz"; + sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8"; + }; + deps = { + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."1.1.2" = self.by-version."nan"."1.1.2"; by-version."nan"."1.1.2" = self.buildNodePackage { name = "nan-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz"; @@ -18334,12 +24259,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."1.3.0" = self.by-version."nan"."1.3.0"; by-version."nan"."1.3.0" = self.buildNodePackage { name = "nan-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz"; @@ -18348,12 +24278,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."1.5.0" = self.by-version."nan"."1.5.0"; by-version."nan"."1.5.0" = self.buildNodePackage { name = "nan-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz"; @@ -18362,22 +24297,14 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."1.6.2" = self.by-version."nan"."1.6.2"; - by-version."nan"."1.6.2" = self.buildNodePackage { - name = "nan-1.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz"; - name = "nan-1.6.2.tgz"; - sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."nan"."1.6.x" = self.by-version."nan"."1.6.2"; by-spec."nan".">=1.3.0" = @@ -18392,6 +24319,7 @@ self.by-version."nan"."0.3.2"; by-version."nan"."0.3.2" = self.buildNodePackage { name = "nan-0.3.2"; + version = "0.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; @@ -18400,12 +24328,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."~0.6.0" = self.by-version."nan"."0.6.0"; by-version."nan"."0.6.0" = self.buildNodePackage { name = "nan-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz"; @@ -18414,12 +24347,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."~0.7.0" = self.by-version."nan"."0.7.1"; by-version."nan"."0.7.1" = self.buildNodePackage { name = "nan-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.7.1.tgz"; @@ -18428,12 +24366,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."~1.0.0" = self.by-version."nan"."1.0.0"; by-version."nan"."1.0.0" = self.buildNodePackage { name = "nan-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; @@ -18442,12 +24385,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."~1.2.0" = self.by-version."nan"."1.2.0"; by-version."nan"."1.2.0" = self.buildNodePackage { name = "nan-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz"; @@ -18456,12 +24404,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."nan"."~1.3.0" = + self.by-version."nan"."1.3.0"; by-spec."nan"."~1.5.0" = self.by-version."nan"."1.5.3"; by-version."nan"."1.5.3" = self.buildNodePackage { name = "nan-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.5.3.tgz"; @@ -18470,7 +24425,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nan"."~1.5.3" = self.by-version."nan"."1.5.3"; @@ -18480,6 +24439,7 @@ self.by-version."native-buffer-browserify"."2.0.17"; by-version."native-buffer-browserify"."2.0.17" = self.buildNodePackage { name = "native-buffer-browserify-2.0.17"; + version = "2.0.17"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz"; @@ -18490,7 +24450,11 @@ "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8"; "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."native-buffer-browserify"."~2.0.15" = self.by-version."native-buffer-browserify"."2.0.17"; @@ -18498,6 +24462,7 @@ self.by-version."native-dns"."0.6.1"; by-version."native-dns"."0.6.1" = self.buildNodePackage { name = "native-dns-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/native-dns/-/native-dns-0.6.1.tgz"; @@ -18509,12 +24474,17 @@ "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2"; "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."native-dns-cache".">= 0.0.1" = self.by-version."native-dns-cache"."0.0.2"; by-version."native-dns-cache"."0.0.2" = self.buildNodePackage { name = "native-dns-cache-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/native-dns-cache/-/native-dns-cache-0.0.2.tgz"; @@ -18525,12 +24495,17 @@ "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3"; "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."native-dns-packet".">= 0.0.1" = self.by-version."native-dns-packet"."0.1.1"; by-version."native-dns-packet"."0.1.1" = self.buildNodePackage { name = "native-dns-packet-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; @@ -18541,7 +24516,11 @@ "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."native-dns-packet".">= 0.0.4" = self.by-version."native-dns-packet"."0.1.1"; @@ -18549,6 +24528,7 @@ self.by-version."native-or-bluebird"."1.2.0"; by-version."native-or-bluebird"."1.2.0" = self.buildNodePackage { name = "native-or-bluebird-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz"; @@ -18557,12 +24537,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."native-or-bluebird"."~1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage { name = "native-or-bluebird-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; @@ -18571,12 +24556,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."natural"."^0.2.0" = self.by-version."natural"."0.2.0"; by-version."natural"."0.2.0" = self.buildNodePackage { name = "natural-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/natural/-/natural-0.2.0.tgz"; @@ -18586,14 +24576,19 @@ deps = { "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21"; "apparatus-0.0.8" = self.by-version."apparatus"."0.0.8"; - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nconf"."*" = self.by-version."nconf"."0.7.1"; by-version."nconf"."0.7.1" = self.buildNodePackage { name = "nconf-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; @@ -18605,13 +24600,18 @@ "ini-1.3.3" = self.by-version."ini"."1.3.3"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "nconf" = self.by-version."nconf"."0.7.1"; by-spec."nconf"."0.6.9" = self.by-version."nconf"."0.6.9"; by-version."nconf"."0.6.9" = self.buildNodePackage { name = "nconf-0.6.9"; + version = "0.6.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; @@ -18623,7 +24623,11 @@ "ini-1.3.3" = self.by-version."ini"."1.3.3"; "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nconf"."~0.6.9" = self.by-version."nconf"."0.6.9"; @@ -18631,6 +24635,7 @@ self.by-version."ncp"."0.2.7"; by-version."ncp"."0.2.7" = self.buildNodePackage { name = "ncp-0.2.7"; + version = "0.2.7"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; @@ -18639,12 +24644,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ncp"."0.4.x" = self.by-version."ncp"."0.4.2"; by-version."ncp"."0.4.2" = self.buildNodePackage { name = "ncp-0.4.2"; + version = "0.4.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; @@ -18653,7 +24663,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ncp"."~0.4.2" = self.by-version."ncp"."0.4.2"; @@ -18661,6 +24675,7 @@ self.by-version."ncp"."0.6.0"; by-version."ncp"."0.6.0" = self.buildNodePackage { name = "ncp-0.6.0"; + version = "0.6.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; @@ -18669,12 +24684,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."negotiator"."0.2.5" = self.by-version."negotiator"."0.2.5"; by-version."negotiator"."0.2.5" = self.buildNodePackage { name = "negotiator-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz"; @@ -18683,12 +24703,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."negotiator"."0.3.0" = self.by-version."negotiator"."0.3.0"; by-version."negotiator"."0.3.0" = self.buildNodePackage { name = "negotiator-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; @@ -18697,12 +24722,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."negotiator"."0.4.2" = self.by-version."negotiator"."0.4.2"; by-version."negotiator"."0.4.2" = self.buildNodePackage { name = "negotiator-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; @@ -18711,12 +24741,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."negotiator"."0.4.7" = self.by-version."negotiator"."0.4.7"; by-version."negotiator"."0.4.7" = self.buildNodePackage { name = "negotiator-0.4.7"; + version = "0.4.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; @@ -18725,12 +24760,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."negotiator"."0.4.9" = self.by-version."negotiator"."0.4.9"; by-version."negotiator"."0.4.9" = self.buildNodePackage { name = "negotiator-0.4.9"; + version = "0.4.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; @@ -18739,12 +24779,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."negotiator"."0.5.1" = self.by-version."negotiator"."0.5.1"; by-version."negotiator"."0.5.1" = self.buildNodePackage { name = "negotiator-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz"; @@ -18753,12 +24798,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = self.buildNodePackage { name = "net-ping-1.1.7"; + version = "1.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; @@ -18768,12 +24818,17 @@ deps = { "raw-socket-1.2.2" = self.by-version."raw-socket"."1.2.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."netmask"."~1.0.4" = self.by-version."netmask"."1.0.5"; by-version."netmask"."1.0.5" = self.buildNodePackage { name = "netmask-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/netmask/-/netmask-1.0.5.tgz"; @@ -18782,26 +24837,17 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."network-address"."0.0.4" = - self.by-version."network-address"."0.0.4"; - by-version."network-address"."0.0.4" = self.buildNodePackage { - name = "network-address-0.0.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/network-address/-/network-address-0.0.4.tgz"; - name = "network-address-0.0.4.tgz"; - sha1 = "4dc7a8400a9fbac6b845a2c7bf3f06bcf9b2eedf"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."network-address"."0.0.5" = self.by-version."network-address"."0.0.5"; by-version."network-address"."0.0.5" = self.buildNodePackage { name = "network-address-0.0.5"; + version = "0.0.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; @@ -18810,12 +24856,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."next-tick"."~0.2.2" = self.by-version."next-tick"."0.2.2"; by-version."next-tick"."0.2.2" = self.buildNodePackage { name = "next-tick-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"; @@ -18824,12 +24875,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nib"."*" = self.by-version."nib"."1.1.0"; by-version."nib"."1.1.0" = self.buildNodePackage { name = "nib-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nib/-/nib-1.1.0.tgz"; @@ -18839,13 +24895,18 @@ deps = { "stylus-0.49.3" = self.by-version."stylus"."0.49.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "nib" = self.by-version."nib"."1.1.0"; by-spec."nib"."0.5.0" = self.by-version."nib"."0.5.0"; by-version."nib"."0.5.0" = self.buildNodePackage { name = "nib-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz"; @@ -18854,12 +24915,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nijs"."*" = self.by-version."nijs"."0.0.22"; by-version."nijs"."0.0.22" = self.buildNodePackage { name = "nijs-0.0.22"; + version = "0.0.22"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nijs/-/nijs-0.0.22.tgz"; @@ -18870,42 +24936,50 @@ "optparse-1.0.5" = self.by-version."optparse"."1.0.5"; "slasp-0.0.4" = self.by-version."slasp"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "nijs" = self.by-version."nijs"."0.0.22"; - by-spec."node-appc"."0.2.14" = - self.by-version."node-appc"."0.2.14"; - by-version."node-appc"."0.2.14" = self.buildNodePackage { - name = "node-appc-0.2.14"; + by-spec."node-appc"."0.2.24" = + self.by-version."node-appc"."0.2.24"; + by-version."node-appc"."0.2.24" = self.buildNodePackage { + name = "node-appc-0.2.24"; + version = "0.2.24"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.14.tgz"; - name = "node-appc-0.2.14.tgz"; - sha1 = "74f20eca49ebf940799fac44bcb224321582cf98"; + url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.24.tgz"; + name = "node-appc-0.2.24.tgz"; + sha1 = "09bcc9a887bda6a9f26bc6b597094dff1ccaf0aa"; }; deps = { "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7"; - "async-0.2.10" = self.by-version."async"."0.2.10"; + "async-0.9.0" = self.by-version."async"."0.9.0"; "colors-0.6.2" = self.by-version."colors"."0.6.2"; "diff-1.0.8" = self.by-version."diff"."1.0.8"; - "dox-0.4.6" = self.by-version."dox"."0.4.6"; - "jade-0.35.0" = self.by-version."jade"."0.35.0"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - "request-2.27.0" = self.by-version."request"."2.27.0"; - "semver-2.1.0" = self.by-version."semver"."2.1.0"; + "request-2.40.0" = self.by-version."request"."2.40.0"; + "semver-3.0.1" = self.by-version."semver"."3.0.1"; "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; - "temp-0.6.0" = self.by-version."temp"."0.6.0"; + "temp-0.8.1" = self.by-version."temp"."0.8.1"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; - "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-craigslist"."^0.1.7" = self.by-version."node-craigslist"."0.1.7"; by-version."node-craigslist"."0.1.7" = self.buildNodePackage { name = "node-craigslist-0.1.7"; + version = "0.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.7.tgz"; @@ -18915,12 +24989,17 @@ deps = { "cheerio-0.17.0" = self.by-version."cheerio"."0.17.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-df"."^0.1.1" = self.by-version."node-df"."0.1.1"; by-version."node-df"."0.1.1" = self.buildNodePackage { name = "node-df-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz"; @@ -18928,14 +25007,19 @@ sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea"; }; deps = { - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-expat"."*" = self.by-version."node-expat"."2.3.6"; by-version."node-expat"."2.3.6" = self.buildNodePackage { name = "node-expat-2.3.6"; + version = "2.3.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.6.tgz"; @@ -18948,17 +25032,24 @@ "iconv-2.1.6" = self.by-version."iconv"."2.1.6"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-expat" = self.by-version."node-expat"."2.3.6"; by-spec."node-expat".">=1.4.1" = self.by-version."node-expat"."2.3.6"; by-spec."node-expat"."^2.3.0" = self.by-version."node-expat"."2.3.6"; + by-spec."node-expat"."^2.3.6" = + self.by-version."node-expat"."2.3.6"; by-spec."node-expat"."~2.1.4" = self.by-version."node-expat"."2.1.4"; by-version."node-expat"."2.1.4" = self.buildNodePackage { name = "node-expat-2.1.4"; + version = "2.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; @@ -18968,7 +25059,11 @@ deps = { "nan-0.6.0" = self.by-version."nan"."0.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-expat"."~2.3.0" = self.by-version."node-expat"."2.3.6"; @@ -18978,6 +25073,7 @@ self.by-version."node-fs"."0.1.7"; by-version."node-fs"."0.1.7" = self.buildNodePackage { name = "node-fs-0.1.7"; + version = "0.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz"; @@ -18986,12 +25082,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ "linux" "darwin" "freebsd" "win32" "smartos" "sunos" ]; + cpu = [ ]; }; by-spec."node-gyp"."*" = self.by-version."node-gyp"."1.0.2"; by-version."node-gyp"."1.0.2" = self.buildNodePackage { name = "node-gyp-1.0.2"; + version = "1.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz"; @@ -19013,46 +25114,117 @@ "tar-1.0.3" = self.by-version."tar"."1.0.3"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-gyp" = self.by-version."node-gyp"."1.0.2"; by-spec."node-gyp"."~1.0.1" = self.by-version."node-gyp"."1.0.2"; by-spec."node-gyp"."~1.0.2" = self.by-version."node-gyp"."1.0.2"; + by-spec."node-icu-charset-detector"."0.0.7" = + self.by-version."node-icu-charset-detector"."0.0.7"; + by-version."node-icu-charset-detector"."0.0.7" = self.buildNodePackage { + name = "node-icu-charset-detector-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-icu-charset-detector/-/node-icu-charset-detector-0.0.7.tgz"; + name = "node-icu-charset-detector-0.0.7.tgz"; + sha1 = "832867d4e70cc666a616339ff6637bad039c7d1f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.8.3"; - by-version."node-inspector"."0.8.3" = self.buildNodePackage { - name = "node-inspector-0.8.3"; + self.by-version."node-inspector"."0.9.0"; + by-version."node-inspector"."0.9.0" = self.buildNodePackage { + name = "node-inspector-0.9.0"; + version = "0.9.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.3.tgz"; - name = "node-inspector-0.8.3.tgz"; - sha1 = "2eac57771973c6eb49100ef4c9caa6ae0bcd8911"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.9.0.tgz"; + name = "node-inspector-0.9.0.tgz"; + sha1 = "af3bc431f1e2a2814fe5d790d44b09f145e2f950"; }; deps = { - "express-4.11.2" = self.by-version."express"."4.11.2"; + "express-4.12.0" = self.by-version."express"."4.12.0"; "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "rc-0.5.5" = self.by-version."rc"."0.5.5"; "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; "ws-0.4.32" = self.by-version."ws"."0.4.32"; - "opener-1.4.0" = self.by-version."opener"."1.4.0"; + "biased-opener-0.2.2" = self.by-version."biased-opener"."0.2.2"; "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; "which-1.0.8" = self.by-version."which"."1.0.8"; "v8-debug-0.3.5" = self.by-version."v8-debug"."0.3.5"; - "v8-profiler-5.2.3" = self.by-version."v8-profiler"."5.2.3"; + "v8-profiler-5.2.4" = self.by-version."v8-profiler"."5.2.4"; "semver-3.0.1" = self.by-version."semver"."3.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-inspector" = self.by-version."node-inspector"."0.9.0"; + by-spec."node-libs-browser"."~0.4.0" = + self.by-version."node-libs-browser"."0.4.1"; + by-version."node-libs-browser"."0.4.1" = self.buildNodePackage { + name = "node-libs-browser-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.4.1.tgz"; + name = "node-libs-browser-0.4.1.tgz"; + sha1 = "9d063c7f3bdc2eab8d184578b5bcb5785e63ad3a"; + }; + deps = { + "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; + "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4"; + "crypto-browserify-3.3.0" = self.by-version."crypto-browserify"."3.3.0"; + "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; + "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; + "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; + "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; + "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; + "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; + "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; + "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; + "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1"; + "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0"; + "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + "events-1.0.2" = self.by-version."events"."1.0.2"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + "assert-1.3.0" = self.by-version."assert"."1.3.0"; + "buffer-2.8.2" = self.by-version."buffer"."2.8.2"; + "url-0.10.2" = self.by-version."url"."0.10.2"; + "process-0.8.0" = self.by-version."process"."0.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "node-inspector" = self.by-version."node-inspector"."0.8.3"; by-spec."node-options"."0.0.6" = self.by-version."node-options"."0.0.6"; by-version."node-options"."0.0.6" = self.buildNodePackage { name = "node-options-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-options/-/node-options-0.0.6.tgz"; @@ -19061,12 +25233,45 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."node-pre-gyp"."^0.6.0" = + by-spec."node-pre-gyp"."0.5.x" = + self.by-version."node-pre-gyp"."0.5.31"; + by-version."node-pre-gyp"."0.5.31" = self.buildNodePackage { + name = "node-pre-gyp-0.5.31"; + version = "0.5.31"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz"; + name = "node-pre-gyp-0.5.31.tgz"; + sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba"; + }; + deps = { + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + "request-2.53.0" = self.by-version."request"."2.53.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + "tar-1.0.3" = self.by-version."tar"."1.0.3"; + "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "rc-0.5.5" = self.by-version."rc"."0.5.5"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-pre-gyp"."^0.6.2" = self.by-version."node-pre-gyp"."0.6.4"; by-version."node-pre-gyp"."0.6.4" = self.buildNodePackage { name = "node-pre-gyp-0.6.4"; + version = "0.6.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.4.tgz"; @@ -19084,14 +25289,19 @@ "rc-0.6.0" = self.by-version."rc"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."node-pre-gyp"."^0.6.2" = + by-spec."node-pre-gyp"."^0.6.4" = self.by-version."node-pre-gyp"."0.6.4"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.2.2"; by-version."node-protobuf"."1.2.2" = self.buildNodePackage { name = "node-protobuf-1.2.2"; + version = "1.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz"; @@ -19102,30 +25312,71 @@ "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-protobuf" = self.by-version."node-protobuf"."1.2.2"; - by-spec."node-ssdp"."^2.0.1" = - self.by-version."node-ssdp"."2.0.1"; - by-version."node-ssdp"."2.0.1" = self.buildNodePackage { - name = "node-ssdp-2.0.1"; + by-spec."node-red"."*" = + self.by-version."node-red"."0.10.2"; + by-version."node-red"."0.10.2" = self.buildNodePackage { + name = "node-red-0.10.2"; + version = "0.10.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-ssdp/-/node-ssdp-2.0.1.tgz"; - name = "node-ssdp-2.0.1.tgz"; - sha1 = "9d78eb7bba74305585ec20d929cd1f0c8b436883"; + url = "http://registry.npmjs.org/node-red/-/node-red-0.10.2.tgz"; + name = "node-red-0.10.2.tgz"; + sha1 = "b0ce6fc3786754e04378e6b0bb6aa4b9b9022c33"; }; deps = { - "ip-0.3.2" = self.by-version."ip"."0.3.2"; - "bunyan-prettystream-0.1.3" = self.by-version."bunyan-prettystream"."0.1.3"; - "bunyan-0.22.3" = self.by-version."bunyan"."0.22.3"; + "express-3.17.2" = self.by-version."express"."3.17.2"; + "when-3.7.2" = self.by-version."when"."3.7.2"; + "bcryptjs-2.1.0" = self.by-version."bcryptjs"."2.1.0"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "mqtt-0.3.13" = self.by-version."mqtt"."0.3.13"; + "ws-0.7.1" = self.by-version."ws"."0.7.1"; + "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; + "mustache-1.0.0" = self.by-version."mustache"."1.0.0"; + "cron-1.0.6" = self.by-version."cron"."1.0.6"; + "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2"; + "twitter-ng-0.6.2" = self.by-version."twitter-ng"."0.6.2"; + "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; + "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; + "sentiment-0.2.3" = self.by-version."sentiment"."0.2.3"; + "irc-0.3.9" = self.by-version."irc"."0.3.9"; + "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; + "cors-2.5.3" = self.by-version."cors"."2.5.3"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; + "nodemailer-1.3.0" = self.by-version."nodemailer"."1.3.0"; + "imap-0.8.14" = self.by-version."imap"."0.8.14"; + "request-2.42.0" = self.by-version."request"."2.42.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0"; + "serialport-1.4.10" = self.by-version."serialport"."1.4.10"; + "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2"; + "fs.notify-0.0.4" = self.by-version."fs.notify"."0.0.4"; + "passport-0.2.1" = self.by-version."passport"."0.2.1"; + "passport-http-bearer-1.0.1" = self.by-version."passport-http-bearer"."1.0.1"; + "passport-oauth2-client-password-0.1.2" = self.by-version."passport-oauth2-client-password"."0.1.2"; + "oauth2orize-1.0.1" = self.by-version."oauth2orize"."1.0.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + "node-red" = self.by-version."node-red"."0.10.2"; by-spec."node-stringprep"."*" = self.by-version."node-stringprep"."0.7.0"; by-version."node-stringprep"."0.7.0" = self.buildNodePackage { name = "node-stringprep-0.7.0"; + version = "0.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.7.0.tgz"; @@ -19137,13 +25388,18 @@ "debug-2.0.0" = self.by-version."debug"."2.0.0"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-stringprep" = self.by-version."node-stringprep"."0.7.0"; by-spec."node-stringprep"."^0.5.2" = self.by-version."node-stringprep"."0.5.4"; by-version."node-stringprep"."0.5.4" = self.buildNodePackage { name = "node-stringprep-0.5.4"; + version = "0.5.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.5.4.tgz"; @@ -19155,7 +25411,11 @@ "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-stringprep"."^0.7.0" = self.by-version."node-stringprep"."0.7.0"; @@ -19163,6 +25423,7 @@ self.by-version."node-stringprep"."0.2.3"; by-version."node-stringprep"."0.2.3" = self.buildNodePackage { name = "node-stringprep-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.2.3.tgz"; @@ -19173,12 +25434,17 @@ "nan-0.7.1" = self.by-version."nan"."0.7.1"; "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-stringprep"."~0.6.0" = self.by-version."node-stringprep"."0.6.2"; by-version."node-stringprep"."0.6.2" = self.buildNodePackage { name = "node-stringprep-0.6.2"; + version = "0.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.6.2.tgz"; @@ -19190,7 +25456,11 @@ "bindings-1.1.1" = self.by-version."bindings"."1.1.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-stringprep"."~0.x" = self.by-version."node-stringprep"."0.7.0"; @@ -19198,6 +25468,7 @@ self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = self.buildNodePackage { name = "node-swt-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; @@ -19206,12 +25477,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-syslog"."1.1.7" = self.by-version."node-syslog"."1.1.7"; by-version."node-syslog"."1.1.7" = self.buildNodePackage { name = "node-syslog-1.1.7"; + version = "1.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; @@ -19220,12 +25496,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = self.by-version."node-uptime"."3.2.0"; by-version."node-uptime"."3.2.0" = self.buildNodePackage { name = "node-uptime-3.2.0"; + version = "3.2.0"; bin = false; src = fetchurl { url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; @@ -19248,13 +25529,18 @@ "net-ping-1.1.7" = self.by-version."net-ping"."1.1.7"; "js-yaml-2.1.0" = self.by-version."js-yaml"."2.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-uptime" = self.by-version."node-uptime"."3.2.0"; by-spec."node-uuid"."*" = self.by-version."node-uuid"."1.4.2"; by-version."node-uuid"."1.4.2" = self.buildNodePackage { name = "node-uuid-1.4.2"; + version = "1.4.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"; @@ -19263,13 +25549,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-uuid" = self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."1.3.3" = self.by-version."node-uuid"."1.3.3"; by-version."node-uuid"."1.3.3" = self.buildNodePackage { name = "node-uuid-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; @@ -19278,12 +25569,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-uuid"."1.4.0" = self.by-version."node-uuid"."1.4.0"; by-version."node-uuid"."1.4.0" = self.buildNodePackage { name = "node-uuid-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; @@ -19292,12 +25588,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-uuid"."1.4.1" = self.by-version."node-uuid"."1.4.1"; by-version."node-uuid"."1.4.1" = self.buildNodePackage { name = "node-uuid-1.4.1"; + version = "1.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; @@ -19306,7 +25607,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-uuid"."^1.3.3" = self.by-version."node-uuid"."1.4.2"; @@ -19322,6 +25627,7 @@ self.by-version."node-wsfederation"."0.1.1"; by-version."node-wsfederation"."0.1.1" = self.buildNodePackage { name = "node-wsfederation-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; @@ -19331,12 +25637,17 @@ deps = { "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp"."*" = self.by-version."node-xmpp"."1.0.0-alpha2"; by-version."node-xmpp"."1.0.0-alpha2" = self.buildNodePackage { name = "node-xmpp-1.0.0-alpha2"; + version = "1.0.0-alpha2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-1.0.0-alpha2.tgz"; @@ -19348,7 +25659,7 @@ "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "request-2.53.0" = self.by-version."request"."2.53.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2"; + "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; @@ -19356,13 +25667,18 @@ "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; "node-xmpp-core-1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp" = self.by-version."node-xmpp"."1.0.0-alpha2"; by-spec."node-xmpp"."~0.15.0" = self.by-version."node-xmpp"."0.15.0"; by-version."node-xmpp"."0.15.0" = self.buildNodePackage { name = "node-xmpp-0.15.0"; + version = "0.15.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-0.15.0.tgz"; @@ -19374,7 +25690,7 @@ "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "request-2.53.0" = self.by-version."request"."2.53.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2"; + "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0"; @@ -19382,12 +25698,17 @@ "node-xmpp-server-0.6.0" = self.by-version."node-xmpp-server"."0.6.0"; "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-client"."*" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; by-version."node-xmpp-client"."1.0.0-alpha9" = self.buildNodePackage { name = "node-xmpp-client-1.0.0-alpha9"; + version = "1.0.0-alpha9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-1.0.0-alpha9.tgz"; @@ -19402,18 +25723,23 @@ "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" = self.by-version."node-xmpp-client"."1.0.0-alpha20"; by-version."node-xmpp-client"."1.0.0-alpha20" = self.buildNodePackage { name = "node-xmpp-client-1.0.0-alpha20"; + version = "1.0.0-alpha20"; bin = false; src = fetchgit { url = "https://github.com/node-xmpp/node-xmpp-client.git"; - rev = "68bd565dc08da50e2806533a1f616bca6fc853fd"; - sha256 = "9881cf6999293783d5c0459e53ecbf9adf5bfdbcf00cf668b67368ddd1aa4caf"; + rev = "3be5ccc42a13377edad060b39980de70b0dd981a"; + sha256 = "1e0cba0ec6b58a73533d723e9f5100676229d27c3fcb0799cc64bf79f97c687f"; }; deps = { "request-2.48.0" = self.by-version."request"."2.48.0"; @@ -19423,12 +25749,17 @@ "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-client"."~0.4.0" = self.by-version."node-xmpp-client"."0.4.0"; by-version."node-xmpp-client"."0.4.0" = self.buildNodePackage { name = "node-xmpp-client-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-0.4.0.tgz"; @@ -19442,12 +25773,17 @@ "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-component"."*" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; by-version."node-xmpp-component"."1.0.0-alpha1" = self.buildNodePackage { name = "node-xmpp-component-1.0.0-alpha1"; + version = "1.0.0-alpha1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-1.0.0-alpha1.tgz"; @@ -19458,7 +25794,11 @@ "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp-component" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; by-spec."node-xmpp-component"."git+https://github.com/node-xmpp/node-xmpp-component.git" = @@ -19467,6 +25807,7 @@ self.by-version."node-xmpp-component"."0.3.0"; by-version."node-xmpp-component"."0.3.0" = self.buildNodePackage { name = "node-xmpp-component-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-0.3.0.tgz"; @@ -19477,12 +25818,17 @@ "ltx-0.3.4" = self.by-version."ltx"."0.3.4"; "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-core"."*" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; by-version."node-xmpp-core"."1.0.0-alpha9" = self.buildNodePackage { name = "node-xmpp-core-1.0.0-alpha9"; + version = "1.0.0-alpha9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha9.tgz"; @@ -19496,13 +25842,18 @@ "ltx-0.5.2" = self.by-version."ltx"."0.5.2"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp-core" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; by-spec."node-xmpp-core"."1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; by-version."node-xmpp-core"."1.0.0-alpha1" = self.buildNodePackage { name = "node-xmpp-core-1.0.0-alpha1"; + version = "1.0.0-alpha1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha1.tgz"; @@ -19516,7 +25867,11 @@ "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-core"."^1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; @@ -19528,6 +25883,7 @@ self.by-version."node-xmpp-core"."1.0.0-alpha13"; by-version."node-xmpp-core"."1.0.0-alpha13" = self.buildNodePackage { name = "node-xmpp-core-1.0.0-alpha13"; + version = "1.0.0-alpha13"; bin = false; src = fetchgit { url = "https://github.com/node-xmpp/node-xmpp-core.git"; @@ -19541,12 +25897,17 @@ "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-core"."~0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; by-version."node-xmpp-core"."0.5.0" = self.buildNodePackage { name = "node-xmpp-core-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-0.5.0.tgz"; @@ -19558,7 +25919,11 @@ "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; "ltx-0.3.4" = self.by-version."ltx"."0.3.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-core"."~1.0.0-alpha10" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; @@ -19566,6 +25931,7 @@ self.by-version."node-xmpp-joap"."0.0.17"; by-version."node-xmpp-joap"."0.0.17" = self.buildNodePackage { name = "node-xmpp-joap-0.0.17"; + version = "0.0.17"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.17.tgz"; @@ -19581,13 +25947,18 @@ "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.17"; by-spec."node-xmpp-server"."*" = self.by-version."node-xmpp-server"."1.0.0-alpha9"; by-version."node-xmpp-server"."1.0.0-alpha9" = self.buildNodePackage { name = "node-xmpp-server-1.0.0-alpha9"; + version = "1.0.0-alpha9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-1.0.0-alpha9.tgz"; @@ -19599,13 +25970,18 @@ "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; "debug-0.7.4" = self.by-version."debug"."0.7.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp-server" = self.by-version."node-xmpp-server"."1.0.0-alpha9"; by-spec."node-xmpp-server"."git+https://github.com/node-xmpp/node-xmpp-server.git" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; by-version."node-xmpp-server"."1.0.0-alpha11" = self.buildNodePackage { name = "node-xmpp-server-1.0.0-alpha11"; + version = "1.0.0-alpha11"; bin = false; src = fetchgit { url = "https://github.com/node-xmpp/node-xmpp-server.git"; @@ -19618,12 +25994,17 @@ "debug-2.1.1" = self.by-version."debug"."2.1.1"; "ws-0.7.1" = self.by-version."ws"."0.7.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-server"."~0.6.0" = self.by-version."node-xmpp-server"."0.6.0"; by-version."node-xmpp-server"."0.6.0" = self.buildNodePackage { name = "node-xmpp-server-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-0.6.0.tgz"; @@ -19635,12 +26016,17 @@ "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."node-xmpp-serviceadmin"."*" = self.by-version."node-xmpp-serviceadmin"."0.1.6"; by-version."node-xmpp-serviceadmin"."0.1.6" = self.buildNodePackage { name = "node-xmpp-serviceadmin-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.1.6.tgz"; @@ -19650,13 +26036,18 @@ deps = { "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.1.6"; by-spec."node.extend"."1.0.0" = self.by-version."node.extend"."1.0.0"; by-version."node.extend"."1.0.0" = self.buildNodePackage { name = "node.extend-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; @@ -19665,12 +26056,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nodemailer"."0.3.35" = self.by-version."nodemailer"."0.3.35"; by-version."nodemailer"."0.3.35" = self.buildNodePackage { name = "nodemailer-0.3.35"; + version = "0.3.35"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; @@ -19682,12 +26078,17 @@ "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nodemailer"."0.7.1" = self.by-version."nodemailer"."0.7.1"; by-version."nodemailer"."0.7.1" = self.buildNodePackage { name = "nodemailer-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.7.1.tgz"; @@ -19701,14 +26102,103 @@ "he-0.3.6" = self.by-version."he"."0.3.6"; "public-address-0.1.1" = self.by-version."public-address"."0.1.1"; "aws-sdk-2.0.5" = self.by-version."aws-sdk"."2.0.5"; + }; + optionalDependencies = { "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nodemailer"."1.3.0" = + self.by-version."nodemailer"."1.3.0"; + by-version."nodemailer"."1.3.0" = self.buildNodePackage { + name = "nodemailer-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nodemailer/-/nodemailer-1.3.0.tgz"; + name = "nodemailer-1.3.0.tgz"; + sha1 = "a6e4c507b2f776a03d46e9be8d40b5be916f290a"; + }; + deps = { + "buildmail-1.2.0" = self.by-version."buildmail"."1.2.0"; + "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0"; + "libmime-0.1.7" = self.by-version."libmime"."0.1.7"; + "nodemailer-direct-transport-1.0.1" = self.by-version."nodemailer-direct-transport"."1.0.1"; + "nodemailer-smtp-transport-0.1.13" = self.by-version."nodemailer-smtp-transport"."0.1.13"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nodemailer-direct-transport"."^1.0.0" = + self.by-version."nodemailer-direct-transport"."1.0.1"; + by-version."nodemailer-direct-transport"."1.0.1" = self.buildNodePackage { + name = "nodemailer-direct-transport-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.0.1.tgz"; + name = "nodemailer-direct-transport-1.0.1.tgz"; + sha1 = "72e41f5a419f774ba07f7f3506d1dacd1b564c2b"; + }; + deps = { + "smtp-connection-1.1.0" = self.by-version."smtp-connection"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nodemailer-smtp-transport"."^0.1.12" = + self.by-version."nodemailer-smtp-transport"."0.1.13"; + by-version."nodemailer-smtp-transport"."0.1.13" = self.buildNodePackage { + name = "nodemailer-smtp-transport-0.1.13"; + version = "0.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-0.1.13.tgz"; + name = "nodemailer-smtp-transport-0.1.13.tgz"; + sha1 = "f8d1babfd5221aaa1308fd36ab7945a2f7081476"; + }; + deps = { + "nodemailer-wellknown-0.1.5" = self.by-version."nodemailer-wellknown"."0.1.5"; + "smtp-connection-1.1.0" = self.by-version."smtp-connection"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nodemailer-wellknown"."^0.1.1" = + self.by-version."nodemailer-wellknown"."0.1.5"; + by-version."nodemailer-wellknown"."0.1.5" = self.buildNodePackage { + name = "nodemailer-wellknown-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.5.tgz"; + name = "nodemailer-wellknown-0.1.5.tgz"; + sha1 = "1e467a2f7132ec30273b45f1ae300dd1193dd035"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nodemon"."*" = self.by-version."nodemon"."1.3.7"; by-version."nodemon"."1.3.7" = self.buildNodePackage { name = "nodemon-1.3.7"; + version = "1.3.7"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.7.tgz"; @@ -19721,13 +26211,18 @@ "touch-0.0.3" = self.by-version."touch"."0.0.3"; "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "nodemon" = self.by-version."nodemon"."1.3.7"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = self.buildNodePackage { name = "nomnom-1.6.2"; + version = "1.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; @@ -19738,12 +26233,17 @@ "colors-0.5.1" = self.by-version."colors"."0.5.1"; "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nopt"."2" = self.by-version."nopt"."2.2.1"; by-version."nopt"."2.2.1" = self.buildNodePackage { name = "nopt-2.2.1"; + version = "2.2.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; @@ -19753,12 +26253,17 @@ deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nopt"."2 || 3" = self.by-version."nopt"."3.0.1"; by-version."nopt"."3.0.1" = self.buildNodePackage { name = "nopt-3.0.1"; + version = "3.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; @@ -19768,12 +26273,17 @@ deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nopt"."2.0.0" = self.by-version."nopt"."2.0.0"; by-version."nopt"."2.0.0" = self.buildNodePackage { name = "nopt-2.0.0"; + version = "2.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; @@ -19783,12 +26293,17 @@ deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nopt"."2.1.1" = self.by-version."nopt"."2.1.1"; by-version."nopt"."2.1.1" = self.buildNodePackage { name = "nopt-2.1.1"; + version = "2.1.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz"; @@ -19798,7 +26313,11 @@ deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nopt"."3.0.1" = self.by-version."nopt"."3.0.1"; @@ -19808,6 +26327,7 @@ self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = self.buildNodePackage { name = "nopt-1.0.10"; + version = "1.0.10"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; @@ -19817,7 +26337,11 @@ deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nopt"."~2" = self.by-version."nopt"."2.2.1"; @@ -19831,6 +26355,7 @@ self.by-version."normalize-git-url"."1.0.0"; by-version."normalize-git-url"."1.0.0" = self.buildNodePackage { name = "normalize-git-url-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-1.0.0.tgz"; @@ -19839,12 +26364,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."normalize-package-data"."^1.0.0" = self.by-version."normalize-package-data"."1.0.3"; by-version."normalize-package-data"."1.0.3" = self.buildNodePackage { name = "normalize-package-data-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"; @@ -19856,21 +26386,26 @@ "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."normalize-package-data"."~1.0.1" = self.by-version."normalize-package-data"."1.0.3"; by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.6.0"; - by-version."npm"."2.6.0" = self.buildNodePackage { - name = "npm-2.6.0"; + self.by-version."npm"."2.6.1"; + by-version."npm"."2.6.1" = self.buildNodePackage { + name = "npm-2.6.1"; + version = "2.6.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.6.0.tgz"; - name = "npm-2.6.0.tgz"; - sha1 = "94152624b041d3da3bf2764b1a49006f699a7dd8"; + url = "http://registry.npmjs.org/npm/-/npm-2.6.1.tgz"; + name = "npm-2.6.1.tgz"; + sha1 = "22aefa7867d021f63d60fadc1eb48f0adb744242"; }; deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; @@ -19895,7 +26430,7 @@ "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -19939,13 +26474,18 @@ "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "npm" = self.by-version."npm"."2.6.0"; + "npm" = self.by-version."npm"."2.6.1"; by-spec."npm"."1.4.28" = self.by-version."npm"."1.4.28"; by-version."npm"."1.4.28" = self.buildNodePackage { name = "npm-1.4.28"; + version = "1.4.28"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/npm/-/npm-1.4.28.tgz"; @@ -20006,14 +26546,19 @@ "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm"."^2.5.1" = - self.by-version."npm"."2.6.0"; + self.by-version."npm"."2.6.1"; by-spec."npm-cache-filename"."^1.0.0" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = self.buildNodePackage { name = "npm-cache-filename-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"; @@ -20022,7 +26567,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-cache-filename"."~1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; @@ -20030,6 +26579,7 @@ self.by-version."npm-check-updates"."2.0.0-alpha6"; by-version."npm-check-updates"."2.0.0-alpha6" = self.buildNodePackage { name = "npm-check-updates-2.0.0-alpha6"; + version = "2.0.0-alpha6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.0.0-alpha6.tgz"; @@ -20041,18 +26591,23 @@ "cint-8.2.1" = self.by-version."cint"."8.2.1"; "closest-package-1.0.0" = self.by-version."closest-package"."1.0.0"; "commander-2.6.0" = self.by-version."commander"."2.6.0"; - "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; - "npm-2.6.0" = self.by-version."npm"."2.6.0"; + "lodash-3.3.0" = self.by-version."lodash"."3.3.0"; + "npm-2.6.1" = self.by-version."npm"."2.6.1"; "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "npm-check-updates" = self.by-version."npm-check-updates"."2.0.0-alpha6"; by-spec."npm-install-checks"."~1.0.2" = self.by-version."npm-install-checks"."1.0.5"; by-version."npm-install-checks"."1.0.5" = self.buildNodePackage { name = "npm-install-checks-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz"; @@ -20063,7 +26618,11 @@ "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-install-checks"."~1.0.5" = self.by-version."npm-install-checks"."1.0.5"; @@ -20071,6 +26630,7 @@ self.by-version."npm-package-arg"."2.1.3"; by-version."npm-package-arg"."2.1.3" = self.buildNodePackage { name = "npm-package-arg-2.1.3"; + version = "2.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.1.3.tgz"; @@ -20080,12 +26640,17 @@ deps = { "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-package-arg"."^3.0.0" = self.by-version."npm-package-arg"."3.1.0"; by-version."npm-package-arg"."3.1.0" = self.buildNodePackage { name = "npm-package-arg-3.1.0"; + version = "3.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.1.0.tgz"; @@ -20096,7 +26661,11 @@ "hosted-git-info-1.5.3" = self.by-version."hosted-git-info"."1.5.3"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-package-arg"."~2.1.3" = self.by-version."npm-package-arg"."2.1.3"; @@ -20104,6 +26673,7 @@ self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = self.buildNodePackage { name = "npm-registry-client-0.2.27"; + version = "0.2.27"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; @@ -20120,14 +26690,19 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "retry-0.6.0" = self.by-version."retry"."0.6.0"; "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20"; + }; + optionalDependencies = { "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-registry-client"."~2.0.7" = self.by-version."npm-registry-client"."2.0.7"; by-version."npm-registry-client"."2.0.7" = self.buildNodePackage { name = "npm-registry-client-2.0.7"; + version = "2.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-2.0.7.tgz"; @@ -20144,14 +26719,19 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; + }; + optionalDependencies = { "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-registry-client"."~4.0.4" = self.by-version."npm-registry-client"."4.0.5"; by-version."npm-registry-client"."4.0.5" = self.buildNodePackage { name = "npm-registry-client-4.0.5"; + version = "4.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz"; @@ -20170,14 +26750,19 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; + }; + optionalDependencies = { "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-registry-client"."~6.1.1" = self.by-version."npm-registry-client"."6.1.1"; by-version."npm-registry-client"."6.1.1" = self.buildNodePackage { name = "npm-registry-client-6.1.1"; + version = "6.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.1.1.tgz"; @@ -20197,14 +26782,19 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-4.3.0" = self.by-version."semver"."4.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; + }; + optionalDependencies = { "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-user-validate"."~0.1.0" = self.by-version."npm-user-validate"."0.1.1"; by-version."npm-user-validate"."0.1.1" = self.buildNodePackage { name = "npm-user-validate-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz"; @@ -20213,22 +26803,27 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npm-user-validate"."~0.1.1" = self.by-version."npm-user-validate"."0.1.1"; - by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.10.3" = - self.by-version."npm2nix"."5.10.3"; - by-version."npm2nix"."5.10.3" = self.buildNodePackage { - name = "npm2nix-5.10.3"; + by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.11.0" = + self.by-version."npm2nix"."5.11.0"; + by-version."npm2nix"."5.11.0" = self.buildNodePackage { + name = "npm2nix-5.11.0"; + version = "5.11.0"; bin = true; src = fetchgit { url = "git://github.com/NixOS/npm2nix.git"; - rev = "d7c63c4edf4d6df4ff829c47f487b5903307b053"; - sha256 = "8c2ef1a6b1637440d181282f90d46f55dcf92c4eecf8093663a53041225754cd"; + rev = "95ebee69a177910f47c661870f1b4b549f5ce796"; + sha256 = "2a1e675b906a7b176af2953427ac38269c2ebe9ff37e96d9c18da98fa6aae3a7"; }; deps = { - "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; "npm-registry-client-0.2.27" = self.by-version."npm-registry-client"."0.2.27"; "npmconf-0.1.1" = self.by-version."npmconf"."0.1.1"; @@ -20236,15 +26831,20 @@ "temp-0.6.0" = self.by-version."temp"."0.6.0"; "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2"; "findit-1.2.0" = self.by-version."findit"."1.2.0"; - "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0"; + "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "npm2nix" = self.by-version."npm2nix"."5.10.3"; + "npm2nix" = self.by-version."npm2nix"."5.11.0"; by-spec."npmconf"."0.1.1" = self.by-version."npmconf"."0.1.1"; by-version."npmconf"."0.1.1" = self.buildNodePackage { name = "npmconf-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; @@ -20261,12 +26861,17 @@ "semver-2.3.2" = self.by-version."semver"."2.3.2"; "ini-1.1.0" = self.by-version."ini"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmconf"."0.1.16" = self.by-version."npmconf"."0.1.16"; by-version."npmconf"."0.1.16" = self.buildNodePackage { name = "npmconf-0.1.16"; + version = "0.1.16"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; @@ -20283,12 +26888,17 @@ "semver-2.3.2" = self.by-version."semver"."2.3.2"; "ini-1.1.0" = self.by-version."ini"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmconf"."2.0.9" = self.by-version."npmconf"."2.0.9"; by-version."npmconf"."2.0.9" = self.buildNodePackage { name = "npmconf-2.0.9"; + version = "2.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz"; @@ -20306,12 +26916,17 @@ "semver-4.3.0" = self.by-version."semver"."4.3.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmconf"."^2.0.1" = self.by-version."npmconf"."2.1.1"; by-version."npmconf"."2.1.1" = self.buildNodePackage { name = "npmconf-2.1.1"; + version = "2.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz"; @@ -20329,7 +26944,11 @@ "semver-4.3.0" = self.by-version."semver"."4.3.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.16"; @@ -20337,6 +26956,7 @@ self.by-version."npmconf"."1.1.9"; by-version."npmconf"."1.1.9" = self.buildNodePackage { name = "npmconf-1.1.9"; + version = "1.1.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-1.1.9.tgz"; @@ -20354,7 +26974,11 @@ "semver-2.3.2" = self.by-version."semver"."2.3.2"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmconf"."~2.1.1" = self.by-version."npmconf"."2.1.1"; @@ -20362,6 +26986,7 @@ self.by-version."npmlog"."1.1.0"; by-version."npmlog"."1.1.0" = self.buildNodePackage { name = "npmlog-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz"; @@ -20373,12 +26998,17 @@ "are-we-there-yet-1.0.2" = self.by-version."are-we-there-yet"."1.0.2"; "gauge-1.1.0" = self.by-version."gauge"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmlog"."0" = self.by-version."npmlog"."0.1.1"; by-version."npmlog"."0.1.1" = self.buildNodePackage { name = "npmlog-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz"; @@ -20388,7 +27018,11 @@ deps = { "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."npmlog"."0.1 || 1" = self.by-version."npmlog"."1.1.0"; @@ -20400,6 +27034,7 @@ self.by-version."nssocket"."0.5.3"; by-version."nssocket"."0.5.3" = self.buildNodePackage { name = "nssocket-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; @@ -20410,12 +27045,17 @@ "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14"; "lazy-1.0.11" = self.by-version."lazy"."1.0.11"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ntwitter".">=0.5.0" = self.by-version."ntwitter"."0.5.0"; by-version."ntwitter"."0.5.0" = self.buildNodePackage { name = "ntwitter-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ntwitter/-/ntwitter-0.5.0.tgz"; @@ -20427,12 +27067,17 @@ "cookies-0.1.6" = self.by-version."cookies"."0.1.6"; "keygrip-0.2.4" = self.by-version."keygrip"."0.2.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."numeral"."^1.5.3" = self.by-version."numeral"."1.5.3"; by-version."numeral"."1.5.3" = self.buildNodePackage { name = "numeral-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz"; @@ -20441,12 +27086,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nwmatcher"."~1.3.1" = self.by-version."nwmatcher"."1.3.4"; by-version."nwmatcher"."1.3.4" = self.buildNodePackage { name = "nwmatcher-1.3.4"; + version = "1.3.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.4.tgz"; @@ -20455,7 +27105,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."nwmatcher"."~1.3.2" = self.by-version."nwmatcher"."1.3.4"; @@ -20463,6 +27117,7 @@ self.by-version."oauth"."0.9.12"; by-version."oauth"."0.9.12" = self.buildNodePackage { name = "oauth-0.9.12"; + version = "0.9.12"; bin = false; src = fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; @@ -20471,18 +27126,27 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."oauth"."0.9.12" = + self.by-version."oauth"."0.9.12"; by-spec."oauth"."0.9.x" = self.by-version."oauth"."0.9.12"; by-spec."oauth".">=0.8.4" = self.by-version."oauth"."0.9.12"; + by-spec."oauth".">=0.9.9" = + self.by-version."oauth"."0.9.12"; by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = self.by-version."oauth"."0.9.12"; by-spec."oauth-sign"."~0.2.0" = self.by-version."oauth-sign"."0.2.0"; by-version."oauth-sign"."0.2.0" = self.buildNodePackage { name = "oauth-sign-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; @@ -20491,12 +27155,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; by-version."oauth-sign"."0.3.0" = self.buildNodePackage { name = "oauth-sign-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; @@ -20505,12 +27174,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."oauth-sign"."~0.4.0" = self.by-version."oauth-sign"."0.4.0"; by-version."oauth-sign"."0.4.0" = self.buildNodePackage { name = "oauth-sign-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; @@ -20519,12 +27193,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."oauth-sign"."~0.5.0" = self.by-version."oauth-sign"."0.5.0"; by-version."oauth-sign"."0.5.0" = self.buildNodePackage { name = "oauth-sign-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"; @@ -20533,12 +27212,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."oauth-sign"."~0.6.0" = self.by-version."oauth-sign"."0.6.0"; by-version."oauth-sign"."0.6.0" = self.buildNodePackage { name = "oauth-sign-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; @@ -20547,12 +27231,39 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth2orize"."1.0.1" = + self.by-version."oauth2orize"."1.0.1"; + by-version."oauth2orize"."1.0.1" = self.buildNodePackage { + name = "oauth2orize-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth2orize/-/oauth2orize-1.0.1.tgz"; + name = "oauth2orize-1.0.1.tgz"; + sha1 = "eceb666b641caf717df43e63511518796c93642d"; + }; + deps = { + "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."object-additions"."^0.5.1" = self.by-version."object-additions"."0.5.1"; by-version."object-additions"."0.5.1" = self.buildNodePackage { name = "object-additions-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz"; @@ -20561,12 +27272,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."object-assign"."^0.3.0" = self.by-version."object-assign"."0.3.1"; by-version."object-assign"."0.3.1" = self.buildNodePackage { name = "object-assign-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz"; @@ -20575,12 +27291,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."object-assign"."^1.0.0" = self.by-version."object-assign"."1.0.0"; by-version."object-assign"."1.0.0" = self.buildNodePackage { name = "object-assign-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; @@ -20589,12 +27310,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."object-assign"."^2.0.0" = self.by-version."object-assign"."2.0.0"; by-version."object-assign"."2.0.0" = self.buildNodePackage { name = "object-assign-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"; @@ -20603,12 +27329,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."object-component"."0.0.3" = self.by-version."object-component"."0.0.3"; by-version."object-component"."0.0.3" = self.buildNodePackage { name = "object-component-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; @@ -20617,12 +27348,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."object-keys"."~0.4.0" = self.by-version."object-keys"."0.4.0"; by-version."object-keys"."0.4.0" = self.buildNodePackage { name = "object-keys-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; @@ -20631,12 +27367,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."on-finished"."2.1.0" = self.by-version."on-finished"."2.1.0"; by-version."on-finished"."2.1.0" = self.buildNodePackage { name = "on-finished-2.1.0"; + version = "2.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; @@ -20646,12 +27387,17 @@ deps = { "ee-first-1.0.5" = self.by-version."ee-first"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."on-finished"."~2.1.0" = self.by-version."on-finished"."2.1.1"; by-version."on-finished"."2.1.1" = self.buildNodePackage { name = "on-finished-2.1.1"; + version = "2.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz"; @@ -20661,7 +27407,11 @@ deps = { "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."on-finished"."~2.1.1" = self.by-version."on-finished"."2.1.1"; @@ -20669,6 +27419,7 @@ self.by-version."on-finished"."2.2.0"; by-version."on-finished"."2.2.0" = self.buildNodePackage { name = "on-finished-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz"; @@ -20678,12 +27429,17 @@ deps = { "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."on-headers"."~1.0.0" = + by-spec."on-headers"."1.0.0" = self.by-version."on-headers"."1.0.0"; by-version."on-headers"."1.0.0" = self.buildNodePackage { name = "on-headers-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz"; @@ -20692,12 +27448,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."on-headers"."~1.0.0" = + self.by-version."on-headers"."1.0.0"; by-spec."once"."1.1.1" = self.by-version."once"."1.1.1"; by-version."once"."1.1.1" = self.buildNodePackage { name = "once-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; @@ -20706,12 +27469,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."once"."1.3.0" = self.by-version."once"."1.3.0"; by-version."once"."1.3.0" = self.buildNodePackage { name = "once-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz"; @@ -20720,12 +27488,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."once"."1.x" = self.by-version."once"."1.3.1"; by-version."once"."1.3.1" = self.buildNodePackage { name = "once-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz"; @@ -20735,7 +27508,11 @@ deps = { "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."once"."^1.1.1" = self.by-version."once"."1.3.1"; @@ -20749,6 +27526,7 @@ self.by-version."once"."1.2.0"; by-version."once"."1.2.0" = self.buildNodePackage { name = "once-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/once/-/once-1.2.0.tgz"; @@ -20757,7 +27535,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."once"."~1.3.0" = self.by-version."once"."1.3.1"; @@ -20767,6 +27549,7 @@ self.by-version."onetime"."1.0.0"; by-version."onetime"."1.0.0" = self.buildNodePackage { name = "onetime-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"; @@ -20775,12 +27558,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = self.buildNodePackage { name = "open-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz"; @@ -20789,12 +27577,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."open"."0.0.5" = self.by-version."open"."0.0.5"; by-version."open"."0.0.5" = self.buildNodePackage { name = "open-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz"; @@ -20803,7 +27596,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."open"."0.0.x" = self.by-version."open"."0.0.5"; @@ -20811,10 +27608,11 @@ self.by-version."open"."0.0.5"; by-spec."open"."~0.0.5" = self.by-version."open"."0.0.5"; - by-spec."opener"."^1.3.0" = + by-spec."opener"."1.4.0" = self.by-version."opener"."1.4.0"; by-version."opener"."1.4.0" = self.buildNodePackage { name = "opener-1.4.0"; + version = "1.4.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; @@ -20823,12 +27621,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."opener"."~1.3.0" = self.by-version."opener"."1.3.0"; by-version."opener"."1.3.0" = self.buildNodePackage { name = "opener-1.3.0"; + version = "1.3.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz"; @@ -20837,7 +27640,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."opener"."~1.4.0" = self.by-version."opener"."1.4.0"; @@ -20845,6 +27652,7 @@ self.by-version."openid"."0.5.9"; by-version."openid"."0.5.9" = self.buildNodePackage { name = "openid-0.5.9"; + version = "0.5.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz"; @@ -20853,12 +27661,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."opn"."~1.0.0" = self.by-version."opn"."1.0.1"; by-version."opn"."1.0.1" = self.buildNodePackage { name = "opn-1.0.1"; + version = "1.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/opn/-/opn-1.0.1.tgz"; @@ -20867,12 +27680,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."optimist"."*" = self.by-version."optimist"."0.6.1"; by-version."optimist"."0.6.1" = self.buildNodePackage { name = "optimist-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; @@ -20883,13 +27701,18 @@ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "optimist" = self.by-version."optimist"."0.6.1"; by-spec."optimist"."0.2" = self.by-version."optimist"."0.2.8"; by-version."optimist"."0.2.8" = self.buildNodePackage { name = "optimist-0.2.8"; + version = "0.2.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; @@ -20899,12 +27722,17 @@ deps = { "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."optimist"."0.6.0" = self.by-version."optimist"."0.6.0"; by-version."optimist"."0.6.0" = self.buildNodePackage { name = "optimist-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; @@ -20915,7 +27743,11 @@ "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."optimist"."0.6.x" = self.by-version."optimist"."0.6.1"; @@ -20925,6 +27757,7 @@ self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = self.buildNodePackage { name = "optimist-0.3.7"; + version = "0.3.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; @@ -20934,7 +27767,11 @@ deps = { "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."optimist"."~0.3.4" = self.by-version."optimist"."0.3.7"; @@ -20948,6 +27785,7 @@ self.by-version."optionator"."0.5.0"; by-version."optionator"."0.5.0" = self.buildNodePackage { name = "optionator-0.5.0"; + version = "0.5.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz"; @@ -20962,12 +27800,17 @@ "levn-0.2.5" = self.by-version."levn"."0.2.5"; "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = self.buildNodePackage { name = "options-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; @@ -20976,12 +27819,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."optjs"."*" = self.by-version."optjs"."3.2.1-boom"; by-version."optjs"."3.2.1-boom" = self.buildNodePackage { name = "optjs-3.2.1-boom"; + version = "3.2.1-boom"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz"; @@ -20990,12 +27838,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."optparse"."*" = self.by-version."optparse"."1.0.5"; by-version."optparse"."1.0.5" = self.buildNodePackage { name = "optparse-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; @@ -21004,7 +27857,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "optparse" = self.by-version."optparse"."1.0.5"; by-spec."optparse".">= 1.0.3" = @@ -21013,6 +27870,7 @@ self.by-version."opts"."1.2.2"; by-version."opts"."1.2.2" = self.buildNodePackage { name = "opts-1.2.2"; + version = "1.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/opts/-/opts-1.2.2.tgz"; @@ -21021,12 +27879,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."orchestrator"."^0.3.0" = self.by-version."orchestrator"."0.3.7"; by-version."orchestrator"."0.3.7" = self.buildNodePackage { name = "orchestrator-0.3.7"; + version = "0.3.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"; @@ -21038,12 +27901,17 @@ "sequencify-0.0.7" = self.by-version."sequencify"."0.0.7"; "stream-consume-0.1.0" = self.by-version."stream-consume"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ordered-read-streams"."^0.1.0" = self.by-version."ordered-read-streams"."0.1.0"; by-version."ordered-read-streams"."0.1.0" = self.buildNodePackage { name = "ordered-read-streams-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; @@ -21052,12 +27920,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."os-browserify"."~0.1.1" = self.by-version."os-browserify"."0.1.2"; by-version."os-browserify"."0.1.2" = self.buildNodePackage { name = "os-browserify-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; @@ -21066,12 +27939,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."os-browserify"."~0.1.2" = + self.by-version."os-browserify"."0.1.2"; by-spec."os-name"."^1.0.0" = self.by-version."os-name"."1.0.3"; by-version."os-name"."1.0.3" = self.buildNodePackage { name = "os-name-1.0.3"; + version = "1.0.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; @@ -21082,12 +27962,17 @@ "osx-release-1.0.0" = self.by-version."osx-release"."1.0.0"; "win-release-1.0.0" = self.by-version."win-release"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."osenv"."0" = self.by-version."osenv"."0.1.0"; by-version."osenv"."0.1.0" = self.buildNodePackage { name = "osenv-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"; @@ -21096,12 +27981,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."osenv"."0.0.3" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = self.buildNodePackage { name = "osenv-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; @@ -21110,7 +28000,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."osenv"."0.1.0" = self.by-version."osenv"."0.1.0"; @@ -21122,6 +28016,7 @@ self.by-version."osx-release"."1.0.0"; by-version."osx-release"."1.0.0" = self.buildNodePackage { name = "osx-release-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz"; @@ -21131,12 +28026,17 @@ deps = { "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."osx-trash"."^1.0.0" = self.by-version."osx-trash"."1.0.0"; by-version."osx-trash"."1.0.0" = self.buildNodePackage { name = "osx-trash-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/osx-trash/-/osx-trash-1.0.0.tgz"; @@ -21147,12 +28047,17 @@ "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0"; "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."owl-deepcopy"."*" = self.by-version."owl-deepcopy"."0.0.4"; by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage { name = "owl-deepcopy-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz"; @@ -21161,7 +28066,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4"; by-spec."owl-deepcopy"."~0.0.1" = @@ -21170,6 +28079,7 @@ self.by-version."p-throttler"."0.1.0"; by-version."p-throttler"."0.1.0" = self.buildNodePackage { name = "p-throttler-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz"; @@ -21179,12 +28089,17 @@ deps = { "q-0.9.7" = self.by-version."q"."0.9.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pac-proxy-agent"."0" = self.by-version."pac-proxy-agent"."0.2.0"; by-version."pac-proxy-agent"."0.2.0" = self.buildNodePackage { name = "pac-proxy-agent-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-0.2.0.tgz"; @@ -21194,37 +28109,47 @@ deps = { "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "pac-resolver-1.2.4" = self.by-version."pac-resolver"."1.2.4"; + "pac-resolver-1.2.6" = self.by-version."pac-resolver"."1.2.6"; "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0"; "get-uri-0.1.3" = self.by-version."get-uri"."0.1.3"; "stream-to-array-1.0.0" = self.by-version."stream-to-array"."1.0.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pac-resolver"."~1.2.1" = - self.by-version."pac-resolver"."1.2.4"; - by-version."pac-resolver"."1.2.4" = self.buildNodePackage { - name = "pac-resolver-1.2.4"; + self.by-version."pac-resolver"."1.2.6"; + by-version."pac-resolver"."1.2.6" = self.buildNodePackage { + name = "pac-resolver-1.2.6"; + version = "1.2.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.4.tgz"; - name = "pac-resolver-1.2.4.tgz"; - sha1 = "c6948acc57a1e78c8104ccdc8a4c89de90189008"; + url = "http://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.6.tgz"; + name = "pac-resolver-1.2.6.tgz"; + sha1 = "ed03af0c5b5933505bdd3f07f75175466d5e7cfb"; }; deps = { "co-3.0.6" = self.by-version."co"."3.0.6"; "netmask-1.0.5" = self.by-version."netmask"."1.0.5"; "degenerator-1.0.0" = self.by-version."degenerator"."1.0.0"; - "regenerator-0.4.12" = self.by-version."regenerator"."0.4.12"; + "regenerator-0.8.14" = self.by-version."regenerator"."0.8.14"; "thunkify-2.1.2" = self.by-version."thunkify"."2.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."package-json"."^0.2.0" = self.by-version."package-json"."0.2.0"; by-version."package-json"."0.2.0" = self.buildNodePackage { name = "package-json-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz"; @@ -21235,28 +28160,38 @@ "got-0.3.0" = self.by-version."got"."0.3.0"; "registry-url-0.1.1" = self.by-version."registry-url"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."package-json"."^1.0.0" = - self.by-version."package-json"."1.0.2"; - by-version."package-json"."1.0.2" = self.buildNodePackage { - name = "package-json-1.0.2"; + self.by-version."package-json"."1.1.0"; + by-version."package-json"."1.1.0" = self.buildNodePackage { + name = "package-json-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/package-json/-/package-json-1.0.2.tgz"; - name = "package-json-1.0.2.tgz"; - sha1 = "b3a5ef5a3072c95bc7b62cb643829428972f669b"; + url = "http://registry.npmjs.org/package-json/-/package-json-1.1.0.tgz"; + name = "package-json-1.1.0.tgz"; + sha1 = "32b427c626385ccce180dc73a66d94f35f545e4b"; }; deps = { "got-2.4.0" = self.by-version."got"."2.4.0"; - "registry-url-2.1.0" = self.by-version."registry-url"."2.1.0"; + "registry-url-3.0.0" = self.by-version."registry-url"."3.0.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pad"."0.0.5" = self.by-version."pad"."0.0.5"; by-version."pad"."0.0.5" = self.buildNodePackage { name = "pad-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pad/-/pad-0.0.5.tgz"; @@ -21265,12 +28200,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pako"."~0.2.0" = self.by-version."pako"."0.2.5"; by-version."pako"."0.2.5" = self.buildNodePackage { name = "pako-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz"; @@ -21279,12 +28219,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parents"."0.0.2" = self.by-version."parents"."0.0.2"; by-version."parents"."0.0.2" = self.buildNodePackage { name = "parents-0.0.2"; + version = "0.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz"; @@ -21293,12 +28238,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parents"."^1.0.0" = self.by-version."parents"."1.0.1"; by-version."parents"."1.0.1" = self.buildNodePackage { name = "parents-1.0.1"; + version = "1.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; @@ -21308,7 +28258,11 @@ deps = { "path-platform-0.11.15" = self.by-version."path-platform"."0.11.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parents"."^1.0.1" = self.by-version."parents"."1.0.1"; @@ -21316,6 +28270,7 @@ self.by-version."parents"."0.0.3"; by-version."parents"."0.0.3" = self.buildNodePackage { name = "parents-0.0.3"; + version = "0.0.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz"; @@ -21325,12 +28280,17 @@ deps = { "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parse-asn1"."^2.0.0" = self.by-version."parse-asn1"."2.0.0"; by-version."parse-asn1"."2.0.0" = self.buildNodePackage { name = "parse-asn1-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz"; @@ -21342,12 +28302,17 @@ "asn1.js-rfc3280-1.0.0" = self.by-version."asn1.js-rfc3280"."1.0.0"; "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parse-torrent"."^1.4.0" = self.by-version."parse-torrent"."1.7.0"; by-version."parse-torrent"."1.7.0" = self.buildNodePackage { name = "parse-torrent-1.7.0"; + version = "1.7.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.7.0.tgz"; @@ -21357,12 +28322,17 @@ deps = { "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parse-torrent"."~1.0.0" = self.by-version."parse-torrent"."1.0.0"; by-version."parse-torrent"."1.0.0" = self.buildNodePackage { name = "parse-torrent-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.0.0.tgz"; @@ -21373,12 +28343,17 @@ "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; "rusha-browserify-0.7.3" = self.by-version."rusha-browserify"."0.7.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parsejson"."0.0.1" = self.by-version."parsejson"."0.0.1"; by-version."parsejson"."0.0.1" = self.buildNodePackage { name = "parsejson-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; @@ -21388,12 +28363,17 @@ deps = { "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parseqs"."0.0.2" = self.by-version."parseqs"."0.0.2"; by-version."parseqs"."0.0.2" = self.buildNodePackage { name = "parseqs-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; @@ -21403,12 +28383,17 @@ deps = { "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parseuri"."0.0.2" = self.by-version."parseuri"."0.0.2"; by-version."parseuri"."0.0.2" = self.buildNodePackage { name = "parseuri-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; @@ -21418,12 +28403,17 @@ deps = { "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parseurl"."1.0.1" = self.by-version."parseurl"."1.0.1"; by-version."parseurl"."1.0.1" = self.buildNodePackage { name = "parseurl-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz"; @@ -21432,12 +28422,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parseurl"."~1.1.3" = self.by-version."parseurl"."1.1.3"; by-version."parseurl"."1.1.3" = self.buildNodePackage { name = "parseurl-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz"; @@ -21446,12 +28441,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parseurl"."~1.3.0" = self.by-version."parseurl"."1.3.0"; by-version."parseurl"."1.3.0" = self.buildNodePackage { name = "parseurl-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; @@ -21460,12 +28460,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."parsoid"."*" = self.by-version."parsoid"."0.2.0"; by-version."parsoid"."0.2.0" = self.buildNodePackage { name = "parsoid-0.2.0"; + version = "0.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/parsoid/-/parsoid-0.2.0.tgz"; @@ -21492,13 +28497,18 @@ "simplediff-0.1.1" = self.by-version."simplediff"."0.1.1"; "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "parsoid" = self.by-version."parsoid"."0.2.0"; by-spec."passport"."*" = self.by-version."passport"."0.2.1"; by-version."passport"."0.2.1" = self.buildNodePackage { name = "passport-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport/-/passport-0.2.1.tgz"; @@ -21509,15 +28519,22 @@ "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "passport" = self.by-version."passport"."0.2.1"; + by-spec."passport"."0.2.1" = + self.by-version."passport"."0.2.1"; by-spec."passport".">=0.1.15" = self.by-version."passport"."0.2.1"; by-spec."passport"."~0.1.1" = self.by-version."passport"."0.1.18"; by-version."passport"."0.1.18" = self.buildNodePackage { name = "passport-0.1.18"; + version = "0.1.18"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz"; @@ -21528,7 +28545,11 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport"."~0.1.3" = self.by-version."passport"."0.1.18"; @@ -21538,6 +28559,7 @@ self.by-version."passport-bitly"."0.1.0"; by-version."passport-bitly"."0.1.0" = self.buildNodePackage { name = "passport-bitly-0.1.0"; + version = "0.1.0"; bin = false; src = fetchgit { url = "git://github.com/simov/passport-bitly.git"; @@ -21548,12 +28570,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-dropbox".">=0.1.2" = self.by-version."passport-dropbox"."0.1.2"; by-version."passport-dropbox"."0.1.2" = self.buildNodePackage { name = "passport-dropbox-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-dropbox/-/passport-dropbox-0.1.2.tgz"; @@ -21564,12 +28591,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-evernote"."^0.1.1" = self.by-version."passport-evernote"."0.1.1"; by-version."passport-evernote"."0.1.1" = self.buildNodePackage { name = "passport-evernote-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-evernote/-/passport-evernote-0.1.1.tgz"; @@ -21580,12 +28612,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-facebook".">=0.1.5" = self.by-version."passport-facebook"."1.0.3"; by-version."passport-facebook"."1.0.3" = self.buildNodePackage { name = "passport-facebook-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-facebook/-/passport-facebook-1.0.3.tgz"; @@ -21595,12 +28632,17 @@ deps = { "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-flickr".">=0.1.1" = self.by-version."passport-flickr"."0.2.0"; by-version."passport-flickr"."0.2.0" = self.buildNodePackage { name = "passport-flickr-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-flickr/-/passport-flickr-0.2.0.tgz"; @@ -21610,12 +28652,17 @@ deps = { "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-github".">=0.1.5" = self.by-version."passport-github"."0.1.5"; by-version."passport-github"."0.1.5" = self.buildNodePackage { name = "passport-github-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-github/-/passport-github-0.1.5.tgz"; @@ -21626,12 +28673,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-google-oauth"."*" = self.by-version."passport-google-oauth"."0.1.5"; by-version."passport-google-oauth"."0.1.5" = self.buildNodePackage { name = "passport-google-oauth-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-0.1.5.tgz"; @@ -21642,7 +28694,11 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-google-oauth".">=0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; @@ -21650,6 +28706,7 @@ self.by-version."passport-http"."0.2.2"; by-version."passport-http"."0.2.2" = self.buildNodePackage { name = "passport-http-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz"; @@ -21660,13 +28717,38 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-0.1.18" = self.by-version."passport"."0.1.18"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "passport-http" = self.by-version."passport-http"."0.2.2"; + by-spec."passport-http-bearer"."1.0.1" = + self.by-version."passport-http-bearer"."1.0.1"; + by-version."passport-http-bearer"."1.0.1" = self.buildNodePackage { + name = "passport-http-bearer-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz"; + name = "passport-http-bearer-1.0.1.tgz"; + sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8"; + }; + deps = { + "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."passport-imgur".">=0.0.1" = self.by-version."passport-imgur"."0.0.2"; by-version."passport-imgur"."0.0.2" = self.buildNodePackage { name = "passport-imgur-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-imgur/-/passport-imgur-0.0.2.tgz"; @@ -21676,12 +28758,17 @@ deps = { "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-instagram".">=0.1.2" = self.by-version."passport-instagram"."0.1.2"; by-version."passport-instagram"."0.1.2" = self.buildNodePackage { name = "passport-instagram-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-instagram/-/passport-instagram-0.1.2.tgz"; @@ -21692,12 +28779,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-local"."*" = self.by-version."passport-local"."1.0.0"; by-version."passport-local"."1.0.0" = self.buildNodePackage { name = "passport-local-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; @@ -21707,7 +28799,11 @@ deps = { "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "passport-local" = self.by-version."passport-local"."1.0.0"; by-spec."passport-local"."~1.0.0" = @@ -21716,6 +28812,7 @@ self.by-version."passport-mailchimp"."0.0.1"; by-version."passport-mailchimp"."0.0.1" = self.buildNodePackage { name = "passport-mailchimp-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-mailchimp/-/passport-mailchimp-0.0.1.tgz"; @@ -21726,12 +28823,17 @@ "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-mixcloud".">=0.0.1" = self.by-version."passport-mixcloud"."0.0.2"; by-version."passport-mixcloud"."0.0.2" = self.buildNodePackage { name = "passport-mixcloud-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-mixcloud/-/passport-mixcloud-0.0.2.tgz"; @@ -21744,12 +28846,17 @@ "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2"; "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-oauth"."0.1.x" = self.by-version."passport-oauth"."0.1.15"; by-version."passport-oauth"."0.1.15" = self.buildNodePackage { name = "passport-oauth-0.1.15"; + version = "0.1.15"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-0.1.15.tgz"; @@ -21761,12 +28868,17 @@ "passport-0.1.18" = self.by-version."passport"."0.1.18"; "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-oauth".">= 0.1.0" = self.by-version."passport-oauth"."1.0.0"; by-version."passport-oauth"."1.0.0" = self.buildNodePackage { name = "passport-oauth-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz"; @@ -21777,7 +28889,11 @@ "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1"; "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-oauth"."~0.1.1" = self.by-version."passport-oauth"."0.1.15"; @@ -21789,6 +28905,7 @@ self.by-version."passport-oauth1"."1.0.1"; by-version."passport-oauth1"."1.0.1" = self.buildNodePackage { name = "passport-oauth1-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.0.1.tgz"; @@ -21800,12 +28917,17 @@ "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-oauth2"."1.x.x" = self.by-version."passport-oauth2"."1.1.2"; by-version."passport-oauth2"."1.1.2" = self.buildNodePackage { name = "passport-oauth2-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.1.2.tgz"; @@ -21817,12 +28939,37 @@ "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."passport-oauth2-client-password"."0.1.2" = + self.by-version."passport-oauth2-client-password"."0.1.2"; + by-version."passport-oauth2-client-password"."0.1.2" = self.buildNodePackage { + name = "passport-oauth2-client-password-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz"; + name = "passport-oauth2-client-password-0.1.2.tgz"; + sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; + }; + deps = { + "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-soundcloud".">=0.1.2" = self.by-version."passport-soundcloud"."0.1.2"; by-version."passport-soundcloud"."0.1.2" = self.buildNodePackage { name = "passport-soundcloud-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.1.2.tgz"; @@ -21833,12 +28980,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-strategy"."1.x.x" = self.by-version."passport-strategy"."1.0.0"; by-version."passport-strategy"."1.0.0" = self.buildNodePackage { name = "passport-strategy-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; @@ -21847,12 +28999,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-trello"."~0.1.4" = self.by-version."passport-trello"."0.1.4"; by-version."passport-trello"."0.1.4" = self.buildNodePackage { name = "passport-trello-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-trello/-/passport-trello-0.1.4.tgz"; @@ -21862,12 +29019,17 @@ deps = { "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-twitter".">=0.1.4" = self.by-version."passport-twitter"."1.0.2"; by-version."passport-twitter"."1.0.2" = self.buildNodePackage { name = "passport-twitter-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.2.tgz"; @@ -21878,12 +29040,17 @@ "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1"; "xtraverse-0.1.0" = self.by-version."xtraverse"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."passport-wordpress".">=0.0.1" = self.by-version."passport-wordpress"."0.0.3"; by-version."passport-wordpress"."0.0.3" = self.buildNodePackage { name = "passport-wordpress-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.3.tgz"; @@ -21894,12 +29061,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."path-browserify"."~0.0.0" = + by-spec."path-browserify"."0.0.0" = self.by-version."path-browserify"."0.0.0"; by-version."path-browserify"."0.0.0" = self.buildNodePackage { name = "path-browserify-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; @@ -21908,12 +29080,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."path-browserify"."~0.0.0" = + self.by-version."path-browserify"."0.0.0"; by-spec."path-is-inside"."^1.0.1" = self.by-version."path-is-inside"."1.0.1"; by-version."path-is-inside"."1.0.1" = self.buildNodePackage { name = "path-is-inside-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; @@ -21922,7 +29101,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."path-is-inside"."~1.0.0" = self.by-version."path-is-inside"."1.0.1"; @@ -21930,6 +29113,7 @@ self.by-version."path-platform"."0.0.1"; by-version."path-platform"."0.0.1" = self.buildNodePackage { name = "path-platform-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz"; @@ -21938,12 +29122,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."path-platform"."~0.11.15" = self.by-version."path-platform"."0.11.15"; by-version."path-platform"."0.11.15" = self.buildNodePackage { name = "path-platform-0.11.15"; + version = "0.11.15"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; @@ -21952,12 +29141,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."path-proxy"."~1.0" = self.by-version."path-proxy"."1.0.0"; by-version."path-proxy"."1.0.0" = self.buildNodePackage { name = "path-proxy-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz"; @@ -21967,12 +29161,17 @@ deps = { "inflection-1.3.8" = self.by-version."inflection"."1.3.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { name = "path-to-regexp-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; @@ -21981,12 +29180,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pause"."0.0.1" = self.by-version."pause"."0.0.1"; by-version."pause"."0.0.1" = self.buildNodePackage { name = "pause-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; @@ -21995,12 +29199,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pbkdf2-compat"."2.0.1" = + self.by-version."pbkdf2-compat"."2.0.1"; + by-version."pbkdf2-compat"."2.0.1" = self.buildNodePackage { + name = "pbkdf2-compat-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; + name = "pbkdf2-compat-2.0.1.tgz"; + sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pbkdf2-compat"."^3.0.1" = self.by-version."pbkdf2-compat"."3.0.2"; by-version."pbkdf2-compat"."3.0.2" = self.buildNodePackage { name = "pbkdf2-compat-3.0.2"; + version = "3.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"; @@ -22010,12 +29238,17 @@ deps = { "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."peer-wire-protocol"."^0.7.0" = self.by-version."peer-wire-protocol"."0.7.0"; by-version."peer-wire-protocol"."0.7.0" = self.buildNodePackage { name = "peer-wire-protocol-0.7.0"; + version = "0.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; @@ -22028,12 +29261,17 @@ "bncode-0.2.3" = self.by-version."bncode"."0.2.3"; "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."peer-wire-swarm"."^0.9.0" = self.by-version."peer-wire-swarm"."0.9.2"; by-version."peer-wire-swarm"."0.9.2" = self.buildNodePackage { name = "peer-wire-swarm-0.9.2"; + version = "0.9.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz"; @@ -22046,7 +29284,11 @@ "once-1.3.1" = self.by-version."once"."1.3.1"; "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."peer-wire-swarm"."^0.9.2" = self.by-version."peer-wire-swarm"."0.9.2"; @@ -22054,6 +29296,7 @@ self.by-version."peerflix"."0.25.2"; by-version."peerflix"."0.25.2" = self.buildNodePackage { name = "peerflix-0.25.2"; + version = "0.25.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/peerflix/-/peerflix-0.25.2.tgz"; @@ -22061,7 +29304,6 @@ sha1 = "244997a977c881995a3acce7bd7511c3f4006467"; }; deps = { - "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11"; "clivas-0.1.4" = self.by-version."clivas"."0.1.4"; "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; "mime-1.3.4" = self.by-version."mime"."1.3.4"; @@ -22077,39 +29319,21 @@ "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; - peerDependencies = []; - }; - "peerflix" = self.by-version."peerflix"."0.25.2"; - by-spec."peerflix"."^0.19.1" = - self.by-version."peerflix"."0.19.3"; - by-version."peerflix"."0.19.3" = self.buildNodePackage { - name = "peerflix-0.19.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/peerflix/-/peerflix-0.19.3.tgz"; - name = "peerflix-0.19.3.tgz"; - sha1 = "2376097d7563f37db1d6e93c8b1f9cf800592a54"; - }; - deps = { - "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11"; - "clivas-0.1.4" = self.by-version."clivas"."0.1.4"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "network-address-0.0.4" = self.by-version."network-address"."0.0.4"; - "numeral-1.5.3" = self.by-version."numeral"."1.5.3"; - "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - "pump-0.3.5" = self.by-version."pump"."0.3.5"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "rc-0.4.0" = self.by-version."rc"."0.4.0"; - "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0"; - "torrent-stream-0.15.1" = self.by-version."torrent-stream"."0.15.1"; - "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; + optionalDependencies = { + "airplay-js-0.2.12" = self.by-version."airplay-js"."0.2.12"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + "peerflix" = self.by-version."peerflix"."0.25.2"; + by-spec."peerflix"."^0.25.2" = + self.by-version."peerflix"."0.25.2"; by-spec."peerflix-server"."*" = self.by-version."peerflix-server"."0.0.20"; by-version."peerflix-server"."0.0.20" = self.buildNodePackage { name = "peerflix-server-0.0.20"; + version = "0.0.20"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.20.tgz"; @@ -22128,13 +29352,18 @@ "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "peerflix-server" = self.by-version."peerflix-server"."0.0.20"; by-spec."pegjs"."0.6.2" = self.by-version."pegjs"."0.6.2"; by-version."pegjs"."0.6.2" = self.buildNodePackage { name = "pegjs-0.6.2"; + version = "0.6.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"; @@ -22143,12 +29372,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pegjs"."git+https://github.com/arlolra/pegjs#startOffset" = self.by-version."pegjs"."0.8.0"; by-version."pegjs"."0.8.0" = self.buildNodePackage { name = "pegjs-0.8.0"; + version = "0.8.0"; bin = true; src = fetchgit { url = "https://github.com/arlolra/pegjs"; @@ -22157,12 +29391,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pemstrip"."0.0.1" = self.by-version."pemstrip"."0.0.1"; by-version."pemstrip"."0.0.1" = self.buildNodePackage { name = "pemstrip-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz"; @@ -22171,12 +29410,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."phantomjs"."*" = self.by-version."phantomjs"."1.9.15"; by-version."phantomjs"."1.9.15" = self.buildNodePackage { name = "phantomjs-1.9.15"; + version = "1.9.15"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.15.tgz"; @@ -22193,7 +29437,11 @@ "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "phantomjs" = self.by-version."phantomjs"."1.9.15"; by-spec."phantomjs"."~1.9.1" = @@ -22204,6 +29452,7 @@ self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = self.buildNodePackage { name = "pkginfo-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; @@ -22212,12 +29461,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pkginfo"."0.3.x" = self.by-version."pkginfo"."0.3.0"; by-version."pkginfo"."0.3.0" = self.buildNodePackage { name = "pkginfo-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; @@ -22226,7 +29480,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pkginfo"."0.x.x" = self.by-version."pkginfo"."0.3.0"; @@ -22236,6 +29494,7 @@ self.by-version."playerui"."1.2.0"; by-version."playerui"."1.2.0" = self.buildNodePackage { name = "playerui-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; @@ -22248,28 +29507,17 @@ "single-line-log-0.4.1" = self.by-version."single-line-log"."0.4.1"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; - peerDependencies = []; - }; - by-spec."plc"."*" = - self.by-version."plc"."0.2.0"; - by-version."plc"."0.2.0" = self.buildNodePackage { - name = "plc-0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/plc/-/plc-0.2.0.tgz"; - name = "plc-0.2.0.tgz"; - sha1 = "2218f9217c82ea0d3266bb601a8180abb230675a"; - }; - deps = { - "bits-0.1.1" = self.by-version."bits"."0.1.1"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "plc" = self.by-version."plc"."0.2.0"; by-spec."plist"."1.1.0" = self.by-version."plist"."1.1.0"; by-version."plist"."1.1.0" = self.buildNodePackage { name = "plist-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/plist/-/plist-1.1.0.tgz"; @@ -22282,12 +29530,19 @@ "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19"; "util-deprecate-1.0.0" = self.by-version."util-deprecate"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."plist"."^1.0.1" = + self.by-version."plist"."1.1.0"; by-spec."plist-native"."*" = self.by-version."plist-native"."0.3.1"; by-version."plist-native"."0.3.1" = self.buildNodePackage { name = "plist-native-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz"; @@ -22297,13 +29552,18 @@ deps = { "libxmljs-0.10.0" = self.by-version."libxmljs"."0.10.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "plist-native" = self.by-version."plist-native"."0.3.1"; by-spec."plist-with-patches"."0.5.1" = self.by-version."plist-with-patches"."0.5.1"; by-version."plist-with-patches"."0.5.1" = self.buildNodePackage { name = "plist-with-patches-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz"; @@ -22314,12 +29574,17 @@ "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3"; "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."policyfile"."0.0.4" = self.by-version."policyfile"."0.0.4"; by-version."policyfile"."0.0.4" = self.buildNodePackage { name = "policyfile-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; @@ -22328,12 +29593,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pooling"."0.4.6" = self.by-version."pooling"."0.4.6"; by-version."pooling"."0.4.6" = self.buildNodePackage { name = "pooling-0.4.6"; + version = "0.4.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz"; @@ -22345,14 +29615,19 @@ "bunyan-0.22.1" = self.by-version."bunyan"."0.22.1"; "once-1.3.0" = self.by-version."once"."1.3.0"; "vasync-1.4.0" = self.by-version."vasync"."1.4.0"; + }; + optionalDependencies = { "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pop-iterate"."^1.0.1" = self.by-version."pop-iterate"."1.0.1"; by-version."pop-iterate"."1.0.1" = self.buildNodePackage { name = "pop-iterate-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; @@ -22361,12 +29636,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."portfinder"."^0.2.1" = self.by-version."portfinder"."0.2.1"; by-version."portfinder"."0.2.1" = self.buildNodePackage { name = "portfinder-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz"; @@ -22376,12 +29656,17 @@ deps = { "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."portfinder"."^0.3.0" = self.by-version."portfinder"."0.3.0"; by-version."portfinder"."0.3.0" = self.buildNodePackage { name = "portfinder-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz"; @@ -22391,12 +29676,17 @@ deps = { "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."posix"."*" = self.by-version."posix"."2.0.0"; by-version."posix"."2.0.0" = self.buildNodePackage { name = "posix-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz"; @@ -22406,13 +29696,18 @@ deps = { "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "posix" = self.by-version."posix"."2.0.0"; by-spec."posix-getopt"."1.0.0" = self.by-version."posix-getopt"."1.0.0"; by-version."posix-getopt"."1.0.0" = self.buildNodePackage { name = "posix-getopt-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz"; @@ -22421,12 +29716,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."posix-getopt"."1.1.0" = self.by-version."posix-getopt"."1.1.0"; by-version."posix-getopt"."1.1.0" = self.buildNodePackage { name = "posix-getopt-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz"; @@ -22435,12 +29735,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."prelude-ls"."~1.1.0" = self.by-version."prelude-ls"."1.1.1"; by-version."prelude-ls"."1.1.1" = self.buildNodePackage { name = "prelude-ls-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"; @@ -22449,7 +29754,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."prelude-ls"."~1.1.1" = self.by-version."prelude-ls"."1.1.1"; @@ -22457,6 +29766,7 @@ self.by-version."prepend-http"."1.0.1"; by-version."prepend-http"."1.0.1" = self.buildNodePackage { name = "prepend-http-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz"; @@ -22465,12 +29775,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pretty-bytes"."^1.0.0" = self.by-version."pretty-bytes"."1.0.3"; by-version."pretty-bytes"."1.0.3" = self.buildNodePackage { name = "pretty-bytes-1.0.3"; + version = "1.0.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.3.tgz"; @@ -22480,12 +29795,17 @@ deps = { "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pretty-hrtime"."^0.2.0" = self.by-version."pretty-hrtime"."0.2.2"; by-version."pretty-hrtime"."0.2.2" = self.buildNodePackage { name = "pretty-hrtime-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"; @@ -22494,12 +29814,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."prfun"."~1.0.2" = self.by-version."prfun"."1.0.2"; by-version."prfun"."1.0.2" = self.buildNodePackage { name = "prfun-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/prfun/-/prfun-1.0.2.tgz"; @@ -22507,14 +29832,19 @@ sha1 = "ac8799843d8194ea478ee4442e455fd5e054db3e"; }; deps = { - "es6-shim-0.25.0" = self.by-version."es6-shim"."0.25.0"; + "es6-shim-0.25.3" = self.by-version."es6-shim"."0.25.3"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."private"."~0.1.2" = self.by-version."private"."0.1.6"; by-version."private"."0.1.6" = self.buildNodePackage { name = "private-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/private/-/private-0.1.6.tgz"; @@ -22523,7 +29853,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."private"."~0.1.5" = self.by-version."private"."0.1.6"; @@ -22533,6 +29867,7 @@ self.by-version."process"."0.10.0"; by-version."process"."0.10.0" = self.buildNodePackage { name = "process-0.10.0"; + version = "0.10.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/process/-/process-0.10.0.tgz"; @@ -22541,12 +29876,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."process"."^0.8.0" = self.by-version."process"."0.8.0"; by-version."process"."0.8.0" = self.buildNodePackage { name = "process-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz"; @@ -22555,7 +29895,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."process"."~0.10.0" = self.by-version."process"."0.10.0"; @@ -22563,6 +29907,7 @@ self.by-version."process"."0.5.2"; by-version."process"."0.5.2" = self.buildNodePackage { name = "process-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz"; @@ -22571,12 +29916,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."process"."~0.6.0" = self.by-version."process"."0.6.0"; by-version."process"."0.6.0" = self.buildNodePackage { name = "process-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz"; @@ -22585,12 +29935,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."process"."~0.8.0" = + self.by-version."process"."0.8.0"; by-spec."progress"."1.1.4" = self.by-version."progress"."1.1.4"; by-version."progress"."1.1.4" = self.buildNodePackage { name = "progress-1.1.4"; + version = "1.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/progress/-/progress-1.1.4.tgz"; @@ -22599,12 +29956,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."progress"."1.1.8" = self.by-version."progress"."1.1.8"; by-version."progress"."1.1.8" = self.buildNodePackage { name = "progress-1.1.8"; + version = "1.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; @@ -22613,12 +29975,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."promiscuous"."^0.6.0" = self.by-version."promiscuous"."0.6.0"; by-version."promiscuous"."0.6.0" = self.buildNodePackage { name = "promiscuous-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; @@ -22627,12 +29994,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."promise"."^6.0.1" = self.by-version."promise"."6.1.0"; by-version."promise"."6.1.0" = self.buildNodePackage { name = "promise-6.1.0"; + version = "6.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; @@ -22642,12 +30014,17 @@ deps = { "asap-1.0.0" = self.by-version."asap"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = self.buildNodePackage { name = "promise-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; @@ -22657,12 +30034,17 @@ deps = { "is-promise-1.0.1" = self.by-version."is-promise"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."prompt"."0.2.14" = self.by-version."prompt"."0.2.14"; by-version."prompt"."0.2.14" = self.buildNodePackage { name = "prompt-0.2.14"; + version = "0.2.14"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; @@ -22676,7 +30058,11 @@ "utile-0.2.1" = self.by-version."utile"."0.2.1"; "winston-0.8.3" = self.by-version."winston"."0.8.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."prompt"."0.2.x" = self.by-version."prompt"."0.2.14"; @@ -22684,6 +30070,7 @@ self.by-version."promptly"."0.2.0"; by-version."promptly"."0.2.0" = self.buildNodePackage { name = "promptly-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz"; @@ -22693,12 +30080,17 @@ deps = { "read-1.0.5" = self.by-version."read"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."promzard"."~0.2.0" = self.by-version."promzard"."0.2.2"; by-version."promzard"."0.2.2" = self.buildNodePackage { name = "promzard-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"; @@ -22708,12 +30100,17 @@ deps = { "read-1.0.5" = self.by-version."read"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."properties-parser"."0.2.3" = self.by-version."properties-parser"."0.2.3"; by-version."properties-parser"."0.2.3" = self.buildNodePackage { name = "properties-parser-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"; @@ -22722,12 +30119,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."proto-list"."~1.2.1" = self.by-version."proto-list"."1.2.3"; by-version."proto-list"."1.2.3" = self.buildNodePackage { name = "proto-list-1.2.3"; + version = "1.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"; @@ -22736,12 +30138,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."protobufjs"."^3.2.2" = self.by-version."protobufjs"."3.8.2"; by-version."protobufjs"."3.8.2" = self.buildNodePackage { name = "protobufjs-3.8.2"; + version = "3.8.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; @@ -22752,12 +30159,17 @@ "bytebuffer-3.5.4" = self.by-version."bytebuffer"."3.5.4"; "ascli-0.3.0" = self.by-version."ascli"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."proxy-addr"."1.0.1" = self.by-version."proxy-addr"."1.0.1"; by-version."proxy-addr"."1.0.1" = self.buildNodePackage { name = "proxy-addr-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; @@ -22767,12 +30179,17 @@ deps = { "ipaddr.js-0.1.2" = self.by-version."ipaddr.js"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."proxy-addr"."~1.0.3" = self.by-version."proxy-addr"."1.0.6"; by-version."proxy-addr"."1.0.6" = self.buildNodePackage { name = "proxy-addr-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.6.tgz"; @@ -22783,7 +30200,11 @@ "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."proxy-addr"."~1.0.5" = self.by-version."proxy-addr"."1.0.6"; @@ -22793,6 +30214,7 @@ self.by-version."proxy-agent"."1.1.0"; by-version."proxy-agent"."1.1.0" = self.buildNodePackage { name = "proxy-agent-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/proxy-agent/-/proxy-agent-1.1.0.tgz"; @@ -22806,7 +30228,11 @@ "socks-proxy-agent-0.1.2" = self.by-version."socks-proxy-agent"."0.1.2"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."proxy-agent"."~1.1.0" = self.by-version."proxy-agent"."1.1.0"; @@ -22814,6 +30240,7 @@ self.by-version."prr"."0.0.0"; by-version."prr"."0.0.0" = self.buildNodePackage { name = "prr-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; @@ -22822,12 +30249,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ps-tree"."0.0.x" = self.by-version."ps-tree"."0.0.3"; by-version."ps-tree"."0.0.3" = self.buildNodePackage { name = "ps-tree-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; @@ -22837,7 +30269,11 @@ deps = { "event-stream-0.5.3" = self.by-version."event-stream"."0.5.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ps-tree"."~0.0.3" = self.by-version."ps-tree"."0.0.3"; @@ -22845,6 +30281,7 @@ self.by-version."public-address"."0.1.1"; by-version."public-address"."0.1.1" = self.buildNodePackage { name = "public-address-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/public-address/-/public-address-0.1.1.tgz"; @@ -22853,12 +30290,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."public-encrypt"."1.1.2" = self.by-version."public-encrypt"."1.1.2"; by-version."public-encrypt"."1.1.2" = self.buildNodePackage { name = "public-encrypt-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.1.2.tgz"; @@ -22870,12 +30312,17 @@ "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1"; "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pump"."^0.3.1" = self.by-version."pump"."0.3.5"; by-version."pump"."0.3.5" = self.buildNodePackage { name = "pump-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; @@ -22886,7 +30333,11 @@ "once-1.2.0" = self.by-version."once"."1.2.0"; "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."pump"."^0.3.5" = self.by-version."pump"."0.3.5"; @@ -22896,6 +30347,7 @@ self.by-version."punycode"."1.3.2"; by-version."punycode"."1.3.2" = self.buildNodePackage { name = "punycode-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; @@ -22904,7 +30356,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."punycode".">=0.2.0" = self.by-version."punycode"."1.3.2"; @@ -22912,6 +30368,7 @@ self.by-version."punycode"."1.0.0"; by-version."punycode"."1.0.0" = self.buildNodePackage { name = "punycode-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz"; @@ -22920,12 +30377,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."punycode"."^1.2.4" = + self.by-version."punycode"."1.3.2"; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; by-version."punycode"."1.2.4" = self.buildNodePackage { name = "punycode-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"; @@ -22934,7 +30398,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."punycode"."~1.2.4" = self.by-version."punycode"."1.2.4"; @@ -22942,6 +30410,7 @@ self.by-version."pure-css"."0.5.0-rc-1"; by-version."pure"."0.5.0-rc-1" = self.buildNodePackage { name = "pure-0.5.0-rc-1"; + version = "0.5.0-rc-1"; bin = false; src = fetchgit { url = "git://github.com/yui/pure.git"; @@ -22950,13 +30419,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "pure-css" = self.by-version."pure"."0.5.0-rc-1"; by-spec."pusher"."^1.0.0" = self.by-version."pusher"."1.0.4"; by-version."pusher"."1.0.4" = self.buildNodePackage { name = "pusher-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/pusher/-/pusher-1.0.4.tgz"; @@ -22966,12 +30440,17 @@ deps = { "request-2.45.0" = self.by-version."request"."2.45.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."q"."0.9.7" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = self.buildNodePackage { name = "q-0.9.7"; + version = "0.9.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; @@ -22980,12 +30459,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."q"."1.0.1" = self.by-version."q"."1.0.1"; by-version."q"."1.0.1" = self.buildNodePackage { name = "q-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; @@ -22994,12 +30478,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."q".">= 0.0.1" = self.by-version."q"."2.0.3"; by-version."q"."2.0.3" = self.buildNodePackage { name = "q-2.0.3"; + version = "2.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/q/-/q-2.0.3.tgz"; @@ -23011,24 +30500,33 @@ "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1"; "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."q"."^1.0.1" = - self.by-version."q"."1.1.2"; - by-version."q"."1.1.2" = self.buildNodePackage { - name = "q-1.1.2"; + self.by-version."q"."1.2.0"; + by-version."q"."1.2.0" = self.buildNodePackage { + name = "q-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/q/-/q-1.1.2.tgz"; - name = "q-1.1.2.tgz"; - sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89"; + url = "http://registry.npmjs.org/q/-/q-1.2.0.tgz"; + name = "q-1.2.0.tgz"; + sha1 = "811705ce4a9802adff811ab0fcdbd01946e1fe22"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."q"."^1.1.2" = - self.by-version."q"."1.1.2"; + self.by-version."q"."1.2.0"; by-spec."q"."~0.9.2" = self.by-version."q"."0.9.7"; by-spec."q"."~0.9.6" = @@ -23041,10 +30539,28 @@ self.by-version."q"."1.0.1"; by-spec."q"."~1.1.2" = self.by-version."q"."1.1.2"; + by-version."q"."1.1.2" = self.buildNodePackage { + name = "q-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/q/-/q-1.1.2.tgz"; + name = "q-1.1.2.tgz"; + sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."qap"."^3.1.2" = self.by-version."qap"."3.1.3"; by-version."qap"."3.1.3" = self.buildNodePackage { name = "qap-3.1.3"; + version = "3.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qap/-/qap-3.1.3.tgz"; @@ -23053,12 +30569,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = self.buildNodePackage { name = "qs-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; @@ -23067,7 +30588,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."0.4.x" = self.by-version."qs"."0.4.2"; @@ -23075,6 +30600,7 @@ self.by-version."qs"."0.5.1"; by-version."qs"."0.5.1" = self.buildNodePackage { name = "qs-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; @@ -23083,12 +30609,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."0.5.5" = self.by-version."qs"."0.5.5"; by-version."qs"."0.5.5" = self.buildNodePackage { name = "qs-0.5.5"; + version = "0.5.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz"; @@ -23097,12 +30628,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."0.5.x" = self.by-version."qs"."0.5.6"; by-version."qs"."0.5.6" = self.buildNodePackage { name = "qs-0.5.6"; + version = "0.5.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; @@ -23111,12 +30647,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."0.6.5" = self.by-version."qs"."0.6.5"; by-version."qs"."0.6.5" = self.buildNodePackage { name = "qs-0.6.5"; + version = "0.6.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; @@ -23125,12 +30666,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."0.6.6" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = self.buildNodePackage { name = "qs-0.6.6"; + version = "0.6.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; @@ -23139,12 +30685,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."1.2.0" = self.by-version."qs"."1.2.0"; by-version."qs"."1.2.0" = self.buildNodePackage { name = "qs-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; @@ -23153,12 +30704,36 @@ }; deps = { }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."2.2.3" = + self.by-version."qs"."2.2.3"; + by-version."qs"."2.2.3" = self.buildNodePackage { + name = "qs-2.2.3"; + version = "2.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz"; + name = "qs-2.2.3.tgz"; + sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb"; + }; + deps = { + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."2.2.4" = self.by-version."qs"."2.2.4"; by-version."qs"."2.2.4" = self.buildNodePackage { name = "qs-2.2.4"; + version = "2.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; @@ -23167,12 +30742,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."2.3.2" = self.by-version."qs"."2.3.2"; by-version."qs"."2.3.2" = self.buildNodePackage { name = "qs-2.3.2"; + version = "2.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-2.3.2.tgz"; @@ -23181,12 +30761,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."2.3.3" = self.by-version."qs"."2.3.3"; by-version."qs"."2.3.3" = self.buildNodePackage { name = "qs-2.3.3"; + version = "2.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; @@ -23195,7 +30780,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs".">= 0.4.0" = self.by-version."qs"."2.3.3"; @@ -23207,6 +30796,7 @@ self.by-version."qs"."1.0.2"; by-version."qs"."1.0.2" = self.buildNodePackage { name = "qs-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz"; @@ -23215,12 +30805,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."~1.2.0" = self.by-version."qs"."1.2.2"; by-version."qs"."1.2.2" = self.buildNodePackage { name = "qs-1.2.2"; + version = "1.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; @@ -23229,7 +30824,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."~1.2.2" = self.by-version."qs"."1.2.2"; @@ -23237,6 +30836,7 @@ self.by-version."qs"."2.2.5"; by-version."qs"."2.2.5" = self.buildNodePackage { name = "qs-2.2.5"; + version = "2.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/qs/-/qs-2.2.5.tgz"; @@ -23245,7 +30845,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."qs"."~2.3.1" = self.by-version."qs"."2.3.3"; @@ -23253,6 +30857,7 @@ self.by-version."query-string"."1.0.0"; by-version."query-string"."1.0.0" = self.buildNodePackage { name = "query-string-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/query-string/-/query-string-1.0.0.tgz"; @@ -23261,12 +30866,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."querystring".">=0.1.0 <0.2.0" = self.by-version."querystring"."0.1.0"; by-version."querystring"."0.1.0" = self.buildNodePackage { name = "querystring-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz"; @@ -23275,12 +30885,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" = self.by-version."querystring"."0.2.0"; by-version."querystring"."0.2.0" = self.buildNodePackage { name = "querystring-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz"; @@ -23289,12 +30904,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."querystring-es3"."~0.2.0" = self.by-version."querystring-es3"."0.2.1"; by-version."querystring-es3"."0.2.1" = self.buildNodePackage { name = "querystring-es3-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; @@ -23303,12 +30923,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rai"."~0.1.11" = self.by-version."rai"."0.1.12"; by-version."rai"."0.1.12" = self.buildNodePackage { name = "rai-0.1.12"; + version = "0.1.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rai/-/rai-0.1.12.tgz"; @@ -23317,12 +30942,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rainbowsocks"."~0.1.2" = self.by-version."rainbowsocks"."0.1.2"; by-version."rainbowsocks"."0.1.2" = self.buildNodePackage { name = "rainbowsocks-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rainbowsocks/-/rainbowsocks-0.1.2.tgz"; @@ -23332,12 +30962,17 @@ deps = { "debug-1.0.4" = self.by-version."debug"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."random-access-file"."^0.3.1" = self.by-version."random-access-file"."0.3.1"; by-version."random-access-file"."0.3.1" = self.buildNodePackage { name = "random-access-file-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/random-access-file/-/random-access-file-0.3.1.tgz"; @@ -23347,12 +30982,17 @@ deps = { "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."randombytes"."^2.0.0" = self.by-version."randombytes"."2.0.1"; by-version."randombytes"."2.0.1" = self.buildNodePackage { name = "randombytes-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"; @@ -23361,12 +31001,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."range-parser"."0.0.4" = self.by-version."range-parser"."0.0.4"; by-version."range-parser"."0.0.4" = self.buildNodePackage { name = "range-parser-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; @@ -23375,12 +31020,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."range-parser"."1.0.0" = self.by-version."range-parser"."1.0.0"; by-version."range-parser"."1.0.0" = self.buildNodePackage { name = "range-parser-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz"; @@ -23389,12 +31039,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."range-parser"."^1.0.0" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = self.buildNodePackage { name = "range-parser-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; @@ -23403,7 +31058,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."range-parser"."^1.0.2" = self.by-version."range-parser"."1.0.2"; @@ -23415,6 +31074,7 @@ self.by-version."raven"."0.7.2"; by-version."raven"."0.7.2" = self.buildNodePackage { name = "raven-0.7.2"; + version = "0.7.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/raven/-/raven-0.7.2.tgz"; @@ -23427,12 +31087,17 @@ "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-body"."0.0.3" = self.by-version."raw-body"."0.0.3"; by-version."raw-body"."0.0.3" = self.buildNodePackage { name = "raw-body-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; @@ -23441,12 +31106,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-body"."1.1.4" = self.by-version."raw-body"."1.1.4"; by-version."raw-body"."1.1.4" = self.buildNodePackage { name = "raw-body-1.1.4"; + version = "1.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; @@ -23456,12 +31126,17 @@ deps = { "bytes-0.3.0" = self.by-version."bytes"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-body"."1.3.0" = self.by-version."raw-body"."1.3.0"; by-version."raw-body"."1.3.0" = self.buildNodePackage { name = "raw-body-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; @@ -23472,12 +31147,17 @@ "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-body"."1.3.1" = self.by-version."raw-body"."1.3.1"; by-version."raw-body"."1.3.1" = self.buildNodePackage { name = "raw-body-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.1.tgz"; @@ -23488,12 +31168,17 @@ "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-body"."1.3.2" = self.by-version."raw-body"."1.3.2"; by-version."raw-body"."1.3.2" = self.buildNodePackage { name = "raw-body-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.2.tgz"; @@ -23504,12 +31189,17 @@ "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-body"."1.3.3" = self.by-version."raw-body"."1.3.3"; by-version."raw-body"."1.3.3" = self.buildNodePackage { name = "raw-body-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz"; @@ -23520,12 +31210,17 @@ "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = self.buildNodePackage { name = "raw-socket-1.2.2"; + version = "1.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz"; @@ -23534,27 +31229,17 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."rbytes"."*" = - self.by-version."rbytes"."1.1.0"; - by-version."rbytes"."1.1.0" = self.buildNodePackage { - name = "rbytes-1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/rbytes/-/rbytes-1.1.0.tgz"; - name = "rbytes-1.1.0.tgz"; - sha1 = "50234097e70c079bcdf5227494311b1038f3d619"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "rbytes" = self.by-version."rbytes"."1.1.0"; by-spec."rc"."0.5.2" = self.by-version."rc"."0.5.2"; by-version."rc"."0.5.2" = self.buildNodePackage { name = "rc-0.5.2"; + version = "0.5.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/rc/-/rc-0.5.2.tgz"; @@ -23567,12 +31252,17 @@ "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; "ini-1.1.0" = self.by-version."ini"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rc"."^0.4.0" = self.by-version."rc"."0.4.0"; by-version."rc"."0.4.0" = self.buildNodePackage { name = "rc-0.4.0"; + version = "0.4.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; @@ -23585,17 +31275,22 @@ "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; "ini-1.1.0" = self.by-version."ini"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."rc"."^0.5.1" = - self.by-version."rc"."0.5.5"; - by-version."rc"."0.5.5" = self.buildNodePackage { - name = "rc-0.5.5"; + by-spec."rc"."^0.6.0" = + self.by-version."rc"."0.6.0"; + by-version."rc"."0.6.0" = self.buildNodePackage { + name = "rc-0.6.0"; + version = "0.6.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz"; - name = "rc-0.5.5.tgz"; - sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199"; + url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz"; + name = "rc-0.6.0.tgz"; + sha1 = "e1c930059af831c85413fe275ae2f40f4e3c5371"; }; deps = { "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; @@ -23603,21 +31298,22 @@ "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rc"."~0.5.0" = self.by-version."rc"."0.5.5"; - by-spec."rc"."~0.5.4" = - self.by-version."rc"."0.5.5"; - by-spec."rc"."~0.6.0" = - self.by-version."rc"."0.6.0"; - by-version."rc"."0.6.0" = self.buildNodePackage { - name = "rc-0.6.0"; + by-version."rc"."0.5.5" = self.buildNodePackage { + name = "rc-0.5.5"; + version = "0.5.5"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz"; - name = "rc-0.6.0.tgz"; - sha1 = "e1c930059af831c85413fe275ae2f40f4e3c5371"; + url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz"; + name = "rc-0.5.5.tgz"; + sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199"; }; deps = { "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; @@ -23625,45 +31321,66 @@ "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."rc"."~0.5.1" = + self.by-version."rc"."0.5.5"; + by-spec."rc"."~0.5.4" = + self.by-version."rc"."0.5.5"; + by-spec."rc"."~0.6.0" = + self.by-version."rc"."0.6.0"; by-spec."react"."*" = - self.by-version."react"."0.13.0-beta.2"; - by-version."react"."0.13.0-beta.2" = self.buildNodePackage { - name = "react-0.13.0-beta.2"; + self.by-version."react"."0.13.0-rc1"; + by-version."react"."0.13.0-rc1" = self.buildNodePackage { + name = "react-0.13.0-rc1"; + version = "0.13.0-rc1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.13.0-beta.2.tgz"; - name = "react-0.13.0-beta.2.tgz"; - sha1 = "94495988d861802afb9e4dc36acf387463c98614"; + url = "http://registry.npmjs.org/react/-/react-0.13.0-rc1.tgz"; + name = "react-0.13.0-rc1.tgz"; + sha1 = "1773c4cf6b4f422b665eceb276345cfc030678ac"; }; deps = { "envify-3.2.0" = self.by-version."envify"."3.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "react" = self.by-version."react"."0.13.0-beta.2"; + "react" = self.by-version."react"."0.13.0-rc1"; by-spec."react-tools"."*" = - self.by-version."react-tools"."0.13.0-beta.2"; - by-version."react-tools"."0.13.0-beta.2" = self.buildNodePackage { - name = "react-tools-0.13.0-beta.2"; + self.by-version."react-tools"."0.13.0-rc1"; + by-version."react-tools"."0.13.0-rc1" = self.buildNodePackage { + name = "react-tools-0.13.0-rc1"; + version = "0.13.0-rc1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-beta.2.tgz"; - name = "react-tools-0.13.0-beta.2.tgz"; - sha1 = "d29e8d67a2d5fd1e4dba0fa4d068cc161a698e04"; + url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-rc1.tgz"; + name = "react-tools-0.13.0-rc1.tgz"; + sha1 = "f88bfc80115a5f831520409ccc269a9197001119"; }; deps = { "commoner-0.10.1" = self.by-version."commoner"."0.10.1"; - "jstransform-9.1.0" = self.by-version."jstransform"."9.1.0"; + "jstransform-9.1.1" = self.by-version."jstransform"."9.1.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "react-tools" = self.by-version."react-tools"."0.13.0-beta.2"; + "react-tools" = self.by-version."react-tools"."0.13.0-rc1"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = self.buildNodePackage { name = "read-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; @@ -23673,7 +31390,11 @@ deps = { "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read"."1.0.x" = self.by-version."read"."1.0.5"; @@ -23685,6 +31406,7 @@ self.by-version."read-all-stream"."1.0.2"; by-version."read-all-stream"."1.0.2" = self.buildNodePackage { name = "read-all-stream-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-1.0.2.tgz"; @@ -23693,12 +31415,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read-installed"."~2.0.5" = self.by-version."read-installed"."2.0.7"; by-version."read-installed"."2.0.7" = self.buildNodePackage { name = "read-installed-2.0.7"; + version = "2.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz"; @@ -23710,14 +31437,19 @@ "semver-3.0.1" = self.by-version."semver"."3.0.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; + }; + optionalDependencies = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read-installed"."~3.1.5" = self.by-version."read-installed"."3.1.5"; by-version."read-installed"."3.1.5" = self.buildNodePackage { name = "read-installed-3.1.5"; + version = "3.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz"; @@ -23731,14 +31463,19 @@ "semver-4.3.0" = self.by-version."semver"."4.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; + }; + optionalDependencies = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read-package-json"."1" = self.by-version."read-package-json"."1.3.1"; by-version."read-package-json"."1.3.1" = self.buildNodePackage { name = "read-package-json-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.3.1.tgz"; @@ -23751,9 +31488,13 @@ "glob-4.4.0" = self.by-version."glob"."4.4.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; + }; + optionalDependencies = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read-package-json"."^1.3.1" = self.by-version."read-package-json"."1.3.1"; @@ -23761,6 +31502,7 @@ self.by-version."read-package-json"."1.2.7"; by-version."read-package-json"."1.2.7" = self.buildNodePackage { name = "read-package-json-1.2.7"; + version = "1.2.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz"; @@ -23773,9 +31515,13 @@ "glob-4.4.0" = self.by-version."glob"."4.4.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; + }; + optionalDependencies = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read-package-json"."~1.3.1" = self.by-version."read-package-json"."1.3.1"; @@ -23783,6 +31529,7 @@ self.by-version."read-torrent"."1.2.0"; by-version."read-torrent"."1.2.0" = self.buildNodePackage { name = "read-torrent-1.2.0"; + version = "1.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz"; @@ -23795,7 +31542,11 @@ "request-2.16.6" = self.by-version."request"."2.16.6"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."read-torrent"."^1.1.0" = self.by-version."read-torrent"."1.2.0"; @@ -23803,6 +31554,7 @@ self.by-version."read-torrent"."1.0.0"; by-version."read-torrent"."1.0.0" = self.buildNodePackage { name = "read-torrent-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.0.0.tgz"; @@ -23814,12 +31566,17 @@ "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readable-stream"."*" = self.by-version."readable-stream"."1.1.13"; by-version."readable-stream"."1.1.13" = self.buildNodePackage { name = "readable-stream-1.1.13"; + version = "1.1.13"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; @@ -23832,12 +31589,17 @@ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readable-stream"."1.0" = self.by-version."readable-stream"."1.0.33"; by-version."readable-stream"."1.0.33" = self.buildNodePackage { name = "readable-stream-1.0.33"; + version = "1.0.33"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; @@ -23850,12 +31612,17 @@ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readable-stream"."1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { name = "readable-stream-1.0.27-1"; + version = "1.0.27-1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; @@ -23868,12 +31635,17 @@ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readable-stream"."1.0.31" = self.by-version."readable-stream"."1.0.31"; by-version."readable-stream"."1.0.31" = self.buildNodePackage { name = "readable-stream-1.0.31"; + version = "1.0.31"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"; @@ -23886,7 +31658,11 @@ "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13"; @@ -23902,6 +31678,8 @@ self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.0.33-1" = self.by-version."readable-stream"."1.1.13"; + by-spec."readable-stream"."^1.1.13" = + self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.1.13-1" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.0.17" = @@ -23928,6 +31706,7 @@ self.by-version."readable-wrap"."1.0.0"; by-version."readable-wrap"."1.0.0" = self.buildNodePackage { name = "readable-wrap-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"; @@ -23937,12 +31716,17 @@ deps = { "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readdir-scoped-modules"."^1.0.0" = self.by-version."readdir-scoped-modules"."1.0.1"; by-version."readdir-scoped-modules"."1.0.1" = self.buildNodePackage { name = "readdir-scoped-modules-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz"; @@ -23955,12 +31739,17 @@ "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readdirp"."^1.2.0" = self.by-version."readdirp"."1.3.0"; by-version."readdirp"."1.3.0" = self.buildNodePackage { name = "readdirp-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz"; @@ -23972,7 +31761,11 @@ "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."readdirp"."^1.3.0" = self.by-version."readdirp"."1.3.0"; @@ -23980,6 +31773,7 @@ self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = self.buildNodePackage { name = "readdirp-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz"; @@ -23989,12 +31783,19 @@ deps = { "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."readdirp"."~1.3.0" = + self.by-version."readdirp"."1.3.0"; by-spec."readline2"."~0.1.0" = self.by-version."readline2"."0.1.1"; by-version."readline2"."0.1.1" = self.buildNodePackage { name = "readline2-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; @@ -24005,12 +31806,17 @@ "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."realize-package-specifier"."~1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; by-version."realize-package-specifier"."1.3.0" = self.buildNodePackage { name = "realize-package-specifier-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz"; @@ -24021,31 +31827,40 @@ "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."recast"."~0.6.5" = - self.by-version."recast"."0.6.10"; - by-version."recast"."0.6.10" = self.buildNodePackage { - name = "recast-0.6.10"; + by-spec."recast"."~0.10.0" = + self.by-version."recast"."0.10.0"; + by-version."recast"."0.10.0" = self.buildNodePackage { + name = "recast-0.10.0"; + version = "0.10.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/recast/-/recast-0.6.10.tgz"; - name = "recast-0.6.10.tgz"; - sha1 = "3dd75f6e114503cb34f25459a7848c17f0dd2e95"; + url = "http://registry.npmjs.org/recast/-/recast-0.10.0.tgz"; + name = "recast-0.10.0.tgz"; + sha1 = "5c5a57f15faffb2efefed70039fbeddec25629f9"; }; deps = { - "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony"; - "source-map-0.1.32" = self.by-version."source-map"."0.1.32"; + "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb"; + "source-map-0.3.0" = self.by-version."source-map"."0.3.0"; "private-0.1.6" = self.by-version."private"."0.1.6"; - "cls-0.1.5" = self.by-version."cls"."0.1.5"; - "ast-types-0.4.13" = self.by-version."ast-types"."0.4.13"; + "ast-types-0.6.14" = self.by-version."ast-types"."0.6.14"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."recast"."~0.9.5" = self.by-version."recast"."0.9.18"; by-version."recast"."0.9.18" = self.buildNodePackage { name = "recast-0.9.18"; + version = "0.9.18"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/recast/-/recast-0.9.18.tgz"; @@ -24056,14 +31871,19 @@ "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; "private-0.1.6" = self.by-version."private"."0.1.6"; - "ast-types-0.6.12" = self.by-version."ast-types"."0.6.12"; + "ast-types-0.6.14" = self.by-version."ast-types"."0.6.14"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."reconnect-core"."https://github.com/dodo/reconnect-core/tarball/merged" = self.by-version."reconnect-core"."0.0.1"; by-version."reconnect-core"."0.0.1" = self.buildNodePackage { name = "reconnect-core-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "https://github.com/dodo/reconnect-core/tarball/merged"; @@ -24073,12 +31893,17 @@ deps = { "backoff-2.3.0" = self.by-version."backoff"."2.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."redeyed"."~0.4.0" = self.by-version."redeyed"."0.4.4"; by-version."redeyed"."0.4.4" = self.buildNodePackage { name = "redeyed-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz"; @@ -24088,12 +31913,17 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."redis"."*" = self.by-version."redis"."0.12.1"; by-version."redis"."0.12.1" = self.buildNodePackage { name = "redis-0.12.1"; + version = "0.12.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; @@ -24102,13 +31932,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "redis" = self.by-version."redis"."0.12.1"; by-spec."redis"."0.10.x" = self.by-version."redis"."0.10.3"; by-version."redis"."0.10.3" = self.buildNodePackage { name = "redis-0.10.3"; + version = "0.10.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; @@ -24117,12 +31952,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."redis"."0.7.3" = self.by-version."redis"."0.7.3"; by-version."redis"."0.7.3" = self.buildNodePackage { name = "redis-0.7.3"; + version = "0.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; @@ -24131,7 +31971,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."redis"."^0.12.1" = self.by-version."redis"."0.12.1"; @@ -24141,6 +31985,7 @@ self.by-version."reds"."0.2.5"; by-version."reds"."0.2.5" = self.buildNodePackage { name = "reds-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/reds/-/reds-0.2.5.tgz"; @@ -24151,12 +31996,17 @@ "natural-0.2.0" = self.by-version."natural"."0.2.0"; "redis-0.12.1" = self.by-version."redis"."0.12.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."reduce-component"."1.0.1" = self.by-version."reduce-component"."1.0.1"; by-version."reduce-component"."1.0.1" = self.buildNodePackage { name = "reduce-component-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; @@ -24165,31 +32015,42 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."regenerator"."~0.4.7" = - self.by-version."regenerator"."0.4.12"; - by-version."regenerator"."0.4.12" = self.buildNodePackage { - name = "regenerator-0.4.12"; + by-spec."regenerator"."~0.8.13" = + self.by-version."regenerator"."0.8.14"; + by-version."regenerator"."0.8.14" = self.buildNodePackage { + name = "regenerator-0.8.14"; + version = "0.8.14"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/regenerator/-/regenerator-0.4.12.tgz"; - name = "regenerator-0.4.12.tgz"; - sha1 = "1b056b8c24583c5d9c71abb42bbb61b682dbb867"; + url = "http://registry.npmjs.org/regenerator/-/regenerator-0.8.14.tgz"; + name = "regenerator-0.8.14.tgz"; + sha1 = "29736fb2a8ceaaaeee0049c1babf514cace670f0"; }; deps = { - "commander-2.1.0" = self.by-version."commander"."2.1.0"; - "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony"; - "recast-0.6.10" = self.by-version."recast"."0.6.10"; + "commoner-0.10.1" = self.by-version."commoner"."0.10.1"; + "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb"; + "recast-0.10.0" = self.by-version."recast"."0.10.0"; "private-0.1.6" = self.by-version."private"."0.1.6"; - "defs-0.6.2" = self.by-version."defs"."0.6.2"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + "defs-1.1.0" = self.by-version."defs"."1.1.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."regexp-clone"."0.0.1" = self.by-version."regexp-clone"."0.0.1"; by-version."regexp-clone"."0.0.1" = self.buildNodePackage { name = "regexp-clone-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz"; @@ -24198,12 +32059,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."registry-url"."^0.1.0" = self.by-version."registry-url"."0.1.1"; by-version."registry-url"."0.1.1" = self.buildNodePackage { name = "registry-url-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz"; @@ -24213,27 +32079,37 @@ deps = { "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."registry-url"."^2.0.0" = - self.by-version."registry-url"."2.1.0"; - by-version."registry-url"."2.1.0" = self.buildNodePackage { - name = "registry-url-2.1.0"; + by-spec."registry-url"."^3.0.0" = + self.by-version."registry-url"."3.0.0"; + by-version."registry-url"."3.0.0" = self.buildNodePackage { + name = "registry-url-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/registry-url/-/registry-url-2.1.0.tgz"; - name = "registry-url-2.1.0.tgz"; - sha1 = "f9624c877b43946af540849ba772ed704d606f7a"; + url = "http://registry.npmjs.org/registry-url/-/registry-url-3.0.0.tgz"; + name = "registry-url-3.0.0.tgz"; + sha1 = "8914166605792d03bdd11b05cd00b2b7688c3849"; }; deps = { - "rc-0.5.5" = self.by-version."rc"."0.5.5"; + "rc-0.6.0" = self.by-version."rc"."0.6.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."repeating"."^1.1.0" = self.by-version."repeating"."1.1.2"; by-version."repeating"."1.1.2" = self.buildNodePackage { name = "repeating-1.1.2"; + version = "1.1.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz"; @@ -24244,12 +32120,17 @@ "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0"; "meow-3.0.0" = self.by-version."meow"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."replace"."~0.2.4" = self.by-version."replace"."0.2.10"; by-version."replace"."0.2.10" = self.buildNodePackage { name = "replace-0.2.10"; + version = "0.2.10"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/replace/-/replace-0.2.10.tgz"; @@ -24261,12 +32142,17 @@ "colors-0.5.1" = self.by-version."colors"."0.5.1"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."replace-ext"."0.0.1" = self.by-version."replace-ext"."0.0.1"; by-version."replace-ext"."0.0.1" = self.buildNodePackage { name = "replace-ext-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; @@ -24275,12 +32161,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2" = self.by-version."request"."2.53.0"; by-version."request"."2.53.0" = self.buildNodePackage { name = "request-2.53.0"; + version = "2.53.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz"; @@ -24306,7 +32197,11 @@ "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2 >=2.20.0" = self.by-version."request"."2.53.0"; @@ -24316,6 +32211,7 @@ self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = self.buildNodePackage { name = "request-2.16.6"; + version = "2.16.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; @@ -24335,12 +32231,17 @@ "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0"; "qs-0.5.6" = self.by-version."qs"."0.5.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.26.x" = self.by-version."request"."2.26.0"; by-version."request"."2.26.0" = self.buildNodePackage { name = "request-2.26.0"; + version = "2.26.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.26.0.tgz"; @@ -24361,12 +32262,17 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.27.x" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = self.buildNodePackage { name = "request-2.27.0"; + version = "2.27.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; @@ -24387,12 +32293,17 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.29.0" = self.by-version."request"."2.29.0"; by-version."request"."2.29.0" = self.buildNodePackage { name = "request-2.29.0"; + version = "2.29.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; @@ -24405,6 +32316,8 @@ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; + }; + optionalDependencies = { "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; @@ -24414,11 +32327,14 @@ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.36.0" = self.by-version."request"."2.36.0"; by-version."request"."2.36.0" = self.buildNodePackage { name = "request-2.36.0"; + version = "2.36.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz"; @@ -24431,6 +32347,8 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; + }; + optionalDependencies = { "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; @@ -24440,11 +32358,14 @@ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.40.0" = self.by-version."request"."2.40.0"; by-version."request"."2.40.0" = self.buildNodePackage { name = "request-2.40.0"; + version = "2.40.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz"; @@ -24457,6 +32378,8 @@ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; + }; + optionalDependencies = { "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; @@ -24467,11 +32390,14 @@ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.42.0" = self.by-version."request"."2.42.0"; by-version."request"."2.42.0" = self.buildNodePackage { name = "request-2.42.0"; + version = "2.42.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz"; @@ -24487,6 +32413,8 @@ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + }; + optionalDependencies = { "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; @@ -24496,11 +32424,14 @@ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.47.0" = self.by-version."request"."2.47.0"; by-version."request"."2.47.0" = self.buildNodePackage { name = "request-2.47.0"; + version = "2.47.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.47.0.tgz"; @@ -24525,12 +32456,17 @@ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.9.x" = self.by-version."request"."2.9.203"; by-version."request"."2.9.203" = self.buildNodePackage { name = "request-2.9.203"; + version = "2.9.203"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; @@ -24539,7 +32475,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."2.x" = self.by-version."request"."2.53.0"; @@ -24549,6 +32489,7 @@ self.by-version."request"."2.45.0"; by-version."request"."2.45.0" = self.buildNodePackage { name = "request-2.45.0"; + version = "2.45.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz"; @@ -24565,6 +32506,8 @@ "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + }; + optionalDependencies = { "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; @@ -24573,6 +32516,8 @@ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request".">= 2.2.9" = self.by-version."request"."2.53.0"; @@ -24604,6 +32549,7 @@ self.by-version."request"."2.34.0"; by-version."request"."2.34.0" = self.buildNodePackage { name = "request-2.34.0"; + version = "2.34.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; @@ -24616,6 +32562,8 @@ "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; + }; + optionalDependencies = { "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; @@ -24625,6 +32573,8 @@ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."~2.40.0" = self.by-version."request"."2.40.0"; @@ -24634,6 +32584,7 @@ self.by-version."request"."2.46.0"; by-version."request"."2.46.0" = self.buildNodePackage { name = "request-2.46.0"; + version = "2.46.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.46.0.tgz"; @@ -24657,12 +32608,17 @@ "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."~2.48.0" = self.by-version."request"."2.48.0"; by-version."request"."2.48.0" = self.buildNodePackage { name = "request-2.48.0"; + version = "2.48.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.48.0.tgz"; @@ -24687,12 +32643,17 @@ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."~2.51.0" = self.by-version."request"."2.51.0"; by-version."request"."2.51.0" = self.buildNodePackage { name = "request-2.51.0"; + version = "2.51.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; @@ -24717,7 +32678,11 @@ "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request"."~2.53.0" = self.by-version."request"."2.53.0"; @@ -24725,6 +32690,7 @@ self.by-version."request-progress"."0.3.0"; by-version."request-progress"."0.3.0" = self.buildNodePackage { name = "request-progress-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz"; @@ -24734,12 +32700,17 @@ deps = { "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request-progress"."0.3.1" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = self.buildNodePackage { name = "request-progress-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; @@ -24749,12 +32720,17 @@ deps = { "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."request-replay"."~0.2.0" = self.by-version."request-replay"."0.2.0"; by-version."request-replay"."0.2.0" = self.buildNodePackage { name = "request-replay-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz"; @@ -24764,12 +32740,17 @@ deps = { "retry-0.6.1" = self.by-version."retry"."0.6.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."requirejs"."~2.1" = self.by-version."requirejs"."2.1.16"; by-version."requirejs"."2.1.16" = self.buildNodePackage { name = "requirejs-2.1.16"; + version = "2.1.16"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.16.tgz"; @@ -24778,7 +32759,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."requirejs"."~2.1.0" = self.by-version."requirejs"."2.1.16"; @@ -24786,6 +32771,7 @@ self.by-version."resanitize"."0.3.0"; by-version."resanitize"."0.3.0" = self.buildNodePackage { name = "resanitize-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/resanitize/-/resanitize-0.3.0.tgz"; @@ -24795,12 +32781,17 @@ deps = { "validator-1.5.1" = self.by-version."validator"."1.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."resolve"."0.6.3" = self.by-version."resolve"."0.6.3"; by-version."resolve"."0.6.3" = self.buildNodePackage { name = "resolve-0.6.3"; + version = "0.6.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz"; @@ -24809,12 +32800,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."resolve"."0.7.x" = self.by-version."resolve"."0.7.4"; by-version."resolve"."0.7.4" = self.buildNodePackage { name = "resolve-0.7.4"; + version = "0.7.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"; @@ -24823,40 +32819,40 @@ }; deps = { }; - peerDependencies = []; - }; - by-spec."resolve"."1.1.0" = - self.by-version."resolve"."1.1.0"; - by-version."resolve"."1.1.0" = self.buildNodePackage { - name = "resolve-1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.1.0.tgz"; - name = "resolve-1.1.0.tgz"; - sha1 = "f9ad602751ed06a13e58cf1eaa1565bbe38d6d93"; - }; - deps = { + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."resolve"."^1.1.3" = - self.by-version."resolve"."1.1.3"; - by-version."resolve"."1.1.3" = self.buildNodePackage { - name = "resolve-1.1.3"; + by-spec."resolve"."1.1.5" = + self.by-version."resolve"."1.1.5"; + by-version."resolve"."1.1.5" = self.buildNodePackage { + name = "resolve-1.1.5"; + version = "1.1.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.1.3.tgz"; - name = "resolve-1.1.3.tgz"; - sha1 = "0c23ca8cac81c192ac30399489c3185f2b42da9c"; + url = "http://registry.npmjs.org/resolve/-/resolve-1.1.5.tgz"; + name = "resolve-1.1.5.tgz"; + sha1 = "3b74c0c44cdf5eee32322b2cda0a4acbf6970fa7"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."resolve"."^1.1.3" = + self.by-version."resolve"."1.1.5"; + by-spec."resolve"."^1.1.4" = + self.by-version."resolve"."1.1.5"; by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = self.buildNodePackage { name = "resolve-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"; @@ -24865,7 +32861,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."resolve"."~0.3.1" = self.by-version."resolve"."0.3.1"; @@ -24877,6 +32877,7 @@ self.by-version."resolve"."1.0.0"; by-version."resolve"."1.0.0" = self.buildNodePackage { name = "resolve-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; @@ -24885,12 +32886,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."response-time"."1.0.0" = self.by-version."response-time"."1.0.0"; by-version."response-time"."1.0.0" = self.buildNodePackage { name = "response-time-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz"; @@ -24899,12 +32905,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."response-time"."~2.0.1" = self.by-version."response-time"."2.0.1"; by-version."response-time"."2.0.1" = self.buildNodePackage { name = "response-time-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz"; @@ -24914,28 +32925,17 @@ deps = { "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; - peerDependencies = []; - }; - by-spec."response-time"."~2.2.0" = - self.by-version."response-time"."2.2.0"; - by-version."response-time"."2.2.0" = self.buildNodePackage { - name = "response-time-2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz"; - name = "response-time-2.2.0.tgz"; - sha1 = "77ab4688cbf030e9c5f82dc1eac7fe5226d3c8eb"; - }; - deps = { - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."response-time"."~2.3.0" = self.by-version."response-time"."2.3.0"; by-version."response-time"."2.3.0" = self.buildNodePackage { name = "response-time-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz"; @@ -24946,12 +32946,17 @@ "depd-1.0.0" = self.by-version."depd"."1.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = self.buildNodePackage { name = "restify-2.4.1"; + version = "2.4.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz"; @@ -24975,14 +32980,19 @@ "semver-1.1.4" = self.by-version."semver"."1.1.4"; "spdy-1.7.1" = self.by-version."spdy"."1.7.1"; "verror-1.3.6" = self.by-version."verror"."1.3.6"; + }; + optionalDependencies = { "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ret"."~0.1.6" = self.by-version."ret"."0.1.10"; by-version."ret"."0.1.10" = self.buildNodePackage { name = "ret-0.1.10"; + version = "0.1.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ret/-/ret-0.1.10.tgz"; @@ -24991,28 +33001,38 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."1.16.0"; - by-version."rethinkdb"."1.16.0" = self.buildNodePackage { - name = "rethinkdb-1.16.0"; + self.by-version."rethinkdb"."1.16.1"; + by-version."rethinkdb"."1.16.1" = self.buildNodePackage { + name = "rethinkdb-1.16.1"; + version = "1.16.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.16.0.tgz"; - name = "rethinkdb-1.16.0.tgz"; - sha1 = "530e5ace0f4bce7c7543236e7bd39aead7ea7e1d"; + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.16.1.tgz"; + name = "rethinkdb-1.16.1.tgz"; + sha1 = "b18d6cbea75564bffdc14f972369d20f5c35b9e6"; }; deps = { - "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9"; + "bluebird-2.9.12" = self.by-version."bluebird"."2.9.12"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "rethinkdb" = self.by-version."rethinkdb"."1.16.0"; + "rethinkdb" = self.by-version."rethinkdb"."1.16.1"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = self.buildNodePackage { name = "retry-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; @@ -25021,12 +33041,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."retry"."^0.6.1" = self.by-version."retry"."0.6.1"; by-version."retry"."0.6.1" = self.buildNodePackage { name = "retry-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; @@ -25035,7 +33060,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."retry"."~0.6.0" = self.by-version."retry"."0.6.1"; @@ -25045,6 +33074,7 @@ self.by-version."revalidator"."0.1.8"; by-version."revalidator"."0.1.8" = self.buildNodePackage { name = "revalidator-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; @@ -25053,12 +33083,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rfile"."~1.0" = self.by-version."rfile"."1.0.0"; by-version."rfile"."1.0.0" = self.buildNodePackage { name = "rfile-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz"; @@ -25069,7 +33104,11 @@ "callsite-1.0.0" = self.by-version."callsite"."1.0.0"; "resolve-0.3.1" = self.by-version."resolve"."0.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rfile"."~1.0.0" = self.by-version."rfile"."1.0.0"; @@ -25077,6 +33116,7 @@ self.by-version."rimraf"."1.0.9"; by-version."rimraf"."1.0.9" = self.buildNodePackage { name = "rimraf-1.0.9"; + version = "1.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; @@ -25085,12 +33125,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rimraf"."2" = self.by-version."rimraf"."2.2.8"; by-version."rimraf"."2.2.8" = self.buildNodePackage { name = "rimraf-2.2.8"; + version = "2.2.8"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; @@ -25099,12 +33144,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rimraf"."2.2.6" = self.by-version."rimraf"."2.2.6"; by-version."rimraf"."2.2.6" = self.buildNodePackage { name = "rimraf-2.2.6"; + version = "2.2.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz"; @@ -25113,7 +33163,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rimraf"."2.x.x" = self.by-version."rimraf"."2.2.8"; @@ -25129,6 +33183,7 @@ self.by-version."rimraf"."2.1.4"; by-version."rimraf"."2.1.4" = self.buildNodePackage { name = "rimraf-2.1.4"; + version = "2.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; @@ -25136,9 +33191,13 @@ sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }; deps = { + }; + optionalDependencies = { "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rimraf"."~2.2.0" = self.by-version."rimraf"."2.2.8"; @@ -25148,10 +33207,30 @@ self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.8" = self.by-version."rimraf"."2.2.8"; + by-spec."ripemd160"."0.2.0" = + self.by-version."ripemd160"."0.2.0"; + by-version."ripemd160"."0.2.0" = self.buildNodePackage { + name = "ripemd160-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"; + name = "ripemd160-0.2.0.tgz"; + sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."ripemd160"."^1.0.0" = self.by-version."ripemd160"."1.0.0"; by-version."ripemd160"."1.0.0" = self.buildNodePackage { name = "ripemd160-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz"; @@ -25160,12 +33239,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rndm"."~1.1.0" = self.by-version."rndm"."1.1.0"; by-version."rndm"."1.1.0" = self.buildNodePackage { name = "rndm-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"; @@ -25174,12 +33258,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."router"."^0.6.2" = self.by-version."router"."0.6.2"; by-version."router"."0.6.2" = self.buildNodePackage { name = "router-0.6.2"; + version = "0.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/router/-/router-0.6.2.tgz"; @@ -25188,12 +33277,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rss".">=0.2.1" = self.by-version."rss"."1.1.1"; by-version."rss"."1.1.1" = self.buildNodePackage { name = "rss-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rss/-/rss-1.1.1.tgz"; @@ -25204,12 +33298,17 @@ "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "xml-1.0.0" = self.by-version."xml"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ruglify"."~1.0.0" = self.by-version."ruglify"."1.0.0"; by-version."ruglify"."1.0.0" = self.buildNodePackage { name = "ruglify-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz"; @@ -25220,12 +33319,17 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."run-applescript"."^1.0.0" = self.by-version."run-applescript"."1.0.1"; by-version."run-applescript"."1.0.1" = self.buildNodePackage { name = "run-applescript-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz"; @@ -25234,7 +33338,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."run-applescript"."^1.0.1" = self.by-version."run-applescript"."1.0.1"; @@ -25242,6 +33350,7 @@ self.by-version."run-parallel"."1.0.0"; by-version."run-parallel"."1.0.0" = self.buildNodePackage { name = "run-parallel-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.0.0.tgz"; @@ -25250,12 +33359,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."run-series"."^1.0.2" = self.by-version."run-series"."1.0.2"; by-version."run-series"."1.0.2" = self.buildNodePackage { name = "run-series-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz"; @@ -25264,12 +33378,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."runforcover"."~0.0.2" = self.by-version."runforcover"."0.0.2"; by-version."runforcover"."0.0.2" = self.buildNodePackage { name = "runforcover-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; @@ -25279,12 +33398,17 @@ deps = { "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rusha-browserify"."^0.7.3" = self.by-version."rusha-browserify"."0.7.3"; by-version."rusha-browserify"."0.7.3" = self.buildNodePackage { name = "rusha-browserify-0.7.3"; + version = "0.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/rusha-browserify/-/rusha-browserify-0.7.3.tgz"; @@ -25293,26 +33417,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."rx"."^2.2.27" = - self.by-version."rx"."2.3.25"; - by-version."rx"."2.3.25" = self.buildNodePackage { - name = "rx-2.3.25"; + self.by-version."rx"."2.4.0"; + by-version."rx"."2.4.0" = self.buildNodePackage { + name = "rx-2.4.0"; + version = "2.4.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rx/-/rx-2.3.25.tgz"; - name = "rx-2.3.25.tgz"; - sha1 = "2f7c0550532777b41fa692bb790a7886eaff9731"; + url = "http://registry.npmjs.org/rx/-/rx-2.4.0.tgz"; + name = "rx-2.4.0.tgz"; + sha1 = "8cd40d4fb393d43851286f4b22aa7db60ac92fe1"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."s3http"."*" = self.by-version."s3http"."0.0.5"; by-version."s3http"."0.0.5" = self.buildNodePackage { name = "s3http-0.0.5"; + version = "0.0.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; @@ -25329,13 +33463,18 @@ "util-0.4.9" = self.by-version."util"."0.4.9"; "crypto-0.0.3" = self.by-version."crypto"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "s3http" = self.by-version."s3http"."0.0.5"; by-spec."safe-regex"."0.0.1" = self.by-version."safe-regex"."0.0.1"; by-version."safe-regex"."0.0.1" = self.buildNodePackage { name = "safe-regex-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/safe-regex/-/safe-regex-0.0.1.tgz"; @@ -25345,12 +33484,17 @@ deps = { "ret-0.1.10" = self.by-version."ret"."0.1.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."samsam"."~1.1" = self.by-version."samsam"."1.1.2"; by-version."samsam"."1.1.2" = self.buildNodePackage { name = "samsam-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; @@ -25359,12 +33503,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sauce-connect-launcher"."~0.6.0" = self.by-version."sauce-connect-launcher"."0.6.1"; by-version."sauce-connect-launcher"."0.6.1" = self.buildNodePackage { name = "sauce-connect-launcher-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz"; @@ -25377,12 +33526,17 @@ "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."saucelabs"."~0.1.0" = self.by-version."saucelabs"."0.1.1"; by-version."saucelabs"."0.1.1" = self.buildNodePackage { name = "saucelabs-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"; @@ -25391,12 +33545,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sax"."0.3.5" = self.by-version."sax"."0.3.5"; by-version."sax"."0.3.5" = self.buildNodePackage { name = "sax-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; @@ -25405,12 +33564,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sax"."0.4.2" = self.by-version."sax"."0.4.2"; by-version."sax"."0.4.2" = self.buildNodePackage { name = "sax-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz"; @@ -25419,12 +33583,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sax"."0.5.x" = self.by-version."sax"."0.5.8"; by-version."sax"."0.5.8" = self.buildNodePackage { name = "sax-0.5.8"; + version = "0.5.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; @@ -25433,12 +33602,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sax"."0.6.x" = self.by-version."sax"."0.6.1"; by-version."sax"."0.6.1" = self.buildNodePackage { name = "sax-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; @@ -25447,7 +33621,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sax".">=0.4.2" = self.by-version."sax"."0.6.1"; @@ -25457,6 +33635,7 @@ self.by-version."scmp"."0.0.3"; by-version."scmp"."0.0.3" = self.buildNodePackage { name = "scmp-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz"; @@ -25465,12 +33644,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."scmp"."1.0.0" = self.by-version."scmp"."1.0.0"; by-version."scmp"."1.0.0" = self.buildNodePackage { name = "scmp-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; @@ -25479,7 +33663,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."scmp"."~0.0.3" = self.by-version."scmp"."0.0.3"; @@ -25489,6 +33677,7 @@ self.by-version."selenium-webdriver"."2.44.0"; by-version."selenium-webdriver"."2.44.0" = self.buildNodePackage { name = "selenium-webdriver-2.44.0"; + version = "2.44.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.44.0.tgz"; @@ -25500,13 +33689,18 @@ "tmp-0.0.24" = self.by-version."tmp"."0.0.24"; "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0"; by-spec."semver"."*" = self.by-version."semver"."4.3.0"; by-version."semver"."4.3.0" = self.buildNodePackage { name = "semver-4.3.0"; + version = "4.3.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-4.3.0.tgz"; @@ -25515,13 +33709,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "semver" = self.by-version."semver"."4.3.0"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = self.buildNodePackage { name = "semver-1.1.0"; + version = "1.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; @@ -25530,12 +33729,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."1.1.4" = self.by-version."semver"."1.1.4"; by-version."semver"."1.1.4" = self.buildNodePackage { name = "semver-1.1.4"; + version = "1.1.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; @@ -25544,12 +33748,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."2" = self.by-version."semver"."2.3.2"; by-version."semver"."2.3.2" = self.buildNodePackage { name = "semver-2.3.2"; + version = "2.3.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; @@ -25558,7 +33767,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."2 >=2.2.1" = self.by-version."semver"."2.3.2"; @@ -25568,6 +33781,7 @@ self.by-version."semver"."3.0.1"; by-version."semver"."3.0.1" = self.buildNodePackage { name = "semver-3.0.1"; + version = "3.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz"; @@ -25576,7 +33790,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."2 || 3 || 4" = self.by-version."semver"."4.3.0"; @@ -25584,6 +33802,7 @@ self.by-version."semver"."2.0.11"; by-version."semver"."2.0.11" = self.buildNodePackage { name = "semver-2.0.11"; + version = "2.0.11"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; @@ -25592,7 +33811,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."2.x" = self.by-version."semver"."2.3.2"; @@ -25600,8 +33823,6 @@ self.by-version."semver"."4.3.0"; by-spec."semver"."4" = self.by-version."semver"."4.3.0"; - by-spec."semver".">=2.0.10 <3.0.0" = - self.by-version."semver"."2.3.2"; by-spec."semver".">=2.2.1 <3" = self.by-version."semver"."2.3.2"; by-spec."semver"."^2.2.1" = @@ -25620,24 +33841,11 @@ self.by-version."semver"."1.1.4"; by-spec."semver"."~2.0.5" = self.by-version."semver"."2.0.11"; - by-spec."semver"."~2.1.0" = - self.by-version."semver"."2.1.0"; - by-version."semver"."2.1.0" = self.buildNodePackage { - name = "semver-2.1.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; - name = "semver-2.1.0.tgz"; - sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = self.buildNodePackage { name = "semver-2.2.1"; + version = "2.2.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; @@ -25646,14 +33854,21 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."~2.3.0" = self.by-version."semver"."2.3.2"; + by-spec."semver"."~3.0.1" = + self.by-version."semver"."3.0.1"; by-spec."semver"."~4.1.0" = self.by-version."semver"."4.1.1"; by-version."semver"."4.1.1" = self.buildNodePackage { name = "semver-4.1.1"; + version = "4.1.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz"; @@ -25662,7 +33877,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver"."~4.3.0" = self.by-version."semver"."4.3.0"; @@ -25670,6 +33889,7 @@ self.by-version."semver-diff"."0.1.0"; by-version."semver-diff"."0.1.0" = self.buildNodePackage { name = "semver-diff-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz"; @@ -25679,12 +33899,17 @@ deps = { "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."semver-diff"."^2.0.0" = self.by-version."semver-diff"."2.0.0"; by-version."semver-diff"."2.0.0" = self.buildNodePackage { name = "semver-diff-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz"; @@ -25694,12 +33919,17 @@ deps = { "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."*" = self.by-version."send"."0.12.1"; by-version."send"."0.12.1" = self.buildNodePackage { name = "send-0.12.1"; + version = "0.12.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.12.1.tgz"; @@ -25718,12 +33948,17 @@ "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.0.3" = self.by-version."send"."0.0.3"; by-version."send"."0.0.3" = self.buildNodePackage { name = "send-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz"; @@ -25736,12 +33971,17 @@ "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.1.0" = self.by-version."send"."0.1.0"; by-version."send"."0.1.0" = self.buildNodePackage { name = "send-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz"; @@ -25754,12 +33994,17 @@ "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.1.4" = self.by-version."send"."0.1.4"; by-version."send"."0.1.4" = self.buildNodePackage { name = "send-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; @@ -25772,12 +34017,17 @@ "fresh-0.2.0" = self.by-version."fresh"."0.2.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.10.1" = self.by-version."send"."0.10.1"; by-version."send"."0.10.1" = self.buildNodePackage { name = "send-0.10.1"; + version = "0.10.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.10.1.tgz"; @@ -25796,31 +34046,11 @@ "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; - peerDependencies = []; - }; - by-spec."send"."0.11.1" = - self.by-version."send"."0.11.1"; - by-version."send"."0.11.1" = self.buildNodePackage { - name = "send-0.11.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz"; - name = "send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; - }; - deps = { - "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.12.1" = self.by-version."send"."0.12.1"; @@ -25828,6 +34058,7 @@ self.by-version."send"."0.3.0"; by-version."send"."0.3.0" = self.buildNodePackage { name = "send-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz"; @@ -25841,12 +34072,17 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.6.0" = self.by-version."send"."0.6.0"; by-version."send"."0.6.0" = self.buildNodePackage { name = "send-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.6.0.tgz"; @@ -25863,12 +34099,46 @@ "ms-0.6.2" = self.by-version."ms"."0.6.2"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."send"."0.9.2" = + self.by-version."send"."0.9.2"; + by-version."send"."0.9.2" = self.buildNodePackage { + name = "send-0.9.2"; + version = "0.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.9.2.tgz"; + name = "send-0.9.2.tgz"; + sha1 = "77d22a0f462604451917075c6f52e69c2b3b6e25"; + }; + deps = { + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.3.1" = self.by-version."etag"."1.3.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."0.9.3" = self.by-version."send"."0.9.3"; by-version."send"."0.9.3" = self.buildNodePackage { name = "send-0.9.3"; + version = "0.9.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; @@ -25887,14 +34157,40 @@ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."send"."^0.9.2" = self.by-version."send"."0.9.3"; + by-spec."sentiment"."0.2.3" = + self.by-version."sentiment"."0.2.3"; + by-version."sentiment"."0.2.3" = self.buildNodePackage { + name = "sentiment-0.2.3"; + version = "0.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sentiment/-/sentiment-0.2.3.tgz"; + name = "sentiment-0.2.3.tgz"; + sha1 = "aa3e8581268b5c384746aa3ac7218f302cff3b2a"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "lodash-1.3.1" = self.by-version."lodash"."1.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = self.buildNodePackage { name = "sequence-2.2.1"; + version = "2.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; @@ -25903,12 +34199,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sequencify"."~0.0.7" = self.by-version."sequencify"."0.0.7"; by-version."sequencify"."0.0.7" = self.buildNodePackage { name = "sequencify-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; @@ -25917,12 +34218,42 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."serialport"."1.4.10" = + self.by-version."serialport"."1.4.10"; + by-version."serialport"."1.4.10" = self.buildNodePackage { + name = "serialport-1.4.10"; + version = "1.4.10"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/serialport/-/serialport-1.4.10.tgz"; + name = "serialport-1.4.10.tgz"; + sha1 = "dcefd2cea7a351685716b8ccb43b93822480fb93"; + }; + deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "sf-0.1.7" = self.by-version."sf"."0.1.7"; + "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + "nan-1.3.0" = self.by-version."nan"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."serve-favicon"."^2.1.1" = self.by-version."serve-favicon"."2.2.0"; by-version."serve-favicon"."2.2.0" = self.buildNodePackage { name = "serve-favicon-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; @@ -25935,12 +34266,17 @@ "ms-0.7.0" = self.by-version."ms"."0.7.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."serve-favicon"."~2.1.5" = + by-spec."serve-favicon"."~2.1.4" = self.by-version."serve-favicon"."2.1.7"; by-version."serve-favicon"."2.1.7" = self.buildNodePackage { name = "serve-favicon-2.1.7"; + version = "2.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz"; @@ -25952,14 +34288,21 @@ "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."serve-favicon"."~2.1.5" = + self.by-version."serve-favicon"."2.1.7"; by-spec."serve-favicon"."~2.2.0" = self.by-version."serve-favicon"."2.2.0"; by-spec."serve-index"."1.0.1" = self.by-version."serve-index"."1.0.1"; by-version."serve-index"."1.0.1" = self.buildNodePackage { name = "serve-index-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; @@ -25970,12 +34313,17 @@ "batch-0.5.0" = self.by-version."batch"."0.5.0"; "negotiator-0.4.2" = self.by-version."negotiator"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."serve-index"."~1.2.1" = self.by-version."serve-index"."1.2.1"; by-version."serve-index"."1.2.1" = self.buildNodePackage { name = "serve-index-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz"; @@ -25988,12 +34336,17 @@ "debug-2.0.0" = self.by-version."debug"."2.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."serve-index"."~1.6.1" = + by-spec."serve-index"."~1.6.2" = self.by-version."serve-index"."1.6.2"; by-version."serve-index"."1.6.2" = self.buildNodePackage { name = "serve-index-1.6.2"; + version = "1.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.2.tgz"; @@ -26008,14 +34361,17 @@ "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."serve-index"."~1.6.2" = - self.by-version."serve-index"."1.6.2"; by-spec."serve-static"."1.1.0" = self.by-version."serve-static"."1.1.0"; by-version."serve-static"."1.1.0" = self.buildNodePackage { name = "serve-static-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz"; @@ -26026,12 +34382,17 @@ "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1"; "send-0.3.0" = self.by-version."send"."0.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."serve-static"."~1.3.2" = self.by-version."serve-static"."1.3.2"; by-version."serve-static"."1.3.2" = self.buildNodePackage { name = "serve-static-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz"; @@ -26043,12 +34404,17 @@ "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3"; "send-0.6.0" = self.by-version."send"."0.6.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."serve-static"."~1.6.4" = + by-spec."serve-static"."~1.6.2" = self.by-version."serve-static"."1.6.5"; by-version."serve-static"."1.6.5" = self.buildNodePackage { name = "serve-static-1.6.5"; + version = "1.6.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.5.tgz"; @@ -26061,12 +34427,19 @@ "send-0.9.3" = self.by-version."send"."0.9.3"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."serve-static"."~1.6.4" = + self.by-version."serve-static"."1.6.5"; by-spec."serve-static"."~1.7.1" = self.by-version."serve-static"."1.7.2"; by-version."serve-static"."1.7.2" = self.buildNodePackage { name = "serve-static-1.7.2"; + version = "1.7.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.2.tgz"; @@ -26079,32 +34452,19 @@ "send-0.10.1" = self.by-version."send"."0.10.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."serve-static"."~1.7.2" = self.by-version."serve-static"."1.7.2"; - by-spec."serve-static"."~1.8.1" = - self.by-version."serve-static"."1.8.1"; - by-version."serve-static"."1.8.1" = self.buildNodePackage { - name = "serve-static-1.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; - name = "serve-static-1.8.1.tgz"; - sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; - }; - deps = { - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "send-0.11.1" = self.by-version."send"."0.11.1"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - peerDependencies = []; - }; by-spec."serve-static"."~1.9.1" = self.by-version."serve-static"."1.9.1"; by-version."serve-static"."1.9.1" = self.buildNodePackage { name = "serve-static-1.9.1"; + version = "1.9.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.1.tgz"; @@ -26117,12 +34477,17 @@ "send-0.12.1" = self.by-version."send"."0.12.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."set-immediate-shim"."^1.0.0" = self.by-version."set-immediate-shim"."1.0.0"; by-version."set-immediate-shim"."1.0.0" = self.buildNodePackage { name = "set-immediate-shim-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.0.tgz"; @@ -26131,12 +34496,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."setimmediate"."1.0.1" = self.by-version."setimmediate"."1.0.1"; by-version."setimmediate"."1.0.1" = self.buildNodePackage { name = "setimmediate-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; @@ -26145,12 +34515,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sf"."0.1.7" = + self.by-version."sf"."0.1.7"; + by-version."sf"."0.1.7" = self.buildNodePackage { + name = "sf-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sf/-/sf-0.1.7.tgz"; + name = "sf-0.1.7.tgz"; + sha1 = "806ed032d7225c7fb6394b0bdbfe1ea936fe6d74"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sha"."~1.2.1" = self.by-version."sha"."1.2.4"; by-version."sha"."1.2.4" = self.buildNodePackage { name = "sha-1.2.4"; + version = "1.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; @@ -26158,15 +34552,20 @@ sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; }; deps = { + }; + optionalDependencies = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sha"."~1.3.0" = self.by-version."sha"."1.3.0"; by-version."sha"."1.3.0" = self.buildNodePackage { name = "sha-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz"; @@ -26174,15 +34573,39 @@ sha1 = "79f4787045d0ede7327d702c25c443460dbc6764"; }; deps = { + }; + optionalDependencies = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sha.js"."2.2.6" = + self.by-version."sha.js"."2.2.6"; + by-version."sha.js"."2.2.6" = self.buildNodePackage { + name = "sha.js-2.2.6"; + version = "2.2.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; + name = "sha.js-2.2.6.tgz"; + sha1 = "17ddeddc5f722fb66501658895461977867315ba"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sha.js"."^2.3.6" = self.by-version."sha.js"."2.3.6"; by-version."sha.js"."2.3.6" = self.buildNodePackage { name = "sha.js-2.3.6"; + version = "2.3.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz"; @@ -26192,7 +34615,11 @@ deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sha.js"."~2.3.0" = self.by-version."sha.js"."2.3.6"; @@ -26200,6 +34627,7 @@ self.by-version."shallow-copy"."0.0.1"; by-version."shallow-copy"."0.0.1" = self.buildNodePackage { name = "shallow-copy-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; @@ -26208,12 +34636,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."shasum"."^1.0.0" = self.by-version."shasum"."1.0.1"; by-version."shasum"."1.0.1" = self.buildNodePackage { name = "shasum-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz"; @@ -26224,12 +34657,17 @@ "json-stable-stringify-0.0.1" = self.by-version."json-stable-stringify"."0.0.1"; "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."shell-quote"."~0.0.1" = self.by-version."shell-quote"."0.0.1"; by-version."shell-quote"."0.0.1" = self.buildNodePackage { name = "shell-quote-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"; @@ -26238,12 +34676,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."shell-quote"."~1.4.1" = self.by-version."shell-quote"."1.4.2"; by-version."shell-quote"."1.4.2" = self.buildNodePackage { name = "shell-quote-1.4.2"; + version = "1.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.2.tgz"; @@ -26256,12 +34699,17 @@ "array-reduce-0.0.0" = self.by-version."array-reduce"."0.0.0"; "array-map-0.0.0" = self.by-version."array-map"."0.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."shelljs"."*" = self.by-version."shelljs"."0.3.0"; by-version."shelljs"."0.3.0" = self.buildNodePackage { name = "shelljs-0.3.0"; + version = "0.3.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; @@ -26270,7 +34718,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "shelljs" = self.by-version."shelljs"."0.3.0"; by-spec."shelljs"."0.3.0" = @@ -26278,27 +34730,33 @@ by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."5.0.0"; - by-version."should"."5.0.0" = self.buildNodePackage { - name = "should-5.0.0"; + self.by-version."should"."5.0.1"; + by-version."should"."5.0.1" = self.buildNodePackage { + name = "should-5.0.1"; + version = "5.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/should/-/should-5.0.0.tgz"; - name = "should-5.0.0.tgz"; - sha1 = "ec3f8fae8703e5b422f4bd7f1273934e110d448c"; + url = "http://registry.npmjs.org/should/-/should-5.0.1.tgz"; + name = "should-5.0.1.tgz"; + sha1 = "f0c593ce78158ace3a41a92cb0cc5cf7772d7fa0"; }; deps = { "should-equal-0.3.1" = self.by-version."should-equal"."0.3.1"; "should-format-0.0.7" = self.by-version."should-format"."0.0.7"; "should-type-0.0.4" = self.by-version."should-type"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "should" = self.by-version."should"."5.0.0"; + "should" = self.by-version."should"."5.0.1"; by-spec."should-equal"."0.3.1" = self.by-version."should-equal"."0.3.1"; by-version."should-equal"."0.3.1" = self.buildNodePackage { name = "should-equal-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/should-equal/-/should-equal-0.3.1.tgz"; @@ -26308,12 +34766,17 @@ deps = { "should-type-0.0.4" = self.by-version."should-type"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."should-format"."0.0.7" = self.by-version."should-format"."0.0.7"; by-version."should-format"."0.0.7" = self.buildNodePackage { name = "should-format-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/should-format/-/should-format-0.0.7.tgz"; @@ -26323,12 +34786,17 @@ deps = { "should-type-0.0.4" = self.by-version."should-type"."0.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."should-type"."0.0.4" = self.by-version."should-type"."0.0.4"; by-version."should-type"."0.0.4" = self.buildNodePackage { name = "should-type-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/should-type/-/should-type-0.0.4.tgz"; @@ -26337,12 +34805,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = self.buildNodePackage { name = "sigmund-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; @@ -26351,12 +34824,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."signals"."<2.0" = self.by-version."signals"."1.0.0"; by-version."signals"."1.0.0" = self.buildNodePackage { name = "signals-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; @@ -26365,7 +34843,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."signals".">0.7 <2.0" = self.by-version."signals"."1.0.0"; @@ -26375,6 +34857,7 @@ self.by-version."simple-fmt"."0.1.0"; by-version."simple-fmt"."0.1.0" = self.buildNodePackage { name = "simple-fmt-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz"; @@ -26383,12 +34866,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."simple-get"."^1.3.0" = self.by-version."simple-get"."1.3.0"; by-version."simple-get"."1.3.0" = self.buildNodePackage { name = "simple-get-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/simple-get/-/simple-get-1.3.0.tgz"; @@ -26398,12 +34886,17 @@ deps = { "once-1.3.1" = self.by-version."once"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."simple-is"."~0.2.0" = self.by-version."simple-is"."0.2.0"; by-version."simple-is"."0.2.0" = self.buildNodePackage { name = "simple-is-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz"; @@ -26412,12 +34905,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."simple-lru-cache"."0.0.x" = self.by-version."simple-lru-cache"."0.0.1"; by-version."simple-lru-cache"."0.0.1" = self.buildNodePackage { name = "simple-lru-cache-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz"; @@ -26426,12 +34924,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."simplediff"."~0.1.1" = self.by-version."simplediff"."0.1.1"; by-version."simplediff"."0.1.1" = self.buildNodePackage { name = "simplediff-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; @@ -26440,12 +34943,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."simplesmtp".">= 0.1.22" = self.by-version."simplesmtp"."0.3.35"; by-version."simplesmtp"."0.3.35" = self.buildNodePackage { name = "simplesmtp-0.3.35"; + version = "0.3.35"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz"; @@ -26456,7 +34964,11 @@ "rai-0.1.12" = self.by-version."rai"."0.1.12"; "xoauth2-0.1.8" = self.by-version."xoauth2"."0.1.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."simplesmtp"."~0.2 || ~0.3.30" = self.by-version."simplesmtp"."0.3.35"; @@ -26466,6 +34978,7 @@ self.by-version."single-line-log"."0.4.1"; by-version."single-line-log"."0.4.1" = self.buildNodePackage { name = "single-line-log-0.4.1"; + version = "0.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz"; @@ -26474,12 +34987,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sinon"."*" = self.by-version."sinon"."1.12.2"; by-version."sinon"."1.12.2" = self.buildNodePackage { name = "sinon-1.12.2"; + version = "1.12.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz"; @@ -26491,13 +35009,18 @@ "util-0.10.3" = self.by-version."util"."0.10.3"; "lolex-1.1.0" = self.by-version."lolex"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "sinon" = self.by-version."sinon"."1.12.2"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.4"; by-version."slasp"."0.0.4" = self.buildNodePackage { name = "slasp-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; @@ -26506,15 +35029,41 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "slasp" = self.by-version."slasp"."0.0.4"; by-spec."slasp"."0.0.4" = self.by-version."slasp"."0.0.4"; + by-spec."sleep"."*" = + self.by-version."sleep"."2.0.0"; + by-version."sleep"."2.0.0" = self.buildNodePackage { + name = "sleep-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sleep/-/sleep-2.0.0.tgz"; + name = "sleep-2.0.0.tgz"; + sha1 = "96d8ef97970ecad464b146ea5e86dd5d6ceb65bc"; + }; + deps = { + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sleep" = self.by-version."sleep"."2.0.0"; by-spec."sleep"."^1.2.0" = self.by-version."sleep"."1.2.0"; by-version."sleep"."1.2.0" = self.buildNodePackage { name = "sleep-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sleep/-/sleep-1.2.0.tgz"; @@ -26524,12 +35073,17 @@ deps = { "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sliced"."0.0.3" = self.by-version."sliced"."0.0.3"; by-version."sliced"."0.0.3" = self.buildNodePackage { name = "sliced-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; @@ -26538,12 +35092,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sliced"."0.0.4" = self.by-version."sliced"."0.0.4"; by-version."sliced"."0.0.4" = self.buildNodePackage { name = "sliced-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; @@ -26552,12 +35111,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sliced"."0.0.5" = self.by-version."sliced"."0.0.5"; by-version."sliced"."0.0.5" = self.buildNodePackage { name = "sliced-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"; @@ -26566,12 +35130,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."slide"."*" = self.by-version."slide"."1.1.6"; by-version."slide"."1.1.6" = self.buildNodePackage { name = "slide-1.1.6"; + version = "1.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; @@ -26580,7 +35149,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."slide"."^1.1.3" = self.by-version."slide"."1.1.6"; @@ -26594,6 +35167,7 @@ self.by-version."sloc"."0.1.9"; by-version."sloc"."0.1.9" = self.buildNodePackage { name = "sloc-0.1.9"; + version = "0.1.9"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz"; @@ -26606,13 +35180,18 @@ "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1"; "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "sloc" = self.by-version."sloc"."0.1.9"; by-spec."smartdc"."*" = self.by-version."smartdc"."7.3.0"; by-version."smartdc"."7.3.0" = self.buildNodePackage { name = "smartdc-7.3.0"; + version = "7.3.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz"; @@ -26631,13 +35210,18 @@ "dashdash-1.5.0" = self.by-version."dashdash"."1.5.0"; "vasync-1.4.3" = self.by-version."vasync"."1.4.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "smartdc" = self.by-version."smartdc"."7.3.0"; by-spec."smartdc-auth"."1.0.1" = self.by-version."smartdc-auth"."1.0.1"; by-version."smartdc-auth"."1.0.1" = self.buildNodePackage { name = "smartdc-auth-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz"; @@ -26651,12 +35235,38 @@ "once-1.1.1" = self.by-version."once"."1.1.1"; "vasync-1.3.3" = self.by-version."vasync"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."smtp-connection"."^1.0.0" = + self.by-version."smtp-connection"."1.1.0"; + by-version."smtp-connection"."1.1.0" = self.buildNodePackage { + name = "smtp-connection-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/smtp-connection/-/smtp-connection-1.1.0.tgz"; + name = "smtp-connection-1.1.0.tgz"; + sha1 = "38688174a97bade7040500bf9cd5cf831f4b40f8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."smtp-connection"."^1.1.0" = + self.by-version."smtp-connection"."1.1.0"; by-spec."sntp"."0.1.x" = self.by-version."sntp"."0.1.4"; by-version."sntp"."0.1.4" = self.buildNodePackage { name = "sntp-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; @@ -26666,12 +35276,17 @@ deps = { "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = self.buildNodePackage { name = "sntp-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; @@ -26681,12 +35296,17 @@ deps = { "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sntp"."1.x.x" = self.by-version."sntp"."1.0.9"; by-version."sntp"."1.0.9" = self.buildNodePackage { name = "sntp-1.0.9"; + version = "1.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; @@ -26696,12 +35316,17 @@ deps = { "hoek-2.11.0" = self.by-version."hoek"."2.11.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io"."0.9.14" = self.by-version."socket.io"."0.9.14"; by-version."socket.io"."0.9.14" = self.buildNodePackage { name = "socket.io-0.9.14"; + version = "0.9.14"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; @@ -26712,14 +35337,19 @@ "socket.io-client-0.9.11" = self.by-version."socket.io-client"."0.9.11"; "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4"; "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; + }; + optionalDependencies = { "redis-0.7.3" = self.by-version."redis"."0.7.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io"."0.9.16" = self.by-version."socket.io"."0.9.16"; by-version."socket.io"."0.9.16" = self.buildNodePackage { name = "socket.io-0.9.16"; + version = "0.9.16"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; @@ -26730,14 +35360,19 @@ "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16"; "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4"; "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; + }; + optionalDependencies = { "redis-0.7.3" = self.by-version."redis"."0.7.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io"."1.0.6" = self.by-version."socket.io"."1.0.6"; by-version."socket.io"."1.0.6" = self.buildNodePackage { name = "socket.io-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; @@ -26752,12 +35387,17 @@ "has-binary-data-0.1.1" = self.by-version."has-binary-data"."0.1.1"; "debug-0.7.4" = self.by-version."debug"."0.7.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io"."~0.9.16" = self.by-version."socket.io"."0.9.17"; by-version."socket.io"."0.9.17" = self.buildNodePackage { name = "socket.io-0.9.17"; + version = "0.9.17"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; @@ -26768,9 +35408,13 @@ "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16"; "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4"; "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; + }; + optionalDependencies = { "redis-0.7.3" = self.by-version."redis"."0.7.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io"."~0.9.17" = self.by-version."socket.io"."0.9.17"; @@ -26778,6 +35422,7 @@ self.by-version."socket.io-adapter"."0.2.0"; by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage { name = "socket.io-adapter-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; @@ -26788,12 +35433,17 @@ "debug-0.7.4" = self.by-version."debug"."0.7.4"; "socket.io-parser-2.1.2" = self.by-version."socket.io-parser"."2.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io-client"."0.9.11" = self.by-version."socket.io-client"."0.9.11"; by-version."socket.io-client"."0.9.11" = self.buildNodePackage { name = "socket.io-client-0.9.11"; + version = "0.9.11"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; @@ -26806,12 +35456,17 @@ "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io-client"."0.9.16" = self.by-version."socket.io-client"."0.9.16"; by-version."socket.io-client"."0.9.16" = self.buildNodePackage { name = "socket.io-client-0.9.16"; + version = "0.9.16"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; @@ -26824,12 +35479,17 @@ "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io-client"."1.0.6" = self.by-version."socket.io-client"."1.0.6"; by-version."socket.io-client"."1.0.6" = self.buildNodePackage { name = "socket.io-client-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz"; @@ -26848,12 +35508,17 @@ "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2"; "to-array-0.1.3" = self.by-version."to-array"."0.1.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io-parser"."2.1.2" = self.by-version."socket.io-parser"."2.1.2"; by-version."socket.io-parser"."2.1.2" = self.buildNodePackage { name = "socket.io-parser-2.1.2"; + version = "2.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; @@ -26866,12 +35531,17 @@ "emitter-1.0.1" = self.by-version."emitter"."1.0.1"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."socket.io-parser"."2.2.0" = self.by-version."socket.io-parser"."2.2.0"; by-version."socket.io-parser"."2.2.0" = self.buildNodePackage { name = "socket.io-parser-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; @@ -26884,12 +35554,17 @@ "emitter-1.0.1" = self.by-version."emitter"."1.0.1"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sockjs"."*" = self.by-version."sockjs"."0.3.12"; by-version."sockjs"."0.3.12" = self.buildNodePackage { name = "sockjs-0.3.12"; + version = "0.3.12"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.12.tgz"; @@ -26897,16 +35572,21 @@ sha1 = "99f5686851cf8655706da977f56ccd266dded859"; }; deps = { - "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2"; + "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "sockjs" = self.by-version."sockjs"."0.3.12"; by-spec."socks-proxy-agent"."0" = self.by-version."socks-proxy-agent"."0.1.2"; by-version."socks-proxy-agent"."0.1.2" = self.buildNodePackage { name = "socks-proxy-agent-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-0.1.2.tgz"; @@ -26918,12 +35598,17 @@ "rainbowsocks-0.1.2" = self.by-version."rainbowsocks"."0.1.2"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sorted-object"."~1.0.0" = self.by-version."sorted-object"."1.0.0"; by-version."sorted-object"."1.0.0" = self.buildNodePackage { name = "sorted-object-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"; @@ -26932,12 +35617,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."source-map"."*" = self.by-version."source-map"."0.3.0"; by-version."source-map"."0.3.0" = self.buildNodePackage { name = "source-map-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz"; @@ -26947,13 +35637,18 @@ deps = { "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "source-map" = self.by-version."source-map"."0.3.0"; by-spec."source-map"."0.1.31" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = self.buildNodePackage { name = "source-map-0.1.31"; + version = "0.1.31"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; @@ -26963,27 +35658,17 @@ deps = { "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; }; - peerDependencies = []; - }; - by-spec."source-map"."0.1.32" = - self.by-version."source-map"."0.1.32"; - by-version."source-map"."0.1.32" = self.buildNodePackage { - name = "source-map-0.1.32"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - name = "source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; - }; - deps = { - "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."source-map"."0.1.34" = self.by-version."source-map"."0.1.34"; by-version."source-map"."0.1.34" = self.buildNodePackage { name = "source-map-0.1.34"; + version = "0.1.34"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; @@ -26993,12 +35678,17 @@ deps = { "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."source-map"."0.1.x" = self.by-version."source-map"."0.1.43"; by-version."source-map"."0.1.43" = self.buildNodePackage { name = "source-map-0.1.43"; + version = "0.1.43"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; @@ -27008,7 +35698,11 @@ deps = { "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."source-map".">= 0.1.2" = self.by-version."source-map"."0.3.0"; @@ -27018,6 +35712,7 @@ self.by-version."source-map"."0.2.0"; by-version."source-map"."0.2.0" = self.buildNodePackage { name = "source-map-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; @@ -27027,20 +35722,29 @@ deps = { "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."source-map"."~0.1.31" = self.by-version."source-map"."0.1.43"; by-spec."source-map"."~0.1.33" = self.by-version."source-map"."0.1.43"; + by-spec."source-map"."~0.1.38" = + self.by-version."source-map"."0.1.43"; by-spec."source-map"."~0.1.40" = self.by-version."source-map"."0.1.43"; by-spec."source-map"."~0.1.7" = self.by-version."source-map"."0.1.43"; + by-spec."source-map"."~0.3.0" = + self.by-version."source-map"."0.3.0"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = self.buildNodePackage { name = "spdy-1.7.1"; + version = "1.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz"; @@ -27049,12 +35753,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."speedometer"."^0.1.2" = self.by-version."speedometer"."0.1.4"; by-version."speedometer"."0.1.4" = self.buildNodePackage { name = "speedometer-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz"; @@ -27063,12 +35772,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sprintf"."0.1.1" = self.by-version."sprintf"."0.1.1"; by-version."sprintf"."0.1.1" = self.buildNodePackage { name = "sprintf-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz"; @@ -27077,12 +35791,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sprintf".">=0.1.1" = self.by-version."sprintf"."0.1.5"; by-version."sprintf"."0.1.5" = self.buildNodePackage { name = "sprintf-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; @@ -27091,18 +35810,40 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."sprintf"."~0.1.2" = - self.by-version."sprintf"."0.1.5"; by-spec."sprintf"."~0.1.3" = self.by-version."sprintf"."0.1.5"; by-spec."sprintf"."~0.1.4" = self.by-version."sprintf"."0.1.5"; + by-spec."sprintf-js"."~1.0.2" = + self.by-version."sprintf-js"."1.0.2"; + by-version."sprintf-js"."1.0.2" = self.buildNodePackage { + name = "sprintf-js-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"; + name = "sprintf-js-1.0.2.tgz"; + sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."srt2vtt"."^1.2.0" = self.by-version."srt2vtt"."1.2.0"; by-version."srt2vtt"."1.2.0" = self.buildNodePackage { name = "srt2vtt-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/srt2vtt/-/srt2vtt-1.2.0.tgz"; @@ -27113,12 +35854,17 @@ "codepage-1.3.8" = self.by-version."codepage"."1.3.8"; "utfx-1.0.0" = self.by-version."utfx"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ssh-agent"."0.2.1" = self.by-version."ssh-agent"."0.2.1"; by-version."ssh-agent"."0.2.1" = self.buildNodePackage { name = "ssh-agent-0.2.1"; + version = "0.2.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz"; @@ -27129,28 +35875,38 @@ "ctype-0.5.0" = self.by-version."ctype"."0.5.0"; "posix-getopt-1.0.0" = self.by-version."posix-getopt"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ssl-root-cas"."^1.1.7" = - self.by-version."ssl-root-cas"."1.1.9-beta"; - by-version."ssl-root-cas"."1.1.9-beta" = self.buildNodePackage { - name = "ssl-root-cas-1.1.9-beta"; + self.by-version."ssl-root-cas"."1.1.7"; + by-version."ssl-root-cas"."1.1.7" = self.buildNodePackage { + name = "ssl-root-cas-1.1.7"; + version = "1.1.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.9-beta.tgz"; - name = "ssl-root-cas-1.1.9-beta.tgz"; - sha1 = "0a090a4b908e88ef6d1a429dcf08720732eb2d58"; + url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.7.tgz"; + name = "ssl-root-cas-1.1.7.tgz"; + sha1 = "bb40ea00cf92dd5d80b3f92979348f7b56b2b5a4"; }; deps = { - "es6-promise-2.0.1" = self.by-version."es6-promise"."2.0.1"; - "request-2.53.0" = self.by-version."request"."2.53.0"; + "es6-promise-1.0.0" = self.by-version."es6-promise"."1.0.0"; + "request-2.34.0" = self.by-version."request"."2.34.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stable"."~0.1.3" = self.by-version."stable"."0.1.5"; by-version."stable"."0.1.5" = self.buildNodePackage { name = "stable-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stable/-/stable-0.1.5.tgz"; @@ -27159,12 +35915,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stack-trace"."0.0.7" = self.by-version."stack-trace"."0.0.7"; by-version."stack-trace"."0.0.7" = self.buildNodePackage { name = "stack-trace-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; @@ -27173,12 +35934,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stack-trace"."0.0.x" = self.by-version."stack-trace"."0.0.9"; by-version."stack-trace"."0.0.9" = self.buildNodePackage { name = "stack-trace-0.0.9"; + version = "0.0.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; @@ -27187,12 +35953,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stackdriver-statsd-backend"."*" = self.by-version."stackdriver-statsd-backend"."0.2.3"; by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage { name = "stackdriver-statsd-backend-0.2.3"; + version = "0.2.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; @@ -27201,13 +35972,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3"; by-spec."static-favicon"."1.0.2" = self.by-version."static-favicon"."1.0.2"; by-version."static-favicon"."1.0.2" = self.buildNodePackage { name = "static-favicon-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz"; @@ -27216,12 +35992,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."statsd"."*" = self.by-version."statsd"."0.7.2"; by-version."statsd"."0.7.2" = self.buildNodePackage { name = "statsd-0.7.2"; + version = "0.7.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz"; @@ -27229,32 +36010,42 @@ sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e"; }; deps = { + }; + optionalDependencies = { "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7"; "hashring-1.0.1" = self.by-version."hashring"."1.0.1"; "winser-0.1.6" = self.by-version."winser"."0.1.6"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "statsd" = self.by-version."statsd"."0.7.2"; by-spec."statsd-influxdb-backend"."*" = - self.by-version."statsd-influxdb-backend"."0.3.0"; - by-version."statsd-influxdb-backend"."0.3.0" = self.buildNodePackage { - name = "statsd-influxdb-backend-0.3.0"; + self.by-version."statsd-influxdb-backend"."0.4.0"; + by-version."statsd-influxdb-backend"."0.4.0" = self.buildNodePackage { + name = "statsd-influxdb-backend-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.3.0.tgz"; - name = "statsd-influxdb-backend-0.3.0.tgz"; - sha1 = "f66197570545c04743c8637af1fbbc914096ec44"; + url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.4.0.tgz"; + name = "statsd-influxdb-backend-0.4.0.tgz"; + sha1 = "8595b6ef21a5932508bb265f366efca6ebde54d5"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.3.0"; + "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.4.0"; by-spec."statsd-librato-backend"."*" = self.by-version."statsd-librato-backend"."0.1.6"; by-version."statsd-librato-backend"."0.1.6" = self.buildNodePackage { name = "statsd-librato-backend-0.1.6"; + version = "0.1.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.6.tgz"; @@ -27263,13 +36054,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.6"; by-spec."statuses"."1" = self.by-version."statuses"."1.2.1"; by-version."statuses"."1.2.1" = self.buildNodePackage { name = "statuses-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; @@ -27278,7 +36074,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."statuses"."^1.2.1" = self.by-version."statuses"."1.2.1"; @@ -27286,6 +36086,7 @@ self.by-version."stream-browserify"."1.0.0"; by-version."stream-browserify"."1.0.0" = self.buildNodePackage { name = "stream-browserify-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"; @@ -27296,12 +36097,17 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-browserify"."~0.1.0" = self.by-version."stream-browserify"."0.1.3"; by-version."stream-browserify"."0.1.3" = self.buildNodePackage { name = "stream-browserify-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz"; @@ -27312,12 +36118,17 @@ "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "process-0.5.2" = self.by-version."process"."0.5.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = self.buildNodePackage { name = "stream-combiner-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; @@ -27327,12 +36138,17 @@ deps = { "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-combiner2"."~1.0.0" = self.by-version."stream-combiner2"."1.0.2"; by-version."stream-combiner2"."1.0.2" = self.buildNodePackage { name = "stream-combiner2-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz"; @@ -27343,12 +36159,17 @@ "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "through2-0.5.1" = self.by-version."through2"."0.5.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-consume"."~0.1.0" = self.by-version."stream-consume"."0.1.0"; by-version."stream-consume"."0.1.0" = self.buildNodePackage { name = "stream-consume-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; @@ -27357,12 +36178,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-counter"."^1.0.0" = self.by-version."stream-counter"."1.0.0"; by-version."stream-counter"."1.0.0" = self.buildNodePackage { name = "stream-counter-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz"; @@ -27371,12 +36197,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-counter"."~0.2.0" = self.by-version."stream-counter"."0.2.0"; by-version."stream-counter"."0.2.0" = self.buildNodePackage { name = "stream-counter-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; @@ -27386,12 +36217,17 @@ deps = { "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-splicer"."^1.1.0" = self.by-version."stream-splicer"."1.3.1"; by-version."stream-splicer"."1.3.1" = self.buildNodePackage { name = "stream-splicer-1.3.1"; + version = "1.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz"; @@ -27406,28 +36242,17 @@ "through2-1.1.1" = self.by-version."through2"."1.1.1"; "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; }; - peerDependencies = []; - }; - by-spec."stream-splitter-transform"."*" = - self.by-version."stream-splitter-transform"."0.0.4"; - by-version."stream-splitter-transform"."0.0.4" = self.buildNodePackage { - name = "stream-splitter-transform-0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz"; - name = "stream-splitter-transform-0.0.4.tgz"; - sha1 = "0de54e94680633a8d703b252b20fa809ed99331c"; - }; - deps = { - "buffertools-1.1.1" = self.by-version."buffertools"."1.1.1"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4"; by-spec."stream-to-array"."~1.0.0" = self.by-version."stream-to-array"."1.0.0"; by-version."stream-to-array"."1.0.0" = self.buildNodePackage { name = "stream-to-array-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-to-array/-/stream-to-array-1.0.0.tgz"; @@ -27436,12 +36261,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stream-transcoder"."0.0.5" = self.by-version."stream-transcoder"."0.0.5"; by-version."stream-transcoder"."0.0.5" = self.buildNodePackage { name = "stream-transcoder-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz"; @@ -27450,12 +36280,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."streamsearch"."0.1.2" = self.by-version."streamsearch"."0.1.2"; by-version."streamsearch"."0.1.2" = self.buildNodePackage { name = "streamsearch-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; @@ -27464,12 +36299,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string"."1.6.1" = self.by-version."string"."1.6.1"; by-version."string"."1.6.1" = self.buildNodePackage { name = "string-1.6.1"; + version = "1.6.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; @@ -27478,12 +36318,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string-length"."^0.1.2" = self.by-version."string-length"."0.1.2"; by-version."string-length"."0.1.2" = self.buildNodePackage { name = "string-length-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz"; @@ -27493,12 +36338,17 @@ deps = { "strip-ansi-0.2.2" = self.by-version."strip-ansi"."0.2.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string-length"."^1.0.0" = self.by-version."string-length"."1.0.0"; by-version."string-length"."1.0.0" = self.buildNodePackage { name = "string-length-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz"; @@ -27508,12 +36358,17 @@ deps = { "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string-template"."~0.2.0" = self.by-version."string-template"."0.2.0"; by-version."string-template"."0.2.0" = self.buildNodePackage { name = "string-template-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string-template/-/string-template-0.2.0.tgz"; @@ -27523,12 +36378,17 @@ deps = { "js-string-escape-1.0.0" = self.by-version."js-string-escape"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string2compact"."^1.1.1" = self.by-version."string2compact"."1.2.1"; by-version."string2compact"."1.2.1" = self.buildNodePackage { name = "string2compact-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz"; @@ -27539,12 +36399,17 @@ "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string_decoder"."~0.0.0" = self.by-version."string_decoder"."0.0.1"; by-version."string_decoder"."0.0.1" = self.buildNodePackage { name = "string_decoder-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz"; @@ -27553,12 +36418,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."string_decoder"."~0.10.0" = self.by-version."string_decoder"."0.10.31"; by-version."string_decoder"."0.10.31" = self.buildNodePackage { name = "string_decoder-0.10.31"; + version = "0.10.31"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; @@ -27567,14 +36437,21 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."string_decoder"."~0.10.25" = + self.by-version."string_decoder"."0.10.31"; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.31"; by-spec."stringify-object"."~1.0.0" = self.by-version."stringify-object"."1.0.0"; by-version."stringify-object"."1.0.0" = self.buildNodePackage { name = "stringify-object-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.0.tgz"; @@ -27583,12 +36460,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stringmap"."~0.2.2" = self.by-version."stringmap"."0.2.2"; by-version."stringmap"."0.2.2" = self.buildNodePackage { name = "stringmap-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz"; @@ -27597,12 +36479,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stringset"."~0.2.1" = self.by-version."stringset"."0.2.1"; by-version."stringset"."0.2.1" = self.buildNodePackage { name = "stringset-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz"; @@ -27611,12 +36498,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stringstream"."~0.0.4" = self.by-version."stringstream"."0.0.4"; by-version."stringstream"."0.0.4" = self.buildNodePackage { name = "stringstream-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; @@ -27625,12 +36517,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-ansi"."^0.2.1" = self.by-version."strip-ansi"."0.2.2"; by-version."strip-ansi"."0.2.2" = self.buildNodePackage { name = "strip-ansi-0.2.2"; + version = "0.2.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz"; @@ -27640,12 +36537,17 @@ deps = { "ansi-regex-0.1.0" = self.by-version."ansi-regex"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-ansi"."^0.3.0" = self.by-version."strip-ansi"."0.3.0"; by-version."strip-ansi"."0.3.0" = self.buildNodePackage { name = "strip-ansi-0.3.0"; + version = "0.3.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; @@ -27655,12 +36557,17 @@ deps = { "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-ansi"."^1.0.0" = self.by-version."strip-ansi"."1.0.0"; by-version."strip-ansi"."1.0.0" = self.buildNodePackage { name = "strip-ansi-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz"; @@ -27670,12 +36577,17 @@ deps = { "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-ansi"."^2.0.0" = self.by-version."strip-ansi"."2.0.1"; by-version."strip-ansi"."2.0.1" = self.buildNodePackage { name = "strip-ansi-2.0.1"; + version = "2.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; @@ -27683,9 +36595,13 @@ sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; }; deps = { - "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0"; + "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-ansi"."^2.0.1" = self.by-version."strip-ansi"."2.0.1"; @@ -27693,6 +36609,7 @@ self.by-version."strip-bom"."1.0.0"; by-version."strip-bom"."1.0.0" = self.buildNodePackage { name = "strip-bom-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; @@ -27703,12 +36620,17 @@ "first-chunk-stream-1.0.0" = self.by-version."first-chunk-stream"."1.0.0"; "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-json-comments"."0.1.x" = self.by-version."strip-json-comments"."0.1.3"; by-version."strip-json-comments"."0.1.3" = self.buildNodePackage { name = "strip-json-comments-0.1.3"; + version = "0.1.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; @@ -27717,12 +36639,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strip-json-comments"."1.0.x" = self.by-version."strip-json-comments"."1.0.2"; by-version."strip-json-comments"."1.0.2" = self.buildNodePackage { name = "strip-json-comments-1.0.2"; + version = "1.0.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"; @@ -27731,12 +36658,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."strong-data-uri"."~0.1.0" = self.by-version."strong-data-uri"."0.1.1"; by-version."strong-data-uri"."0.1.1" = self.buildNodePackage { name = "strong-data-uri-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz"; @@ -27746,12 +36678,17 @@ deps = { "truncate-1.0.4" = self.by-version."truncate"."1.0.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stylus"."*" = self.by-version."stylus"."0.50.0"; by-version."stylus"."0.50.0" = self.buildNodePackage { name = "stylus-0.50.0"; + version = "0.50.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/stylus/-/stylus-0.50.0.tgz"; @@ -27766,13 +36703,18 @@ "glob-3.2.11" = self.by-version."glob"."3.2.11"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "stylus" = self.by-version."stylus"."0.50.0"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = self.buildNodePackage { name = "stylus-0.42.2"; + version = "0.42.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz"; @@ -27786,12 +36728,17 @@ "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."stylus"."0.49.x" = self.by-version."stylus"."0.49.3"; by-version."stylus"."0.49.3" = self.buildNodePackage { name = "stylus-0.49.3"; + version = "0.49.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz"; @@ -27806,12 +36753,17 @@ "glob-3.2.11" = self.by-version."glob"."3.2.11"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."subarg"."0.0.1" = self.by-version."subarg"."0.0.1"; by-version."subarg"."0.0.1" = self.buildNodePackage { name = "subarg-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz"; @@ -27821,12 +36773,17 @@ deps = { "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."subarg"."^1.0.0" = self.by-version."subarg"."1.0.0"; by-version."subarg"."1.0.0" = self.buildNodePackage { name = "subarg-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; @@ -27836,12 +36793,17 @@ deps = { "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sugar"."^1.4.1" = self.by-version."sugar"."1.4.1"; by-version."sugar"."1.4.1" = self.buildNodePackage { name = "sugar-1.4.1"; + version = "1.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sugar/-/sugar-1.4.1.tgz"; @@ -27850,12 +36812,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."superagent"."0.21.0" = self.by-version."superagent"."0.21.0"; by-version."superagent"."0.21.0" = self.buildNodePackage { name = "superagent-0.21.0"; + version = "0.21.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; @@ -27875,7 +36842,11 @@ "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."superagent"."~0.21.0" = self.by-version."superagent"."0.21.0"; @@ -27883,6 +36854,7 @@ self.by-version."supertest"."0.15.0"; by-version."supertest"."0.15.0" = self.buildNodePackage { name = "supertest-0.15.0"; + version = "0.15.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/supertest/-/supertest-0.15.0.tgz"; @@ -27893,13 +36865,37 @@ "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "methods-1.1.1" = self.by-version."methods"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "supertest" = self.by-version."supertest"."0.15.0"; + by-spec."supports-color"."1.2.x" = + self.by-version."supports-color"."1.2.1"; + by-version."supports-color"."1.2.1" = self.buildNodePackage { + name = "supports-color-1.2.1"; + version = "1.2.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"; + name = "supports-color-1.2.1.tgz"; + sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."supports-color"."^0.2.0" = self.by-version."supports-color"."0.2.0"; by-version."supports-color"."0.2.0" = self.buildNodePackage { name = "supports-color-0.2.0"; + version = "0.2.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; @@ -27908,12 +36904,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = self.buildNodePackage { name = "swig-0.14.0"; + version = "0.14.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz"; @@ -27921,15 +36922,20 @@ sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }; deps = { - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "swig" = self.by-version."swig"."0.14.0"; by-spec."sylvester".">= 0.0.12" = self.by-version."sylvester"."0.0.21"; by-version."sylvester"."0.0.21" = self.buildNodePackage { name = "sylvester-0.0.21"; + version = "0.0.21"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; @@ -27938,7 +36944,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; @@ -27946,6 +36956,7 @@ self.by-version."syntax-error"."1.1.2"; by-version."syntax-error"."1.1.2" = self.buildNodePackage { name = "syntax-error-1.1.2"; + version = "1.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz"; @@ -27955,12 +36966,17 @@ deps = { "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."syntax-error"."~0.0.0" = self.by-version."syntax-error"."0.0.1"; by-version."syntax-error"."0.0.1" = self.buildNodePackage { name = "syntax-error-0.0.1"; + version = "0.0.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.0.1.tgz"; @@ -27970,12 +36986,17 @@ deps = { "esprima-0.9.9" = self.by-version."esprima"."0.9.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."syntax-error"."~0.1.0" = self.by-version."syntax-error"."0.1.0"; by-version."syntax-error"."0.1.0" = self.buildNodePackage { name = "syntax-error-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz"; @@ -27985,12 +37006,17 @@ deps = { "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tabtab"."git+https://github.com/mixu/node-tabtab.git" = self.by-version."tabtab"."0.0.2"; by-version."tabtab"."0.0.2" = self.buildNodePackage { name = "tabtab-0.0.2"; + version = "0.0.2"; bin = false; src = fetchgit { url = "https://github.com/mixu/node-tabtab.git"; @@ -27999,12 +37025,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tap"."~0.3.3" = self.by-version."tap"."0.3.3"; by-version."tap"."0.3.3" = self.buildNodePackage { name = "tap-0.3.3"; + version = "0.3.3"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz"; @@ -28022,12 +37053,38 @@ "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."tapable"."^0.1.8" = + self.by-version."tapable"."0.1.8"; + by-version."tapable"."0.1.8" = self.buildNodePackage { + name = "tapable-0.1.8"; + version = "0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tapable/-/tapable-0.1.8.tgz"; + name = "tapable-0.1.8.tgz"; + sha1 = "a943314bc86ac87602c93fbc8ac609dcb19c199e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tapable"."~0.1.8" = + self.by-version."tapable"."0.1.8"; by-spec."tape"."~0.2.2" = self.by-version."tape"."0.2.2"; by-version."tape"."0.2.2" = self.buildNodePackage { name = "tape-0.2.2"; + version = "0.2.2"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz"; @@ -28039,12 +37096,17 @@ "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar"."*" = self.by-version."tar"."1.0.3"; by-version."tar"."1.0.3" = self.buildNodePackage { name = "tar-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"; @@ -28056,13 +37118,18 @@ "fstream-1.0.4" = self.by-version."fstream"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "tar" = self.by-version."tar"."1.0.3"; by-spec."tar"."0.1.17" = self.by-version."tar"."0.1.17"; by-version."tar"."0.1.17" = self.buildNodePackage { name = "tar-0.1.17"; + version = "0.1.17"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; @@ -28074,12 +37141,17 @@ "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar"."1.0.2" = self.by-version."tar"."1.0.2"; by-version."tar"."1.0.2" = self.buildNodePackage { name = "tar-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar/-/tar-1.0.2.tgz"; @@ -28091,7 +37163,11 @@ "fstream-1.0.4" = self.by-version."fstream"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar"."^1.0.0" = self.by-version."tar"."1.0.3"; @@ -28099,6 +37175,7 @@ self.by-version."tar"."0.1.20"; by-version."tar"."0.1.20" = self.buildNodePackage { name = "tar-0.1.20"; + version = "0.1.20"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; @@ -28110,7 +37187,11 @@ "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar"."~1.0.1" = self.by-version."tar"."1.0.3"; @@ -28122,6 +37203,7 @@ self.by-version."tar-fs"."0.5.2"; by-version."tar-fs"."0.5.2" = self.buildNodePackage { name = "tar-fs-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz"; @@ -28133,12 +37215,17 @@ "pump-0.3.5" = self.by-version."pump"."0.3.5"; "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar-pack"."~2.0.0" = self.by-version."tar-pack"."2.0.0"; by-version."tar-pack"."2.0.0" = self.buildNodePackage { name = "tar-pack-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; @@ -28154,14 +37241,19 @@ "tar-0.1.20" = self.by-version."tar"."0.1.20"; "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar-stream"."^0.4.6" = self.by-version."tar-stream"."0.4.7"; by-version."tar-stream"."0.4.7" = self.buildNodePackage { name = "tar-stream-0.4.7"; + version = "0.4.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz"; @@ -28174,12 +37266,17 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tar-stream"."~1.0.0" = self.by-version."tar-stream"."1.0.2"; by-version."tar-stream"."1.0.2" = self.buildNodePackage { name = "tar-stream-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz"; @@ -28192,12 +37289,17 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."temp"."*" = self.by-version."temp"."0.8.1"; by-version."temp"."0.8.1" = self.buildNodePackage { name = "temp-0.8.1"; + version = "0.8.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz"; @@ -28207,13 +37309,18 @@ deps = { "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "temp" = self.by-version."temp"."0.8.1"; by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = self.buildNodePackage { name = "temp-0.6.0"; + version = "0.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; @@ -28224,7 +37331,11 @@ "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."temp".">=0.5.0" = self.by-version."temp"."0.8.1"; @@ -28232,6 +37343,7 @@ self.by-version."temp"."0.5.1"; by-version."temp"."0.5.1" = self.buildNodePackage { name = "temp-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz"; @@ -28241,7 +37353,11 @@ deps = { "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."temp"."~0.6.0" = self.by-version."temp"."0.6.0"; @@ -28251,6 +37367,7 @@ self.by-version."text-table"."0.2.0"; by-version."text-table"."0.2.0" = self.buildNodePackage { name = "text-table-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; @@ -28259,12 +37376,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."thenify"."3" = self.by-version."thenify"."3.1.0"; by-version."thenify"."3.1.0" = self.buildNodePackage { name = "thenify-3.1.0"; + version = "3.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz"; @@ -28274,7 +37396,11 @@ deps = { "native-or-bluebird-1.2.0" = self.by-version."native-or-bluebird"."1.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."thenify".">= 3.1.0 < 4" = self.by-version."thenify"."3.1.0"; @@ -28282,6 +37408,7 @@ self.by-version."thenify-all"."1.6.0"; by-version."thenify-all"."1.6.0" = self.buildNodePackage { name = "thenify-all-1.6.0"; + version = "1.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; @@ -28291,12 +37418,17 @@ deps = { "thenify-3.1.0" = self.by-version."thenify"."3.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."thirty-two"."~0.0.1" = self.by-version."thirty-two"."0.0.2"; by-version."thirty-two"."0.0.2" = self.buildNodePackage { name = "thirty-two-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz"; @@ -28305,12 +37437,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = self.buildNodePackage { name = "throttleit-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; @@ -28319,12 +37456,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through"."2.3.4" = self.by-version."through"."2.3.4"; by-version."through"."2.3.4" = self.buildNodePackage { name = "through-2.3.4"; + version = "2.3.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; @@ -28333,12 +37475,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through".">=2.2.7 <3" = self.by-version."through"."2.3.6"; by-version."through"."2.3.6" = self.buildNodePackage { name = "through-2.3.6"; + version = "2.3.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz"; @@ -28347,12 +37494,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through"."~2.2.0" = self.by-version."through"."2.2.7"; by-version."through"."2.2.7" = self.buildNodePackage { name = "through-2.2.7"; + version = "2.2.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; @@ -28361,16 +37513,23 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through"."~2.2.7" = self.by-version."through"."2.2.7"; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.6"; + by-spec."through"."~2.3.6" = + self.by-version."through"."2.3.6"; by-spec."through2"."0.6.3" = self.by-version."through2"."0.6.3"; by-version."through2"."0.6.3" = self.buildNodePackage { name = "through2-0.6.3"; + version = "0.6.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz"; @@ -28381,7 +37540,11 @@ "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through2"."^0.6.1" = self.by-version."through2"."0.6.3"; @@ -28391,6 +37554,7 @@ self.by-version."through2"."1.1.1"; by-version."through2"."1.1.1" = self.buildNodePackage { name = "through2-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz"; @@ -28401,12 +37565,17 @@ "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through2"."~0.4.1" = self.by-version."through2"."0.4.2"; by-version."through2"."0.4.2" = self.buildNodePackage { name = "through2-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; @@ -28417,12 +37586,17 @@ "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "xtend-2.1.2" = self.by-version."xtend"."2.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."through2"."~0.5.1" = self.by-version."through2"."0.5.1"; by-version."through2"."0.5.1" = self.buildNodePackage { name = "through2-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz"; @@ -28433,12 +37607,17 @@ "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "xtend-3.0.0" = self.by-version."xtend"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."thunkify"."~2.1.1" = self.by-version."thunkify"."2.1.2"; by-version."thunkify"."2.1.2" = self.buildNodePackage { name = "thunkify-2.1.2"; + version = "2.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; @@ -28447,12 +37626,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."thunky"."^0.1.0" = self.by-version."thunky"."0.1.0"; by-version."thunky"."0.1.0" = self.buildNodePackage { name = "thunky-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; @@ -28461,7 +37645,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."thunky"."~0.1.0" = self.by-version."thunky"."0.1.0"; @@ -28469,6 +37657,7 @@ self.by-version."tildify"."1.0.0"; by-version."tildify"."1.0.0" = self.buildNodePackage { name = "tildify-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz"; @@ -28478,12 +37667,17 @@ deps = { "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."time".">=0.9.2" = self.by-version."time"."0.11.1"; by-version."time"."0.11.1" = self.buildNodePackage { name = "time-0.11.1"; + version = "0.11.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/time/-/time-0.11.1.tgz"; @@ -28495,12 +37689,17 @@ "debug-0.8.1" = self.by-version."debug"."0.8.1"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."time-line"."^1.0.1" = self.by-version."time-line"."1.0.1"; by-version."time-line"."1.0.1" = self.buildNodePackage { name = "time-line-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz"; @@ -28509,12 +37708,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."timed-out"."^2.0.0" = self.by-version."timed-out"."2.0.0"; by-version."timed-out"."2.0.0" = self.buildNodePackage { name = "timed-out-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; @@ -28523,12 +37727,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."timers-browserify"."^1.0.1" = self.by-version."timers-browserify"."1.3.0"; by-version."timers-browserify"."1.3.0" = self.buildNodePackage { name = "timers-browserify-1.3.0"; + version = "1.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.3.0.tgz"; @@ -28538,12 +37747,17 @@ deps = { "process-0.10.0" = self.by-version."process"."0.10.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."timers-browserify"."~1.0.1" = self.by-version."timers-browserify"."1.0.3"; by-version."timers-browserify"."1.0.3" = self.buildNodePackage { name = "timers-browserify-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz"; @@ -28553,12 +37767,17 @@ deps = { "process-0.5.2" = self.by-version."process"."0.5.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."timers-ext"."0.1" = self.by-version."timers-ext"."0.1.0"; by-version."timers-ext"."0.1.0" = self.buildNodePackage { name = "timers-ext-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz"; @@ -28569,7 +37788,11 @@ "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."timers-ext"."0.1.x" = self.by-version."timers-ext"."0.1.0"; @@ -28577,6 +37800,7 @@ self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = self.buildNodePackage { name = "timespan-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; @@ -28585,7 +37809,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; @@ -28593,6 +37821,7 @@ self.by-version."timezone"."0.0.39"; by-version."timezone"."0.0.39" = self.buildNodePackage { name = "timezone-0.0.39"; + version = "0.0.39"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/timezone/-/timezone-0.0.39.tgz"; @@ -28601,13 +37830,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "timezone" = self.by-version."timezone"."0.0.39"; by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = self.buildNodePackage { name = "tinycolor-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; @@ -28616,17 +37850,22 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."titanium"."*" = - self.by-version."titanium"."3.4.1"; - by-version."titanium"."3.4.1" = self.buildNodePackage { - name = "titanium-3.4.1"; + self.by-version."titanium"."3.4.2-alpha"; + by-version."titanium"."3.4.2-alpha" = self.buildNodePackage { + name = "titanium-3.4.2-alpha"; + version = "3.4.2-alpha"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/titanium/-/titanium-3.4.1.tgz"; - name = "titanium-3.4.1.tgz"; - sha1 = "af10520a20dfcacaadfde07a2572b82f2b9d3648"; + url = "http://registry.npmjs.org/titanium/-/titanium-3.4.2-alpha.tgz"; + name = "titanium-3.4.2-alpha.tgz"; + sha1 = "bea444d0e5d3476e09493ea617755c12a0bb474b"; }; deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; @@ -28636,7 +37875,7 @@ "jade-0.35.0" = self.by-version."jade"."0.35.0"; "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4"; "moment-2.4.0" = self.by-version."moment"."2.4.0"; - "node-appc-0.2.14" = self.by-version."node-appc"."0.2.14"; + "node-appc-0.2.24" = self.by-version."node-appc"."0.2.24"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.2.1" = self.by-version."semver"."2.2.1"; @@ -28645,13 +37884,18 @@ "winston-0.6.2" = self.by-version."winston"."0.6.2"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "titanium" = self.by-version."titanium"."3.4.1"; + "titanium" = self.by-version."titanium"."3.4.2-alpha"; by-spec."tldtools"."0.0.19" = self.by-version."tldtools"."0.0.19"; by-version."tldtools"."0.0.19" = self.buildNodePackage { name = "tldtools-0.0.19"; + version = "0.0.19"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.19.tgz"; @@ -28661,12 +37905,17 @@ deps = { "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tldtools".">=0.0.19" = self.by-version."tldtools"."0.0.23"; by-version."tldtools"."0.0.23" = self.buildNodePackage { name = "tldtools-0.0.23"; + version = "0.0.23"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.23.tgz"; @@ -28676,7 +37925,11 @@ deps = { "request-2.53.0" = self.by-version."request"."2.53.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tldtools".">=0.0.6" = self.by-version."tldtools"."0.0.23"; @@ -28684,6 +37937,7 @@ self.by-version."tls-connect"."0.2.2"; by-version."tls-connect"."0.2.2" = self.buildNodePackage { name = "tls-connect-0.2.2"; + version = "0.2.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz"; @@ -28692,7 +37946,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tls-connect"."~0.2.0" = self.by-version."tls-connect"."0.2.2"; @@ -28702,6 +37960,7 @@ self.by-version."tmp"."0.0.23"; by-version."tmp"."0.0.23" = self.buildNodePackage { name = "tmp-0.0.23"; + version = "0.0.23"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"; @@ -28710,12 +37969,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tmp"."0.0.24" = self.by-version."tmp"."0.0.24"; by-version."tmp"."0.0.24" = self.buildNodePackage { name = "tmp-0.0.24"; + version = "0.0.24"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz"; @@ -28724,7 +37988,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tmp"."~0.0.20" = self.by-version."tmp"."0.0.24"; @@ -28732,6 +38000,7 @@ self.by-version."to-array"."0.1.3"; by-version."to-array"."0.1.3" = self.buildNodePackage { name = "to-array-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"; @@ -28740,12 +38009,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tomahawk"."0.1.6" = self.by-version."tomahawk"."0.1.6"; by-version."tomahawk"."0.1.6" = self.buildNodePackage { name = "tomahawk-0.1.6"; + version = "0.1.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/tomahawk/-/tomahawk-0.1.6.tgz"; @@ -28762,12 +38036,17 @@ "socket.io-1.0.6" = self.by-version."socket.io"."1.0.6"; "winston-0.7.3" = self.by-version."winston"."0.7.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tomahawk-plugin-kv-memory-store"."0.0.3" = self.by-version."tomahawk-plugin-kv-memory-store"."0.0.3"; by-version."tomahawk-plugin-kv-memory-store"."0.0.3" = self.buildNodePackage { name = "tomahawk-plugin-kv-memory-store-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tomahawk-plugin-kv-memory-store/-/tomahawk-plugin-kv-memory-store-0.0.3.tgz"; @@ -28776,12 +38055,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."toobusy"."*" = + by-spec."toobusy"."~0.2.4" = self.by-version."toobusy"."0.2.4"; by-version."toobusy"."0.2.4" = self.buildNodePackage { name = "toobusy-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/toobusy/-/toobusy-0.2.4.tgz"; @@ -28791,45 +38075,17 @@ deps = { "bindings-1.1.0" = self.by-version."bindings"."1.1.0"; }; - peerDependencies = []; - }; - "toobusy" = self.by-version."toobusy"."0.2.4"; - by-spec."toobusy"."~0.2.4" = - self.by-version."toobusy"."0.2.4"; - by-spec."torrent-stream"."^0.15.1" = - self.by-version."torrent-stream"."0.15.1"; - by-version."torrent-stream"."0.15.1" = self.buildNodePackage { - name = "torrent-stream-0.15.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.15.1.tgz"; - name = "torrent-stream-0.15.1.tgz"; - sha1 = "98c86f8c135a58a7cd63e8cd7a78b99430473e06"; - }; - deps = { - "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; - "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4"; - "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1"; - "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; - "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; - "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "ip-0.3.2" = self.by-version."ip"."0.3.2"; - "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0"; - "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0"; - "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2"; - "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."torrent-stream"."^0.16.2" = self.by-version."torrent-stream"."0.16.2"; by-version."torrent-stream"."0.16.2" = self.buildNodePackage { name = "torrent-stream-0.16.2"; + version = "0.16.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.16.2.tgz"; @@ -28854,12 +38110,17 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."torrent-stream"."~0.13.3" = self.by-version."torrent-stream"."0.13.5"; by-version."torrent-stream"."0.13.5" = self.buildNodePackage { name = "torrent-stream-0.13.5"; + version = "0.13.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.13.5.tgz"; @@ -28883,12 +38144,17 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."touch"."0.0.2" = self.by-version."touch"."0.0.2"; by-version."touch"."0.0.2" = self.buildNodePackage { name = "touch-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz"; @@ -28898,12 +38164,17 @@ deps = { "nopt-1.0.10" = self.by-version."nopt"."1.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."touch"."~0.0.3" = self.by-version."touch"."0.0.3"; by-version."touch"."0.0.3" = self.buildNodePackage { name = "touch-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; @@ -28913,12 +38184,17 @@ deps = { "nopt-1.0.10" = self.by-version."nopt"."1.0.10"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tough-cookie".">=0.12.0" = self.by-version."tough-cookie"."0.12.1"; by-version."tough-cookie"."0.12.1" = self.buildNodePackage { name = "tough-cookie-0.12.1"; + version = "0.12.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; @@ -28928,7 +38204,11 @@ deps = { "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tough-cookie"."^0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -28936,6 +38216,7 @@ self.by-version."tough-cookie"."0.9.15"; by-version."tough-cookie"."0.9.15" = self.buildNodePackage { name = "tough-cookie-0.9.15"; + version = "0.9.15"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; @@ -28945,12 +38226,17 @@ deps = { "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."traceur"."0.0.55" = self.by-version."traceur"."0.0.55"; by-version."traceur"."0.0.55" = self.buildNodePackage { name = "traceur-0.0.55"; + version = "0.0.55"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz"; @@ -28962,12 +38248,17 @@ "glob-4.4.0" = self.by-version."glob"."4.4.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."transformers"."2.1.0" = self.by-version."transformers"."2.1.0"; by-version."transformers"."2.1.0" = self.buildNodePackage { name = "transformers-2.1.0"; + version = "2.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; @@ -28979,12 +38270,17 @@ "css-1.0.8" = self.by-version."css"."1.0.8"; "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."trash"."*" = self.by-version."trash"."1.4.1"; by-version."trash"."1.4.1" = self.buildNodePackage { name = "trash-1.4.1"; + version = "1.4.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/trash/-/trash-1.4.1.tgz"; @@ -28998,13 +38294,18 @@ "win-trash-1.0.0" = self.by-version."win-trash"."1.0.0"; "xdg-trash-1.0.6" = self.by-version."xdg-trash"."1.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "trash" = self.by-version."trash"."1.4.1"; by-spec."traverse"."0.6.x" = self.by-version."traverse"."0.6.6"; by-version."traverse"."0.6.6" = self.buildNodePackage { name = "traverse-0.6.6"; + version = "0.6.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; @@ -29013,7 +38314,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."traverse".">=0.2.4" = self.by-version."traverse"."0.6.6"; @@ -29021,6 +38326,7 @@ self.by-version."traverse"."0.3.9"; by-version."traverse"."0.3.9" = self.buildNodePackage { name = "traverse-0.3.9"; + version = "0.3.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; @@ -29029,12 +38335,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."traverse"."~0.5.1" = self.by-version."traverse"."0.5.2"; by-version."traverse"."0.5.2" = self.buildNodePackage { name = "traverse-0.5.2"; + version = "0.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; @@ -29043,12 +38354,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."truncate"."~1.0.2" = self.by-version."truncate"."1.0.4"; by-version."truncate"."1.0.4" = self.buildNodePackage { name = "truncate-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz"; @@ -29057,12 +38373,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tryor"."~0.1.2" = self.by-version."tryor"."0.1.2"; by-version."tryor"."0.1.2" = self.buildNodePackage { name = "tryor-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz"; @@ -29071,12 +38392,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."tty-browserify"."~0.0.0" = + by-spec."tty-browserify"."0.0.0" = self.by-version."tty-browserify"."0.0.0"; by-version."tty-browserify"."0.0.0" = self.buildNodePackage { name = "tty-browserify-0.0.0"; + version = "0.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; @@ -29085,12 +38411,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."tty-browserify"."~0.0.0" = + self.by-version."tty-browserify"."0.0.0"; by-spec."tunnel-agent"."~0.2.0" = self.by-version."tunnel-agent"."0.2.0"; by-version."tunnel-agent"."0.2.0" = self.buildNodePackage { name = "tunnel-agent-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; @@ -29099,12 +38432,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; by-version."tunnel-agent"."0.3.0" = self.buildNodePackage { name = "tunnel-agent-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; @@ -29113,12 +38451,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."tunnel-agent"."~0.4.0" = self.by-version."tunnel-agent"."0.4.0"; by-version."tunnel-agent"."0.4.0" = self.buildNodePackage { name = "tunnel-agent-0.4.0"; + version = "0.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; @@ -29127,31 +38470,61 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."twilio".">=1.1.4" = - self.by-version."twilio"."1.10.0"; - by-version."twilio"."1.10.0" = self.buildNodePackage { - name = "twilio-1.10.0"; + self.by-version."twilio"."1.11.0"; + by-version."twilio"."1.11.0" = self.buildNodePackage { + name = "twilio-1.11.0"; + version = "1.11.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/twilio/-/twilio-1.10.0.tgz"; - name = "twilio-1.10.0.tgz"; - sha1 = "b4004f1187baf818233a4dd5e13478d8df9101da"; + url = "http://registry.npmjs.org/twilio/-/twilio-1.11.0.tgz"; + name = "twilio-1.11.0.tgz"; + sha1 = "ac49109fbbf761d1b3efad5e49ae1bbb95135700"; }; deps = { "request-2.27.0" = self.by-version."request"."2.27.0"; - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; "jwt-simple-0.1.0" = self.by-version."jwt-simple"."0.1.0"; "q-0.9.7" = self.by-version."q"."0.9.7"; "scmp-0.0.3" = self.by-version."scmp"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."twitter-ng"."0.6.2" = + self.by-version."twitter-ng"."0.6.2"; + by-version."twitter-ng"."0.6.2" = self.buildNodePackage { + name = "twitter-ng-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz"; + name = "twitter-ng-0.6.2.tgz"; + sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; + }; + deps = { + "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."type-check"."~0.3.1" = self.by-version."type-check"."0.3.1"; by-version."type-check"."0.3.1" = self.buildNodePackage { name = "type-check-0.3.1"; + version = "0.3.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"; @@ -29161,12 +38534,17 @@ deps = { "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."type-detect"."0.1.1" = self.by-version."type-detect"."0.1.1"; by-version."type-detect"."0.1.1" = self.buildNodePackage { name = "type-detect-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; @@ -29175,12 +38553,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."type-is"."~1.3.2" = self.by-version."type-is"."1.3.2"; by-version."type-is"."1.3.2" = self.buildNodePackage { name = "type-is-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; @@ -29191,12 +38574,17 @@ "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."type-is"."~1.5.1" = self.by-version."type-is"."1.5.7"; by-version."type-is"."1.5.7" = self.buildNodePackage { name = "type-is-1.5.7"; + version = "1.5.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; @@ -29207,7 +38595,11 @@ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."type-is"."~1.5.2" = self.by-version."type-is"."1.5.7"; @@ -29215,12 +38607,11 @@ self.by-version."type-is"."1.5.7"; by-spec."type-is"."~1.5.5" = self.by-version."type-is"."1.5.7"; - by-spec."type-is"."~1.5.6" = - self.by-version."type-is"."1.5.7"; by-spec."type-is"."~1.6.0" = self.by-version."type-is"."1.6.0"; by-version."type-is"."1.6.0" = self.buildNodePackage { name = "type-is-1.6.0"; + version = "1.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/type-is/-/type-is-1.6.0.tgz"; @@ -29231,12 +38622,17 @@ "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = self.buildNodePackage { name = "typechecker-2.0.8"; + version = "2.0.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"; @@ -29245,12 +38641,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."typedarray"."~0.0.5" = self.by-version."typedarray"."0.0.6"; by-version."typedarray"."0.0.6" = self.buildNodePackage { name = "typedarray-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; @@ -29259,12 +38660,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."typescript"."*" = self.by-version."typescript"."1.4.1"; by-version."typescript"."1.4.1" = self.buildNodePackage { name = "typescript-1.4.1"; + version = "1.4.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz"; @@ -29273,13 +38679,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "typescript" = self.by-version."typescript"."1.4.1"; by-spec."uglify-js"."*" = self.by-version."uglify-js"."2.4.16"; by-version."uglify-js"."2.4.16" = self.buildNodePackage { name = "uglify-js-2.4.16"; + version = "2.4.16"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz"; @@ -29292,13 +38703,18 @@ "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "uglify-js" = self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = self.buildNodePackage { name = "uglify-js-1.2.5"; + version = "1.2.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; @@ -29307,12 +38723,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uglify-js"."2.4.0" = self.by-version."uglify-js"."2.4.0"; by-version."uglify-js"."2.4.0" = self.buildNodePackage { name = "uglify-js-2.4.0"; + version = "2.4.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz"; @@ -29325,8 +38746,14 @@ "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."uglify-js"."2.4.16" = + self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."^2.4.0" = self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."^2.4.15" = @@ -29335,6 +38762,7 @@ self.by-version."uglify-js"."1.1.1"; by-version."uglify-js"."1.1.1" = self.buildNodePackage { name = "uglify-js-1.1.1"; + version = "1.1.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; @@ -29343,12 +38771,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = self.buildNodePackage { name = "uglify-js-2.2.5"; + version = "2.2.5"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; @@ -29359,7 +38792,11 @@ "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uglify-js"."~2.2.5" = self.by-version."uglify-js"."2.2.5"; @@ -29367,6 +38804,7 @@ self.by-version."uglify-js"."2.3.6"; by-version."uglify-js"."2.3.6" = self.buildNodePackage { name = "uglify-js-2.3.6"; + version = "2.3.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; @@ -29378,16 +38816,23 @@ "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."uglify-js"."~2.3.6" = - self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = self.by-version."uglify-js"."2.4.16"; + by-spec."uglify-js"."~2.4.13" = + self.by-version."uglify-js"."2.4.16"; + by-spec."uglify-js"."~2.4.15" = + self.by-version."uglify-js"."2.4.16"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage { name = "uglify-to-browserify-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; @@ -29396,12 +38841,36 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uid"."0.0.2" = + self.by-version."uid"."0.0.2"; + by-version."uid"."0.0.2" = self.buildNodePackage { + name = "uid-0.0.2"; + version = "0.0.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; + name = "uid-0.0.2.tgz"; + sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid-number"."0.0.3" = self.by-version."uid-number"."0.0.3"; by-version."uid-number"."0.0.3" = self.buildNodePackage { name = "uid-number-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; @@ -29410,12 +38879,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid-number"."0.0.5" = self.by-version."uid-number"."0.0.5"; by-version."uid-number"."0.0.5" = self.buildNodePackage { name = "uid-number-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; @@ -29424,12 +38898,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid-number"."0.0.6" = self.by-version."uid-number"."0.0.6"; by-version."uid-number"."0.0.6" = self.buildNodePackage { name = "uid-number-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; @@ -29438,12 +38917,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid-safe"."1.0.1" = self.by-version."uid-safe"."1.0.1"; by-version."uid-safe"."1.0.1" = self.buildNodePackage { name = "uid-safe-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz"; @@ -29454,12 +38938,17 @@ "mz-1.3.0" = self.by-version."mz"."1.3.0"; "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid-safe"."1.1.0" = self.by-version."uid-safe"."1.1.0"; by-version."uid-safe"."1.1.0" = self.buildNodePackage { name = "uid-safe-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; @@ -29470,7 +38959,11 @@ "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid-safe"."~1.1.0" = self.by-version."uid-safe"."1.1.0"; @@ -29478,6 +38971,7 @@ self.by-version."uid2"."0.0.3"; by-version."uid2"."0.0.3" = self.buildNodePackage { name = "uid2-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; @@ -29486,7 +38980,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uid2"."0.0.x" = self.by-version."uid2"."0.0.3"; @@ -29496,6 +38994,7 @@ self.by-version."ultron"."1.0.1"; by-version."ultron"."1.0.1" = self.buildNodePackage { name = "ultron-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"; @@ -29504,12 +39003,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."umask"."~1.1.0" = self.by-version."umask"."1.1.0"; by-version."umask"."1.1.0" = self.buildNodePackage { name = "umask-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz"; @@ -29518,12 +39022,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."umd"."^2.1.0" = self.by-version."umd"."2.1.0"; by-version."umd"."2.1.0" = self.buildNodePackage { name = "umd-2.1.0"; + version = "2.1.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz"; @@ -29536,12 +39045,36 @@ "through-2.3.6" = self.by-version."through"."2.3.6"; "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."umd"."^3.0.0" = + self.by-version."umd"."3.0.0"; + by-version."umd"."3.0.0" = self.buildNodePackage { + name = "umd-3.0.0"; + version = "3.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/umd/-/umd-3.0.0.tgz"; + name = "umd-3.0.0.tgz"; + sha1 = "328de29bf1004abb4d6309d7fff1b84b9f823b83"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."umd"."~2.0.0" = self.by-version."umd"."2.0.0"; by-version."umd"."2.0.0" = self.buildNodePackage { name = "umd-2.0.0"; + version = "2.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz"; @@ -29554,29 +39087,39 @@ "through-2.3.6" = self.by-version."through"."2.3.6"; "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."umd"."~2.1.0" = self.by-version."umd"."2.1.0"; by-spec."underscore"."*" = - self.by-version."underscore"."1.7.0"; - by-version."underscore"."1.7.0" = self.buildNodePackage { - name = "underscore-1.7.0"; + self.by-version."underscore"."1.8.2"; + by-version."underscore"."1.8.2" = self.buildNodePackage { + name = "underscore-1.8.2"; + version = "1.8.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - name = "underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz"; + name = "underscore-1.8.2.tgz"; + sha1 = "64df2eb590899de950782f3735190ba42ebf311d"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - "underscore" = self.by-version."underscore"."1.7.0"; + "underscore" = self.by-version."underscore"."1.8.2"; by-spec."underscore"."1.2.1" = self.by-version."underscore"."1.2.1"; by-version."underscore"."1.2.1" = self.buildNodePackage { name = "underscore-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"; @@ -29585,12 +39128,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore"."1.3.3" = self.by-version."underscore"."1.3.3"; by-version."underscore"."1.3.3" = self.buildNodePackage { name = "underscore-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.3.3.tgz"; @@ -29599,12 +39147,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore"."1.6.x" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = self.buildNodePackage { name = "underscore-1.6.0"; + version = "1.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; @@ -29613,28 +39166,50 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore"."1.7.0" = self.by-version."underscore"."1.7.0"; + by-version."underscore"."1.7.0" = self.buildNodePackage { + name = "underscore-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + name = "underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."underscore"."1.x" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore".">=1.1.7" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore".">=1.3.1" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore".">=1.5.0" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore".">=1.5.2" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore"."^1.6.0" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore"."^1.7.0" = - self.by-version."underscore"."1.7.0"; + self.by-version."underscore"."1.8.2"; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = self.buildNodePackage { name = "underscore-1.4.4"; + version = "1.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; @@ -29643,7 +39218,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore"."~1.4.4" = self.by-version."underscore"."1.4.4"; @@ -29651,6 +39230,7 @@ self.by-version."underscore"."1.5.2"; by-version."underscore"."1.5.2" = self.buildNodePackage { name = "underscore-1.5.2"; + version = "1.5.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; @@ -29659,7 +39239,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore"."~1.7.0" = self.by-version."underscore"."1.7.0"; @@ -29667,6 +39251,7 @@ self.by-version."underscore.string"."2.2.1"; by-version."underscore.string"."2.2.1" = self.buildNodePackage { name = "underscore.string-2.2.1"; + version = "2.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"; @@ -29675,12 +39260,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore.string"."~2.3.1" = self.by-version."underscore.string"."2.3.3"; by-version."underscore.string"."2.3.3" = self.buildNodePackage { name = "underscore.string-2.3.3"; + version = "2.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; @@ -29689,7 +39279,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."underscore.string"."~2.3.3" = self.by-version."underscore.string"."2.3.3"; @@ -29697,6 +39291,7 @@ self.by-version."underscore.string"."2.4.0"; by-version."underscore.string"."2.4.0" = self.buildNodePackage { name = "underscore.string-2.4.0"; + version = "2.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; @@ -29705,12 +39300,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."unfunk-diff"."~0.0.1" = self.by-version."unfunk-diff"."0.0.2"; by-version."unfunk-diff"."0.0.2" = self.buildNodePackage { name = "unfunk-diff-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz"; @@ -29722,12 +39322,17 @@ "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3"; "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ungit"."*" = self.by-version."ungit"."0.8.4"; by-version."ungit"."0.8.4" = self.buildNodePackage { name = "ungit-0.8.4"; + version = "0.8.4"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ungit/-/ungit-0.8.4.tgz"; @@ -29769,13 +39374,18 @@ "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "ungit" = self.by-version."ungit"."0.8.4"; by-spec."unique-stream"."^1.0.0" = self.by-version."unique-stream"."1.0.0"; by-version."unique-stream"."1.0.0" = self.buildNodePackage { name = "unique-stream-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; @@ -29784,12 +39394,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."unorm"."1.3.3" = self.by-version."unorm"."1.3.3"; by-version."unorm"."1.3.3" = self.buildNodePackage { name = "unorm-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"; @@ -29798,12 +39413,37 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."untildify"."^1.0.0" = + self.by-version."untildify"."1.0.0"; + by-version."untildify"."1.0.0" = self.buildNodePackage { + name = "untildify-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/untildify/-/untildify-1.0.0.tgz"; + name = "untildify-1.0.0.tgz"; + sha1 = "4d8031d1806f4fbd7c42b0237aaf213686262635"; + }; + deps = { + "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."update-notifier"."0.2.0" = self.by-version."update-notifier"."0.2.0"; by-version."update-notifier"."0.2.0" = self.buildNodePackage { name = "update-notifier-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz"; @@ -29817,12 +39457,17 @@ "semver-diff-0.1.0" = self.by-version."semver-diff"."0.1.0"; "string-length-0.1.2" = self.by-version."string-length"."0.1.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."update-notifier"."^0.3.0" = self.by-version."update-notifier"."0.3.0"; by-version."update-notifier"."0.3.0" = self.buildNodePackage { name = "update-notifier-0.3.0"; + version = "0.3.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.3.0.tgz"; @@ -29837,12 +39482,17 @@ "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0"; "string-length-1.0.0" = self.by-version."string-length"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uri-path"."0.0.2" = self.by-version."uri-path"."0.0.2"; by-version."uri-path"."0.0.2" = self.buildNodePackage { name = "uri-path-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz"; @@ -29851,12 +39501,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."url"."~0.10.1" = self.by-version."url"."0.10.2"; by-version."url"."0.10.2" = self.buildNodePackage { name = "url-0.10.2"; + version = "0.10.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/url/-/url-0.10.2.tgz"; @@ -29866,12 +39521,17 @@ deps = { "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."url"."~0.7.9" = self.by-version."url"."0.7.9"; by-version."url"."0.7.9" = self.buildNodePackage { name = "url-0.7.9"; + version = "0.7.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz"; @@ -29882,12 +39542,17 @@ "querystring-0.1.0" = self.by-version."querystring"."0.1.0"; "punycode-1.0.0" = self.by-version."punycode"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."user-home"."^1.0.0" = self.by-version."user-home"."1.1.1"; by-version."user-home"."1.1.1" = self.buildNodePackage { name = "user-home-1.1.1"; + version = "1.1.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; @@ -29896,7 +39561,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."user-home"."^1.1.0" = self.by-version."user-home"."1.1.1"; @@ -29904,6 +39573,7 @@ self.by-version."useragent"."2.0.10"; by-version."useragent"."2.0.10" = self.buildNodePackage { name = "useragent-2.0.10"; + version = "2.0.10"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz"; @@ -29913,12 +39583,17 @@ deps = { "lru-cache-2.2.4" = self.by-version."lru-cache"."2.2.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utf-8-validate"."1.0.x" = self.by-version."utf-8-validate"."1.0.1"; by-version."utf-8-validate"."1.0.1" = self.buildNodePackage { name = "utf-8-validate-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz"; @@ -29929,12 +39604,36 @@ "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utf7"."1.0.0" = + self.by-version."utf7"."1.0.0"; + by-version."utf7"."1.0.0" = self.buildNodePackage { + name = "utf7-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz"; + name = "utf7-1.0.0.tgz"; + sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utf8"."2.0.0" = self.by-version."utf8"."2.0.0"; by-version."utf8"."2.0.0" = self.buildNodePackage { name = "utf8-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"; @@ -29943,12 +39642,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utfx"."~1.0.0" = self.by-version."utfx"."1.0.0"; by-version."utfx"."1.0.0" = self.buildNodePackage { name = "utfx-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/utfx/-/utfx-1.0.0.tgz"; @@ -29957,12 +39661,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."util"."0.10.3" = self.by-version."util"."0.10.3"; by-version."util"."0.10.3" = self.buildNodePackage { name = "util-0.10.3"; + version = "0.10.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; @@ -29972,12 +39681,17 @@ deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."util"."0.4.9" = self.by-version."util"."0.4.9"; by-version."util"."0.4.9" = self.buildNodePackage { name = "util-0.4.9"; + version = "0.4.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz"; @@ -29987,16 +39701,23 @@ deps = { "events.node-0.4.9" = self.by-version."events.node"."0.4.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."util".">=0.10.3 <1" = self.by-version."util"."0.10.3"; by-spec."util"."~0.10.1" = self.by-version."util"."0.10.3"; + by-spec."util"."~0.10.3" = + self.by-version."util"."0.10.3"; by-spec."util-deprecate"."1.0.0" = self.by-version."util-deprecate"."1.0.0"; by-version."util-deprecate"."1.0.0" = self.buildNodePackage { name = "util-deprecate-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"; @@ -30005,12 +39726,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."util-extend"."^1.0.1" = self.by-version."util-extend"."1.0.1"; by-version."util-extend"."1.0.1" = self.buildNodePackage { name = "util-extend-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"; @@ -30019,12 +39745,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = self.buildNodePackage { name = "utile-0.1.7"; + version = "0.1.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; @@ -30039,12 +39770,17 @@ "ncp-0.2.7" = self.by-version."ncp"."0.2.7"; "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utile"."0.2.1" = self.by-version."utile"."0.2.1"; by-version."utile"."0.2.1" = self.buildNodePackage { name = "utile-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; @@ -30059,7 +39795,11 @@ "ncp-0.4.2" = self.by-version."ncp"."0.4.2"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utile"."0.2.x" = self.by-version."utile"."0.2.1"; @@ -30069,6 +39809,7 @@ self.by-version."utils-merge"."1.0.0"; by-version."utils-merge"."1.0.0" = self.buildNodePackage { name = "utils-merge-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; @@ -30077,7 +39818,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."utils-merge"."1.x.x" = self.by-version."utils-merge"."1.0.0"; @@ -30085,6 +39830,7 @@ self.by-version."uuid"."2.0.1"; by-version."uuid"."2.0.1" = self.buildNodePackage { name = "uuid-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; @@ -30093,7 +39839,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."uuid"."~2.0.1" = self.by-version."uuid"."2.0.1"; @@ -30101,6 +39851,7 @@ self.by-version."v8-debug"."0.3.5"; by-version."v8-debug"."0.3.5" = self.buildNodePackage { name = "v8-debug-0.3.5"; + version = "0.3.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.5.tgz"; @@ -30111,28 +39862,38 @@ "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4"; "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."v8-profiler"."~5.2.0" = - self.by-version."v8-profiler"."5.2.3"; - by-version."v8-profiler"."5.2.3" = self.buildNodePackage { - name = "v8-profiler-5.2.3"; + self.by-version."v8-profiler"."5.2.4"; + by-version."v8-profiler"."5.2.4" = self.buildNodePackage { + name = "v8-profiler-5.2.4"; + version = "5.2.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.3.tgz"; - name = "v8-profiler-5.2.3.tgz"; - sha1 = "6030cc6ec3bf8679e27b3cded3713a584799895f"; + url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.4.tgz"; + name = "v8-profiler-5.2.4.tgz"; + sha1 = "858df0a98dffb79f5df5de74c21a05f57051d977"; }; deps = { "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4"; "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."v8flags"."^2.0.2" = self.by-version."v8flags"."2.0.2"; by-version."v8flags"."2.0.2" = self.buildNodePackage { name = "v8flags-2.0.2"; + version = "2.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/v8flags/-/v8flags-2.0.2.tgz"; @@ -30141,12 +39902,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."valid-identifier"."0.0.1" = self.by-version."valid-identifier"."0.0.1"; by-version."valid-identifier"."0.0.1" = self.buildNodePackage { name = "valid-identifier-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"; @@ -30155,12 +39921,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."validator"."1.5.1" = self.by-version."validator"."1.5.1"; by-version."validator"."1.5.1" = self.buildNodePackage { name = "validator-1.5.1"; + version = "1.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/validator/-/validator-1.5.1.tgz"; @@ -30169,12 +39940,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."validator"."^2.1.0" = self.by-version."validator"."2.1.0"; by-version."validator"."2.1.0" = self.buildNodePackage { name = "validator-2.1.0"; + version = "2.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/validator/-/validator-2.1.0.tgz"; @@ -30183,7 +39959,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."validator"."~1.5.1" = self.by-version."validator"."1.5.1"; @@ -30191,6 +39971,7 @@ self.by-version."vargs"."0.1.0"; by-version."vargs"."0.1.0" = self.buildNodePackage { name = "vargs-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"; @@ -30199,12 +39980,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vary"."0.1.0" = self.by-version."vary"."0.1.0"; by-version."vary"."0.1.0" = self.buildNodePackage { name = "vary-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; @@ -30213,12 +39999,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."vary"."~1.0.0" = + by-spec."vary"."^1" = self.by-version."vary"."1.0.0"; by-version."vary"."1.0.0" = self.buildNodePackage { name = "vary-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; @@ -30227,12 +40018,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."vary"."~1.0.0" = + self.by-version."vary"."1.0.0"; by-spec."vasync"."1.3.3" = self.by-version."vasync"."1.3.3"; by-version."vasync"."1.3.3" = self.buildNodePackage { name = "vasync-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz"; @@ -30243,12 +40041,17 @@ "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0"; "verror-1.1.0" = self.by-version."verror"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vasync"."1.4.0" = self.by-version."vasync"."1.4.0"; by-version."vasync"."1.4.0" = self.buildNodePackage { name = "vasync-1.4.0"; + version = "1.4.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz"; @@ -30259,12 +40062,17 @@ "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0"; "verror-1.1.0" = self.by-version."verror"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vasync"."1.4.3" = self.by-version."vasync"."1.4.3"; by-version."vasync"."1.4.3" = self.buildNodePackage { name = "vasync-1.4.3"; + version = "1.4.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz"; @@ -30275,12 +40083,17 @@ "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0"; "verror-1.1.0" = self.by-version."verror"."1.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."verror"."1.1.0" = self.by-version."verror"."1.1.0"; by-version."verror"."1.1.0" = self.buildNodePackage { name = "verror-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; @@ -30290,12 +40103,17 @@ deps = { "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."verror"."1.3.3" = self.by-version."verror"."1.3.3"; by-version."verror"."1.3.3" = self.buildNodePackage { name = "verror-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; @@ -30305,12 +40123,17 @@ deps = { "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."verror"."1.3.6" = self.by-version."verror"."1.3.6"; by-version."verror"."1.3.6" = self.buildNodePackage { name = "verror-1.3.6"; + version = "1.3.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; @@ -30320,12 +40143,17 @@ deps = { "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."verror"."^1.4.0" = self.by-version."verror"."1.6.0"; by-version."verror"."1.6.0" = self.buildNodePackage { name = "verror-1.6.0"; + version = "1.6.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; @@ -30335,12 +40163,17 @@ deps = { "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vhost"."1.0.0" = self.by-version."vhost"."1.0.0"; by-version."vhost"."1.0.0" = self.buildNodePackage { name = "vhost-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz"; @@ -30349,12 +40182,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vhost"."~3.0.0" = self.by-version."vhost"."3.0.0"; by-version."vhost"."3.0.0" = self.buildNodePackage { name = "vhost-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz"; @@ -30363,12 +40201,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."view-helpers"."*" = self.by-version."view-helpers"."0.1.5"; by-version."view-helpers"."0.1.5" = self.buildNodePackage { name = "view-helpers-0.1.5"; + version = "0.1.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz"; @@ -30377,13 +40220,18 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "view-helpers" = self.by-version."view-helpers"."0.1.5"; by-spec."vinyl"."^0.4.0" = self.by-version."vinyl"."0.4.6"; by-version."vinyl"."0.4.6" = self.buildNodePackage { name = "vinyl-0.4.6"; + version = "0.4.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; @@ -30394,7 +40242,11 @@ "clone-0.2.0" = self.by-version."clone"."0.2.0"; "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vinyl"."^0.4.3" = self.by-version."vinyl"."0.4.6"; @@ -30404,6 +40256,7 @@ self.by-version."vinyl-fs"."0.3.13"; by-version."vinyl-fs"."0.3.13" = self.buildNodePackage { name = "vinyl-fs-0.3.13"; + version = "0.3.13"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz"; @@ -30420,14 +40273,19 @@ "through2-0.6.3" = self.by-version."through2"."0.6.3"; "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vinyl-fs"."^0.3.13" = self.by-version."vinyl-fs"."0.3.13"; - by-spec."vm-browserify"."~0.0.1" = + by-spec."vm-browserify"."0.0.4" = self.by-version."vm-browserify"."0.0.4"; by-version."vm-browserify"."0.0.4" = self.buildNodePackage { name = "vm-browserify-0.0.4"; + version = "0.0.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; @@ -30437,12 +40295,19 @@ deps = { "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."vm-browserify"."~0.0.1" = + self.by-version."vm-browserify"."0.0.4"; by-spec."voc"."*" = self.by-version."voc"."0.5.0"; by-version."voc"."0.5.0" = self.buildNodePackage { name = "voc-0.5.0"; + version = "0.5.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/voc/-/voc-0.5.0.tgz"; @@ -30451,12 +40316,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."void-elements"."~2.0.1" = self.by-version."void-elements"."2.0.1"; by-version."void-elements"."2.0.1" = self.buildNodePackage { name = "void-elements-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; @@ -30465,29 +40335,41 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."vows".">=0.5.13" = - self.by-version."vows"."0.9.0-rc2"; - by-version."vows"."0.9.0-rc2" = self.buildNodePackage { - name = "vows-0.9.0-rc2"; + self.by-version."vows"."0.8.1"; + by-version."vows"."0.8.1" = self.buildNodePackage { + name = "vows-0.8.1"; + version = "0.8.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc2.tgz"; - name = "vows-0.9.0-rc2.tgz"; - sha1 = "8e2bccc46e8db8b5277e09f6818c514e444da631"; + url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; + name = "vows-0.8.1.tgz"; + sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; }; deps = { "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.2.2" = self.by-version."diff"."1.2.2"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "glob-4.0.6" = self.by-version."glob"."4.0.6"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."vows".">=0.5.2" = + self.by-version."vows"."0.8.1"; by-spec."walk"."*" = self.by-version."walk"."2.3.9"; by-version."walk"."2.3.9" = self.buildNodePackage { name = "walk-2.3.9"; + version = "2.3.9"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; @@ -30497,7 +40379,11 @@ deps = { "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "walk" = self.by-version."walk"."2.3.9"; by-spec."walk"."^2.3.9" = @@ -30506,6 +40392,7 @@ self.by-version."ware"."1.2.0"; by-version."ware"."1.2.0" = self.buildNodePackage { name = "ware-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ware/-/ware-1.2.0.tgz"; @@ -30515,12 +40402,17 @@ deps = { "wrap-fn-0.1.4" = self.by-version."wrap-fn"."0.1.4"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."watch"."0.5.x" = self.by-version."watch"."0.5.1"; by-version."watch"."0.5.1" = self.buildNodePackage { name = "watch-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; @@ -30529,12 +40421,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."watch"."~0.13.0" = self.by-version."watch"."0.13.0"; by-version."watch"."0.13.0" = self.buildNodePackage { name = "watch-0.13.0"; + version = "0.13.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.13.0.tgz"; @@ -30544,12 +40441,39 @@ deps = { "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."watchpack"."^0.2.1" = + self.by-version."watchpack"."0.2.3"; + by-version."watchpack"."0.2.3" = self.buildNodePackage { + name = "watchpack-0.2.3"; + version = "0.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/watchpack/-/watchpack-0.2.3.tgz"; + name = "watchpack-0.2.3.tgz"; + sha1 = "b9a5342327ee34a9ff1dfb42762be3a9c08ac214"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "chokidar-1.0.0-rc3" = self.by-version."chokidar"."1.0.0-rc3"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."wcwidth"."^1.0.0" = self.by-version."wcwidth"."1.0.0"; by-version."wcwidth"."1.0.0" = self.buildNodePackage { name = "wcwidth-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz"; @@ -30559,12 +40483,17 @@ deps = { "defaults-1.0.0" = self.by-version."defaults"."1.0.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."wd"."~0.3.4" = self.by-version."wd"."0.3.11"; by-version."wd"."0.3.11" = self.buildNodePackage { name = "wd-0.3.11"; + version = "0.3.11"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/wd/-/wd-0.3.11.tgz"; @@ -30580,12 +40509,17 @@ "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; "vargs-0.1.0" = self.by-version."vargs"."0.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."weak-map"."^1.0.5" = self.by-version."weak-map"."1.0.5"; by-version."weak-map"."1.0.5" = self.buildNodePackage { name = "weak-map-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; @@ -30594,12 +40528,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."webdrvr"."*" = self.by-version."webdrvr"."2.43.0-0"; by-version."webdrvr"."2.43.0-0" = self.buildNodePackage { name = "webdrvr-2.43.0-0"; + version = "2.43.0-0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-0.tgz"; @@ -30615,13 +40554,18 @@ "tmp-0.0.24" = self.by-version."tmp"."0.0.24"; "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "webdrvr" = self.by-version."webdrvr"."2.43.0-0"; by-spec."webkit-devtools-agent"."^0.2.4" = self.by-version."webkit-devtools-agent"."0.2.5"; by-version."webkit-devtools-agent"."0.2.5" = self.buildNodePackage { name = "webkit-devtools-agent-0.2.5"; + version = "0.2.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/webkit-devtools-agent/-/webkit-devtools-agent-0.2.5.tgz"; @@ -30632,43 +40576,129 @@ "ws-0.4.31" = self.by-version."ws"."0.4.31"; "underscore-1.3.3" = self.by-version."underscore"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."webpack"."*" = + self.by-version."webpack"."1.5.3"; + by-version."webpack"."1.5.3" = self.buildNodePackage { + name = "webpack-1.5.3"; + version = "1.5.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/webpack/-/webpack-1.5.3.tgz"; + name = "webpack-1.5.3.tgz"; + sha1 = "817a91e1fe70bbaba9400ea49afdfc9a05f4b0c5"; + }; + deps = { + "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "enhanced-resolve-0.8.4" = self.by-version."enhanced-resolve"."0.8.4"; + "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0"; + "clone-0.1.19" = self.by-version."clone"."0.1.19"; + "webpack-core-0.4.8" = self.by-version."webpack-core"."0.4.8"; + "node-libs-browser-0.4.1" = self.by-version."node-libs-browser"."0.4.1"; + "watchpack-0.2.3" = self.by-version."watchpack"."0.2.3"; + "tapable-0.1.8" = self.by-version."tapable"."0.1.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "webpack" = self.by-version."webpack"."1.5.3"; + by-spec."webpack-core"."~0.4.8" = + self.by-version."webpack-core"."0.4.8"; + by-version."webpack-core"."0.4.8" = self.buildNodePackage { + name = "webpack-core-0.4.8"; + version = "0.4.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/webpack-core/-/webpack-core-0.4.8.tgz"; + name = "webpack-core-0.4.8.tgz"; + sha1 = "07fc55aba81d17dba8cae5a43d6bd69236f8b5f8"; + }; + deps = { + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."websocket-driver".">=0.3.6" = - self.by-version."websocket-driver"."0.5.1"; - by-version."websocket-driver"."0.5.1" = self.buildNodePackage { - name = "websocket-driver-0.5.1"; + self.by-version."websocket-driver"."0.5.3"; + by-version."websocket-driver"."0.5.3" = self.buildNodePackage { + name = "websocket-driver-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz"; - name = "websocket-driver-0.5.1.tgz"; - sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.3.tgz"; + name = "websocket-driver-0.5.3.tgz"; + sha1 = "775d079018f8985e1c255eb8efa9224895acacc3"; }; deps = { - "websocket-extensions-0.1.0" = self.by-version."websocket-extensions"."0.1.0"; + "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."websocket-driver".">=0.5.1" = - self.by-version."websocket-driver"."0.5.1"; - by-spec."websocket-extensions".">=0.1.0" = - self.by-version."websocket-extensions"."0.1.0"; - by-version."websocket-extensions"."0.1.0" = self.buildNodePackage { - name = "websocket-extensions-0.1.0"; + self.by-version."websocket-driver"."0.5.3"; + by-spec."websocket-extensions".">=0.1.1" = + self.by-version."websocket-extensions"."0.1.1"; + by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { + name = "websocket-extensions-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + name = "websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."when"."3.7.2" = + self.by-version."when"."3.7.2"; + by-version."when"."3.7.2" = self.buildNodePackage { + name = "when-3.7.2"; + version = "3.7.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz"; - name = "websocket-extensions-0.1.0.tgz"; - sha1 = "43567457158085e83ce7050f17ac6d988936320a"; + url = "http://registry.npmjs.org/when/-/when-3.7.2.tgz"; + name = "when-3.7.2.tgz"; + sha1 = "06bed1296df3a0bfd83f7f31c5e1d779bd97eae8"; }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."when"."~3.4.6" = self.by-version."when"."3.4.6"; by-version."when"."3.4.6" = self.buildNodePackage { name = "when-3.4.6"; + version = "3.4.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz"; @@ -30677,12 +40707,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."which"."1" = self.by-version."which"."1.0.8"; by-version."which"."1.0.8" = self.buildNodePackage { name = "which-1.0.8"; + version = "1.0.8"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz"; @@ -30691,7 +40726,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."which"."1.0.x" = self.by-version."which"."1.0.8"; @@ -30701,10 +40740,31 @@ self.by-version."which"."1.0.8"; by-spec."which"."~1.0.8" = self.by-version."which"."1.0.8"; + by-spec."win-detect-browsers"."^0.0.2" = + self.by-version."win-detect-browsers"."0.0.2"; + by-version."win-detect-browsers"."0.0.2" = self.buildNodePackage { + name = "win-detect-browsers-0.0.2"; + version = "0.0.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-0.0.2.tgz"; + name = "win-detect-browsers-0.0.2.tgz"; + sha1 = "d636ade6434c9967c7e7af592a0b4aa2ba9d22f2"; + }; + deps = { + "which-1.0.8" = self.by-version."which"."1.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."win-release"."^1.0.0" = self.by-version."win-release"."1.0.0"; by-version."win-release"."1.0.0" = self.buildNodePackage { name = "win-release-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/win-release/-/win-release-1.0.0.tgz"; @@ -30713,12 +40773,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."win-trash"."^1.0.0" = self.by-version."win-trash"."1.0.0"; by-version."win-trash"."1.0.0" = self.buildNodePackage { name = "win-trash-1.0.0"; + version = "1.0.0"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/win-trash/-/win-trash-1.0.0.tgz"; @@ -30727,12 +40792,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."windows-no-runnable"."~0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage { name = "windows-no-runnable-0.0.6"; + version = "0.0.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz"; @@ -30741,12 +40811,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winser"."=0.1.6" = self.by-version."winser"."0.1.6"; by-version."winser"."0.1.6" = self.buildNodePackage { name = "winser-0.1.6"; + version = "0.1.6"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; @@ -30757,12 +40832,17 @@ "sequence-2.2.1" = self.by-version."sequence"."2.2.1"; "commander-1.3.1" = self.by-version."commander"."1.3.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."*" = self.by-version."winston"."0.9.0"; by-version."winston"."0.9.0" = self.buildNodePackage { name = "winston-0.9.0"; + version = "0.9.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.9.0.tgz"; @@ -30778,13 +40858,18 @@ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "winston" = self.by-version."winston"."0.9.0"; by-spec."winston"."0.5.1" = self.by-version."winston"."0.5.1"; by-version."winston"."0.5.1" = self.buildNodePackage { name = "winston-0.5.1"; + version = "0.5.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.5.1.tgz"; @@ -30799,12 +40884,17 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."0.6.2" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = self.buildNodePackage { name = "winston-0.6.2"; + version = "0.6.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; @@ -30820,7 +40910,11 @@ "request-2.9.203" = self.by-version."request"."2.9.203"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."0.6.x" = self.by-version."winston"."0.6.2"; @@ -30828,6 +40922,7 @@ self.by-version."winston"."0.7.2"; by-version."winston"."0.7.2" = self.buildNodePackage { name = "winston-0.7.2"; + version = "0.7.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; @@ -30843,12 +40938,17 @@ "request-2.16.6" = self.by-version."request"."2.16.6"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."0.7.3" = self.by-version."winston"."0.7.3"; by-version."winston"."0.7.3" = self.buildNodePackage { name = "winston-0.7.3"; + version = "0.7.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; @@ -30864,12 +40964,17 @@ "request-2.16.6" = self.by-version."request"."2.16.6"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."0.8.0" = self.by-version."winston"."0.8.0"; by-version."winston"."0.8.0" = self.buildNodePackage { name = "winston-0.8.0"; + version = "0.8.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; @@ -30884,12 +40989,17 @@ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."0.8.x" = self.by-version."winston"."0.8.3"; by-version."winston"."0.8.3" = self.buildNodePackage { name = "winston-0.8.3"; + version = "0.8.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; @@ -30905,7 +41015,11 @@ "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."winston"."~0.8.1" = self.by-version."winston"."0.8.3"; @@ -30915,6 +41029,7 @@ self.by-version."with"."1.1.1"; by-version."with"."1.1.1" = self.buildNodePackage { name = "with-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz"; @@ -30924,12 +41039,17 @@ deps = { "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."with"."~2.0.0" = self.by-version."with"."2.0.0"; by-version."with"."2.0.0" = self.buildNodePackage { name = "with-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz"; @@ -30939,12 +41059,17 @@ deps = { "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."with"."~4.0.0" = self.by-version."with"."4.0.1"; by-version."with"."4.0.1" = self.buildNodePackage { name = "with-4.0.1"; + version = "4.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/with/-/with-4.0.1.tgz"; @@ -30955,12 +41080,17 @@ "acorn-0.11.0" = self.by-version."acorn"."0.11.0"; "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = self.buildNodePackage { name = "wordwrap-0.0.2"; + version = "0.0.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; @@ -30969,7 +41099,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."wordwrap".">=0.0.1 <0.1.0" = self.by-version."wordwrap"."0.0.2"; @@ -30979,6 +41113,7 @@ self.by-version."wrap-fn"."0.1.4"; by-version."wrap-fn"."0.1.4" = self.buildNodePackage { name = "wrap-fn-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.4.tgz"; @@ -30988,12 +41123,17 @@ deps = { "co-3.1.0" = self.by-version."co"."3.1.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."wrappy"."1" = self.by-version."wrappy"."1.0.1"; by-version."wrappy"."1.0.1" = self.buildNodePackage { name = "wrappy-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; @@ -31002,14 +41142,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."wrappy"."~1.0.1" = self.by-version."wrappy"."1.0.1"; - by-spec."wrench"."~1.5.0" = + by-spec."wrench"."~1.5.4" = self.by-version."wrench"."1.5.8"; by-version."wrench"."1.5.8" = self.buildNodePackage { name = "wrench-1.5.8"; + version = "1.5.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; @@ -31018,14 +41163,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."wrench"."~1.5.4" = + by-spec."wrench"."~1.5.8" = self.by-version."wrench"."1.5.8"; by-spec."write-file-atomic"."~1.1.0" = self.by-version."write-file-atomic"."1.1.0"; by-version."write-file-atomic"."1.1.0" = self.buildNodePackage { name = "write-file-atomic-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz"; @@ -31036,12 +41186,17 @@ "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ws"."0.4.31" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = self.buildNodePackage { name = "ws-0.4.31"; + version = "0.4.31"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; @@ -31054,12 +41209,17 @@ "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; "options-0.0.6" = self.by-version."options"."0.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.32"; by-version."ws"."0.4.32" = self.buildNodePackage { name = "ws-0.4.32"; + version = "0.4.32"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; @@ -31072,14 +41232,17 @@ "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; "options-0.0.6" = self.by-version."options"."0.0.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."ws"."~0.4.31" = - self.by-version."ws"."0.4.32"; - by-spec."ws"."~0.7.1" = + by-spec."ws"."0.7.1" = self.by-version."ws"."0.7.1"; by-version."ws"."0.7.1" = self.buildNodePackage { name = "ws-0.7.1"; + version = "0.7.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz"; @@ -31089,15 +41252,24 @@ deps = { "options-0.0.6" = self.by-version."options"."0.0.6"; "ultron-1.0.1" = self.by-version."ultron"."1.0.1"; + }; + optionalDependencies = { "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1"; "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1"; }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; + by-spec."ws"."~0.4.31" = + self.by-version."ws"."0.4.32"; + by-spec."ws"."~0.7.1" = + self.by-version."ws"."0.7.1"; by-spec."wu"."*" = self.by-version."wu"."2.0.0"; by-version."wu"."2.0.0" = self.buildNodePackage { name = "wu-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz"; @@ -31107,13 +41279,38 @@ deps = { "traceur-0.0.55" = self.by-version."traceur"."0.0.55"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "wu" = self.by-version."wu"."2.0.0"; + by-spec."x-default-browser"."0.3.0" = + self.by-version."x-default-browser"."0.3.0"; + by-version."x-default-browser"."0.3.0" = self.buildNodePackage { + name = "x-default-browser-0.3.0"; + version = "0.3.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.0.tgz"; + name = "x-default-browser-0.3.0.tgz"; + sha1 = "850d5137bc97b78176e69ae916417fe3d4e97d5d"; + }; + deps = { + }; + optionalDependencies = { + "default-browser-id-1.0.2" = self.by-version."default-browser-id"."1.0.2"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."x509"."*" = self.by-version."x509"."0.1.4"; by-version."x509"."0.1.4" = self.buildNodePackage { name = "x509-0.1.4"; + version = "0.1.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/x509/-/x509-0.1.4.tgz"; @@ -31123,13 +41320,18 @@ deps = { "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; "x509" = self.by-version."x509"."0.1.4"; by-spec."xcode"."0.6.7" = self.by-version."xcode"."0.6.7"; by-version."xcode"."0.6.7" = self.buildNodePackage { name = "xcode-0.6.7"; + version = "0.6.7"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz"; @@ -31140,12 +41342,17 @@ "pegjs-0.6.2" = self.by-version."pegjs"."0.6.2"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xdg-basedir"."^1.0.0" = self.by-version."xdg-basedir"."1.0.1"; by-version."xdg-basedir"."1.0.1" = self.buildNodePackage { name = "xdg-basedir-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz"; @@ -31155,12 +41362,17 @@ deps = { "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xdg-empty-trash"."^1.0.0" = self.by-version."xdg-empty-trash"."1.0.0"; by-version."xdg-empty-trash"."1.0.0" = self.buildNodePackage { name = "xdg-empty-trash-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz"; @@ -31171,12 +41383,17 @@ "each-async-1.1.1" = self.by-version."each-async"."1.1.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xdg-trash"."^1.0.0" = self.by-version."xdg-trash"."1.0.6"; by-version."xdg-trash"."1.0.6" = self.buildNodePackage { name = "xdg-trash-1.0.6"; + version = "1.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.6.tgz"; @@ -31189,12 +41406,17 @@ "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; "xdg-trashdir-1.1.1" = self.by-version."xdg-trashdir"."1.1.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xdg-trashdir"."^1.0.0" = self.by-version."xdg-trashdir"."1.1.1"; by-version."xdg-trashdir"."1.1.1" = self.buildNodePackage { name = "xdg-trashdir-1.1.1"; + version = "1.1.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.1.1.tgz"; @@ -31206,12 +41428,17 @@ "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xhr2".">= 0.0.5" = self.by-version."xhr2"."0.1.2"; by-version."xhr2"."0.1.2" = self.buildNodePackage { name = "xhr2-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xhr2/-/xhr2-0.1.2.tgz"; @@ -31220,12 +41447,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xml"."^1.0.0" = self.by-version."xml"."1.0.0"; by-version."xml"."1.0.0" = self.buildNodePackage { name = "xml-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; @@ -31234,12 +41466,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xml2js"."*" = self.by-version."xml2js"."0.4.5"; by-version."xml2js"."0.4.5" = self.buildNodePackage { name = "xml2js-0.4.5"; + version = "0.4.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.5.tgz"; @@ -31248,14 +41485,19 @@ }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "xmlbuilder-2.5.2" = self.by-version."xmlbuilder"."2.5.2"; + "xmlbuilder-2.6.1" = self.by-version."xmlbuilder"."2.6.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = self.buildNodePackage { name = "xml2js-0.2.4"; + version = "0.2.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; @@ -31265,12 +41507,17 @@ deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xml2js"."0.2.6" = self.by-version."xml2js"."0.2.6"; by-version."xml2js"."0.2.6" = self.buildNodePackage { name = "xml2js-0.2.6"; + version = "0.2.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz"; @@ -31280,12 +41527,17 @@ deps = { "sax-0.4.2" = self.by-version."sax"."0.4.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xml2js"."0.4.4" = self.by-version."xml2js"."0.4.4"; by-version."xml2js"."0.4.4" = self.buildNodePackage { name = "xml2js-0.4.4"; + version = "0.4.4"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz"; @@ -31294,9 +41546,13 @@ }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "xmlbuilder-2.5.2" = self.by-version."xmlbuilder"."2.5.2"; + "xmlbuilder-2.6.1" = self.by-version."xmlbuilder"."2.6.1"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xml2js".">= 0.0.1" = self.by-version."xml2js"."0.4.5"; @@ -31305,9 +41561,30 @@ by-spec."xml2js"."^0.4.4" = self.by-version."xml2js"."0.4.5"; by-spec."xml2json".">=0.3.2" = + self.by-version."xml2json"."0.6.1"; + by-version."xml2json"."0.6.1" = self.buildNodePackage { + name = "xml2json-0.6.1"; + version = "0.6.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/xml2json/-/xml2json-0.6.1.tgz"; + name = "xml2json-0.6.1.tgz"; + sha1 = "43883d09e4369f96b83316df833cf1fc20d6c3f1"; + }; + deps = { + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."xml2json"."^0.5.1" = self.by-version."xml2json"."0.5.1"; by-version."xml2json"."0.5.1" = self.buildNodePackage { name = "xml2json-0.5.1"; + version = "0.5.1"; bin = true; src = fetchurl { url = "http://registry.npmjs.org/xml2json/-/xml2json-0.5.1.tgz"; @@ -31317,14 +41594,17 @@ deps = { "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."xml2json"."^0.5.1" = - self.by-version."xml2json"."0.5.1"; by-spec."xmlbuilder"."0.4.2" = self.by-version."xmlbuilder"."0.4.2"; by-version."xmlbuilder"."0.4.2" = self.buildNodePackage { name = "xmlbuilder-0.4.2"; + version = "0.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; @@ -31333,12 +41613,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xmlbuilder"."0.4.x" = self.by-version."xmlbuilder"."0.4.3"; by-version."xmlbuilder"."0.4.3" = self.buildNodePackage { name = "xmlbuilder-0.4.3"; + version = "0.4.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; @@ -31347,12 +41632,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xmlbuilder"."2.2.1" = self.by-version."xmlbuilder"."2.2.1"; by-version."xmlbuilder"."2.2.1" = self.buildNodePackage { name = "xmlbuilder-2.2.1"; + version = "2.2.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz"; @@ -31362,27 +41652,37 @@ deps = { "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xmlbuilder".">=1.0.0" = - self.by-version."xmlbuilder"."2.5.2"; - by-version."xmlbuilder"."2.5.2" = self.buildNodePackage { - name = "xmlbuilder-2.5.2"; + self.by-version."xmlbuilder"."2.6.1"; + by-version."xmlbuilder"."2.6.1" = self.buildNodePackage { + name = "xmlbuilder-2.6.1"; + version = "2.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz"; - name = "xmlbuilder-2.5.2.tgz"; - sha1 = "5ab88fc508ab2ff14873010b56163d3f92b19325"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.1.tgz"; + name = "xmlbuilder-2.6.1.tgz"; + sha1 = "ba6921650133e5808288f35dcab0db696a9ba9a0"; }; deps = { - "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; + "lodash-3.3.0" = self.by-version."lodash"."3.3.0"; + }; + optionalDependencies = { }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xmldom"."0.1.x" = self.by-version."xmldom"."0.1.19"; by-version."xmldom"."0.1.19" = self.buildNodePackage { name = "xmldom-0.1.19"; + version = "0.1.19"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; @@ -31391,14 +41691,19 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; - by-spec."xmldom"."~0.1.16" = + by-spec."xmldom"."~0.1.19" = self.by-version."xmldom"."0.1.19"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = self.buildNodePackage { name = "xmlhttprequest-1.4.2"; + version = "1.4.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; @@ -31407,12 +41712,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xmlhttprequest".">=1.5.0" = self.by-version."xmlhttprequest"."1.7.0"; by-version."xmlhttprequest"."1.7.0" = self.buildNodePackage { name = "xmlhttprequest-1.7.0"; + version = "1.7.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.7.0.tgz"; @@ -31421,12 +41731,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xmlhttprequest"."https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = self.by-version."xmlhttprequest"."1.5.0"; by-version."xmlhttprequest"."1.5.0" = self.buildNodePackage { name = "xmlhttprequest-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz"; @@ -31435,12 +41750,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xoauth2"."~0.1.8" = self.by-version."xoauth2"."0.1.8"; by-version."xoauth2"."0.1.8" = self.buildNodePackage { name = "xoauth2-0.1.8"; + version = "0.1.8"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; @@ -31449,12 +41769,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xregexp"."2.0.0" = self.by-version."xregexp"."2.0.0"; by-version."xregexp"."2.0.0" = self.buildNodePackage { name = "xregexp-2.0.0"; + version = "2.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; @@ -31463,12 +41788,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xtend".">=4.0.0 <4.1.0-0" = self.by-version."xtend"."4.0.0"; by-version."xtend"."4.0.0" = self.buildNodePackage { name = "xtend-4.0.0"; + version = "4.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; @@ -31477,12 +41807,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xtend"."^3.0.0" = self.by-version."xtend"."3.0.0"; by-version."xtend"."3.0.0" = self.buildNodePackage { name = "xtend-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; @@ -31491,7 +41826,11 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xtend"."^4.0.0" = self.by-version."xtend"."4.0.0"; @@ -31499,6 +41838,7 @@ self.by-version."xtend"."2.1.2"; by-version."xtend"."2.1.2" = self.buildNodePackage { name = "xtend-2.1.2"; + version = "2.1.2"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; @@ -31508,7 +41848,11 @@ deps = { "object-keys-0.4.0" = self.by-version."object-keys"."0.4.0"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."xtend"."~3.0.0" = self.by-version."xtend"."3.0.0"; @@ -31516,6 +41860,7 @@ self.by-version."xtraverse"."0.1.0"; by-version."xtraverse"."0.1.0" = self.buildNodePackage { name = "xtraverse-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz"; @@ -31525,12 +41870,17 @@ deps = { "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."yamlish"."*" = self.by-version."yamlish"."0.0.6"; by-version."yamlish"."0.0.6" = self.buildNodePackage { name = "yamlish-0.0.6"; + version = "0.0.6"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz"; @@ -31539,12 +41889,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."yargs"."^1.2.1" = self.by-version."yargs"."1.3.3"; by-version."yargs"."1.3.3" = self.buildNodePackage { name = "yargs-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; @@ -31553,14 +41908,21 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."yargs"."~1.3.1" = self.by-version."yargs"."1.3.3"; + by-spec."yargs"."~1.3.2" = + self.by-version."yargs"."1.3.3"; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = self.buildNodePackage { name = "zeparser-0.0.5"; + version = "0.0.5"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; @@ -31569,12 +41931,17 @@ }; deps = { }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."zip-stream"."~0.4.0" = self.by-version."zip-stream"."0.4.1"; by-version."zip-stream"."0.4.1" = self.buildNodePackage { name = "zip-stream-0.4.1"; + version = "0.4.1"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz"; @@ -31586,12 +41953,17 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; by-spec."zlib-browserify"."~0.0.3" = self.by-version."zlib-browserify"."0.0.3"; by-version."zlib-browserify"."0.0.3" = self.buildNodePackage { name = "zlib-browserify-0.0.3"; + version = "0.0.3"; bin = false; src = fetchurl { url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz"; @@ -31601,6 +41973,10 @@ deps = { "tape-0.2.2" = self.by-version."tape"."0.2.2"; }; + optionalDependencies = { + }; peerDependencies = []; + os = [ ]; + cpu = [ ]; }; } diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index f942295dff7d..4c8e5bbcd886 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -26,17 +26,15 @@ , "temp" , "faye-websocket" , "node-uuid" -, "rbytes" , "sockjs" , "backbone" , "browserchannel" , "node-gyp" , "semver" -, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.10.3" } +, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.11.0" } , "ansi-remover" , "mkdirp" , "jshint" -, "stream-splitter-transform" , "bcrypt" , "nconf" , "winston" @@ -59,7 +57,6 @@ , "should" , "nodemon" , "timezone" -, "libyaml" , "i18next" , "stylus" , "nib" @@ -85,6 +82,7 @@ , "grunt-karma" , "grunt-sed" , "gulp" +, "webpack" , "karma" , "karma-mocha" , "karma-coverage" @@ -139,10 +137,8 @@ , "node-xmpp-server" , "node-xmpp-serviceadmin" , "node-xmpp-joap" -, "plc" , "7f" , "jfs" -, "toobusy" , "cordova" , "sloc" , "peerflix" @@ -194,4 +190,6 @@ , "bip-pod-github" , "bip-pod-google-drive" , "bip-pod-github" +, "sleep" +, "node-red" ] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index a0cbd5c4a8b1..b418f59e33ce 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -17,22 +17,53 @@ with stdenv.lib; -rec { +let + removeDeps = remove: deps: filterAttrs (n: d: all (r: r != d.pkgName) remove) deps; + replaceDep = replace: deps: mapAttrs (n: d: if d.pkgName == replace.pkgName then replace else d) deps; +in rec { overrides = { phantomjs.buildInputs = [ pkgs.phantomjs ]; "node-expat".buildInputs = [ pkgs.expat ]; "node-stringprep".buildInputs = [ pkgs.icu pkgs.which ]; "node-protobuf".buildInputs = [ pkgs.protobuf ]; - "rbytes".buildInputs = [ pkgs.openssl ]; - bipio.patchPhase = '' - ${self.json}/bin/json -I -f package.json -e 'this.scripts.install=""' + "tap-0.3.3".patchPhase = '' + substituteInPlace package.json --replace '"tap-consumer",' "" ''; + "node-uptime" = (p: { + # Net-ping is not really used + patchPhase = '' + ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies["net-ping"]' + ''; + deps = removeDeps ["net-ping"] p.deps; + }); + bipio = (p: { + patchPhase = '' + substituteInPlace src/bootstrap.js --replace "memwatch = require('memwatch')," "" + ${self.json}/bin/json -I -f package.json -e 'this.scripts.install=""' + ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies.sleep' + ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies.memwatch' + ${self.json}/bin/json -I -f package.json -e 'delete this.dependencies["webkit-devtools-agent"]' + ''; + deps = replaceDep self.sleep (removeDeps ["memwatch" "webkit-devtools-agent"] p.deps); + }); bip-pod.patchPhase = '' substituteInPlace index.js --replace \ "__dirname + (literal ? '/' : '/../bip-pod-') + podName" \ "(literal ? __dirname + '/' : \"bip-pod-\") + podName" ''; + webdrvr.preBuild = '' + mkdir ../webdrvr + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} ../webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} ../webdrvr/chromedriver_linux64.zip + ''; + statsd.skipOptionalDependencies = ["hashring" "node-syslog"]; } // args.overrides or {}; # Apply overrides and back compatiblity transformations diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e996d35b80e4..ef3f24090412 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -101,7 +101,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ]; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; }; AnyEvent = buildPerlPackage { @@ -219,6 +219,32 @@ let self = _self // overrides; _self = with self; { }; }; + AppSqitch = buildPerlModule rec { + version = "0.999"; + name = "App-Sqitch-${version}"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.999.tar.gz; + sha256 = "e7e02194a7b0c42fb4df046cd834d5eb99ff9a2c169f5c60a52c362e89351da6"; + }; + buildInputs = [ + CaptureTiny PathClass TestDeep TestDir TestException + TestFile TestFileContents TestMockModule TestNoWarnings + ]; + propagatedBuildInputs = [ + Clone ConfigGitLike DBI DateTime + DevelStackTrace EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 + IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter + StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI + URIdb libintlperl namespaceautoclean + ]; + doCheck = false; # Can't find home directory. + meta = { + homepage = http://sqitch.org/; + description = "Sane database change management"; + license = stdenv.lib.licenses.mit; + }; + }; + ArrayCompare = buildPerlPackage { name = "Array-Compare-1.18"; src = fetchurl { @@ -1559,6 +1585,20 @@ let self = _self // overrides; _self = with self; { }; }; + ConfigGitLike = buildPerlPackage { + name = "Config-GitLike-1.16"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.16.tar.gz; + sha256 = "48c7f7e71405219582a96e5266cbec51c0ff3ec4bf0bb6db1fd12725ee23fe8f"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; + meta = { + description = "Git-compatible config file parsing"; + license = "perl"; + }; + }; + ConfigINI = buildPerlPackage { name = "Config-INI-0.020"; src = fetchurl { @@ -3444,6 +3484,19 @@ let self = _self // overrides; _self = with self; { }; }; + ExporterTiny = buildPerlPackage { + name = "Exporter-Tiny-0.042"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-0.042.tar.gz; + sha256 = "8f1622c5ebbfbcd519ead81df7917e48cb16cc527b1c46737b0459c3908a023f"; + }; + meta = { + homepage = https://metacpan.org/release/Exporter-Tiny; + description = "An exporter with the features of Sub::Exporter but only core dependencies"; + license = "perl"; + }; + }; + ExtUtilsCBuilder = buildPerlPackage rec { name = "ExtUtils-CBuilder-0.280216"; src = fetchurl { @@ -3748,6 +3801,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; preCheck = "export HOME=$TMPDIR"; + doCheck = !stdenv.isDarwin; }; FileKeePass = buildPerlPackage rec { @@ -4773,6 +4827,18 @@ let self = _self // overrides; _self = with self; { }; }; + IPCSystemSimple = buildPerlPackage { + name = "IPC-System-Simple-1.25"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz; + sha256 = "f1b6aa1dfab886e8e4ea825f46a1cbb26038ef3e727fef5d84444aa8035a4d3b"; + }; + meta = { + description = "Run commands simply, with detailed diagnostics"; + license = "perl"; + }; + }; + ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-9.27"; @@ -5104,6 +5170,8 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; + buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.gettext; + NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lintl" else null; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; @@ -7332,6 +7400,19 @@ let self = _self // overrides; _self = with self; { }; }; + PerlIOutf8_strict = buildPerlModule { + name = "PerlIO-utf8_strict-0.005"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.005.tar.gz; + sha256 = "8956064ac2bf1f79bac868a9db93a44aade77df4d3e8b07ce31a40f987ef2e0e"; + }; + buildInputs = [ TestException ]; + meta = { + description = "Fast and correct UTF-8 IO"; + license = "perl"; + }; + }; + PerlIOviadynamic = buildPerlPackage { name = "PerlIO-via-dynamic-0.14"; src = fetchurl { @@ -8764,6 +8845,18 @@ let self = _self // overrides; _self = with self; { }; }; + TemplateTiny = buildPerlPackage { + name = "Template-Tiny-1.12"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz; + sha256 = "073e062c630b51dfb725cd6485a329155cb72d5c596e8cb698eb67c4566f0a4a"; + }; + meta = { + description = "Template Toolkit reimplemented in as little code as possible"; + license = "perl"; + }; + }; + TemplateToolkit = buildPerlPackage rec { name = "Template-Toolkit-2.25"; src = fetchurl { @@ -8997,6 +9090,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestDir = buildPerlPackage { + name = "Test-Dir-1.014"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.014.tar.gz; + sha256 = "b36efc286f8127b04fd7bb0dfdf4bd0a090b175872e35b5ce6d4d80c772c28bf"; + }; + meta = { + description = "Test directory attributes"; + license = "perl"; + }; + }; + TestDifferences = buildPerlPackage { name = "Test-Differences-0.4801"; src = fetchurl { @@ -9079,6 +9184,33 @@ let self = _self // overrides; _self = with self; { }; }; + TestFile = buildPerlPackage { + name = "Test-File-1.41"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.41.tar.gz; + sha256 = "45ec1b714f64d05e34205c40b08c49549f257910e4966fa28e2ac170d5516316"; + }; + buildInputs = [ Testutf8 ]; + meta = { + description = "Check file attributes"; + license = "perl"; + }; + }; + + TestFileContents = buildPerlModule { + name = "Test-File-Contents-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.21.tar.gz; + sha256 = "1b5a13f86f5df625ffd30361f628d34b0ceda80b9f39ca74bf0a4c1105828317"; + }; + propagatedBuildInputs = [ TextDiff ]; + meta = { + homepage = http://search.cpan.org/dist/Test-File-Contents/; + description = "Test routines for examining the contents of files"; + license = "perl"; + }; + }; + TestFileShareDir = buildPerlModule { name = "Test-File-ShareDir-0.3.3"; src = fetchurl { @@ -9861,6 +9993,19 @@ let self = _self // overrides; _self = with self; { }; }; + Testutf8 = buildPerlPackage { + name = "Test-utf8-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz; + sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; + }; + meta = { + homepage = https://github.com/2shortplanks/Test-utf8/tree; + description = "Handy utf8 tests"; + license = "perl"; + }; + }; + TextWikiFormat = buildPerlPackage { name = "Text-WikiFormat-0.81"; src = fetchurl { @@ -10040,6 +10185,20 @@ let self = _self // overrides; _self = with self; { }; }; + TypeTiny = buildPerlPackage { + name = "Type-Tiny-1.000005"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.000005.tar.gz; + sha256 = "42ed36c011825aa1e6995a4e8638621a1b2103a0970b15764ca3919368042365"; + }; + propagatedBuildInputs = [ ExporterTiny ]; + meta = { + homepage = https://metacpan.org/release/Type-Tiny; + description = "Tiny, yet Moo(se)-compatible type constraint"; + license = "perl"; + }; + }; + UNIVERSALcan = buildPerlPackage { name = "UNIVERSAL-can-1.20140328"; src = fetchurl { @@ -10149,6 +10308,20 @@ let self = _self // overrides; _self = with self; { }; }; + URIdb = buildPerlModule { + name = "URI-db-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.15.tar.gz; + sha256 = "ac3dc3eeb8ca58dc4f7e1dfed6bca5bb8ebbc5dfacee63161490b09a4bfac982"; + }; + propagatedBuildInputs = [ URI URINested ]; + meta = { + homepage = https://search.cpan.org/dist/URI-db/; + description = "Database URIs"; + license = "perl"; + }; + }; + URIFind = buildPerlModule { name = "URI-Find-20111103"; src = fetchurl { @@ -10187,6 +10360,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [URI TestMore]; }; + URINested = buildPerlModule { + name = "URI-Nested-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz; + sha256 = "e1971339a65fbac63ab87142d4b59d3d259d51417753c77cb58ea31a8233efaf"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + homepage = https://metacpan.org/release/URI-Nested/; + description = "Nested URIs"; + license = "perl"; + }; + }; + VariableMagic = buildPerlPackage rec { name = "Variable-Magic-0.53"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 600768536cab..6f99cd76cfaa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -95,4 +95,36 @@ let self = with self; { buildInputs = [ pkgs.geoip ]; }; + redis = buildPecl { + name = "redis-2.2.5"; + + sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw"; + }; + + composer = pkgs.stdenv.mkDerivation rec { + name = "composer-${version}"; + version = "1.0.0-alpha9"; + + src = pkgs.fetchurl { + url = "https://getcomposer.org/download/1.0.0-alpha9/composer.phar"; + sha256 = "1x7i9xs9xggq0qq4kzrwh2pky8skax0l829zwwsy3hcvch3irvrk"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/composer/composer.phar + makeWrapper ${php}/bin/php $out/bin/composer \ + --add-flags "$out/libexec/composer/composer.phar" + ''; + + meta = with pkgs.lib; { + description = "Dependency Manager for PHP"; + license = licenses.mit; + homepage = https://getcomposer.org/; + maintainers = with maintainers; [offline]; + }; + }; }; in self diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 20cc39692c0b..8bdc4f77302c 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -212,6 +212,98 @@ rec { }; }; + raspberrypi2 = { + name = "raspberrypi2"; + kernelMajor = "3.14"; + kernelHeadersBaseConfig = "kirkwood_defconfig"; + kernelBaseConfig = "bcm2709_defconfig"; + kernelArch = "arm"; + kernelDTB = true; + kernelAutoModules = false; + kernelExtraConfig = + '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS y + XFS_FS m + JFS_FS y + EXT4_FS y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + ZRAM m + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # nixos mounts some cgroup + CGROUPS y + + # Latencytop + LATENCYTOP y + + # Disable the common config Xen, it doesn't build on ARM + XEN? n + ''; + kernelTarget = "zImage"; + uboot = null; + gcc = { + # For gcc 4.8, the best for rpi2 would be: + # cpu = "cortex-a7"; + # fpu = "neon-vfpv4"; + # But we prefer compatibility with the beaglebone, so both + # can run the same built store paths. + arch = "armv7-a"; + fpu = "vfpv3-d16"; + float = "hard"; + }; + }; + guruplug = sheevaplug // { # Define `CONFIG_MACH_GURUPLUG' (see # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c262470400c..c01b3b59ee0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -126,6 +126,8 @@ let pitz = callPackage ../applications/misc/pitz { }; + plantuml = callPackage ../tools/misc/plantuml { }; + pycairo = callPackage ../development/python-modules/pycairo { }; @@ -807,6 +809,31 @@ let }; }; + caldavclientlibrary-asynk = buildPythonPackage rec { + version = "asynkdev"; + name = "caldavclientlibrary-asynk-${version}"; + + src = pkgs.fetchgit { + url = "https://github.com/skarra/CalDAVClientLibrary.git"; + rev = "06699b08190d50cc2636b921a654d67db0a967d1"; + sha256 = "1i6is7lv4v9by4panrd9w63m4xsmhwlp3rq4jjj3azwg5jm10940"; + }; + + meta = { + description = "CalDAVCLientLibrary is a Python library and tool for CalDAV"; + + longDescription = '' + CalDAVCLientLibrary is a Python library and tool for CalDAV. + + This package is the unofficial CalDAVCLientLibrary Python + library maintained by the author of Asynk and is needed for + that package. + ''; + + homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; + maintainers = with maintainers; [ pjones ]; + }; + }; bedup = buildPythonPackage rec { name = "bedup-20140413"; @@ -1108,6 +1135,8 @@ let buildInputs = [ self.nose self.mock ]; propagatedBuildInputs = [ self.requests self.httpretty ]; + patches = [ ../development/python-modules/boto/content-length-str.patch ]; + meta = { homepage = https://github.com/boto/boto; @@ -1501,6 +1530,27 @@ let }; }; + clf = buildPythonPackage rec { + name = "clf-${version}"; + version = "0.5.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/clf/${name}.tar.gz"; + sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; + }; + + # Error when running tests: + # No local packages or download links found for requests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ncrocfer/clf; + description = "Command line tool to search snippets on Commandlinefu.com"; + license = licenses.mit; + maintainers = [ maintainers.koral ]; + }; + }; + click = buildPythonPackage rec { name = "click-3.3"; @@ -1764,11 +1814,11 @@ let }; coverage = buildPythonPackage rec { - name = "coverage-3.6"; + name = "coverage-3.7"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; + md5 = "055d82e6849d882ec6cf2ae1faca8e56"; }; meta = { @@ -1779,10 +1829,10 @@ let }; covCore = buildPythonPackage rec { - name = "cov-core-1.7"; + name = "cov-core-1.15.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz"; - md5 = "59c1e22e636633e10120beacbf45b28c"; + url = "http://pypi.python.org/packages/source/c/cov-core/${name}.tar.gz"; + md5 = "f519d4cb4c4e52856afb14af52919fe6"; }; meta = { description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; @@ -2005,6 +2055,25 @@ let }; }; + pytestcov = buildPythonPackage (rec { + name = "pytest-cov-1.8.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-cov/${name}.tar.gz"; + md5 = "76c778afa2494088270348be42d759fc"; + }; + + buildInputs = with self; [ covCore pytest ]; + + meta = { + description = "py.test plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + + homepage = https://github.com/schlamar/pytest-cov; + + license = stdenv.lib.licenses.mit; + }; + }); + pytest_xdist = buildPythonPackage rec { name = "pytest-xdist-1.8"; @@ -2142,6 +2211,26 @@ let }; }); + ddar = buildPythonPackage { + name = "ddar-1.0"; + + src = pkgs.fetchurl { + url = "https://github.com/basak/ddar/archive/v1.0.tar.gz"; + sha256 = "08lv7hrbhcv6hbl01sx8fgx3l8s2nn8rvcicdidafwm87bvi2nmr"; + }; + + preBuild = '' + make -f Makefile.prep synctus/ddar_pb2.py + ''; + + propagatedBuildInputs = with self; [ protobuf modules.sqlite3 ]; + + meta = { + description = "Unix de-duplicating archiver"; + license = licenses.gpl3; + homepage = https://github.com/basak/ddar; + }; + }; decorator = buildPythonPackage rec { name = "decorator-3.4.0"; @@ -2364,12 +2453,12 @@ let }; docker_registry = buildPythonPackage rec { - name = "docker-registry-0.9.0"; + name = "docker-registry-0.9.1"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz"; - md5 = "65eb9fd05b94f7f9fbbb5e2e8ca62912"; + sha256 = "1svm1h59sg4bwj5cy10m016gj0xpiin15nrz5z66h47sbkndvlw3"; }; DEPS = "loose"; @@ -2377,7 +2466,7 @@ let doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy setuptools backports_lzma pyasn1 + requests2 rsa sqlalchemy9 setuptools backports_lzma pyasn1 m2crypto ]; patchPhase = "> requirements/main.txt"; @@ -2528,14 +2617,59 @@ let }; + elasticsearch = buildPythonPackage (rec { + name = "elasticsearch-1.4.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/elasticsearch/${name}.tar.gz"; + md5 = "14a758debd2296d923cb6c958db98eba"; + }; + + # Check is disabled because running them destroy the content of the local cluster! + # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch + doCheck = false; + + meta = { + description = "Official low-level client for Elasticsearch"; + + homepage = https://github.com/elasticsearch/elasticsearch-py; + + license = stdenv.lib.licenses.asl20; + }; + }); + + + elasticsearchdsl = buildPythonPackage (rec { + name = "elasticsearch-dsl-0.0.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz"; + md5 = "6cbc9ed7aefb3ef804be4e3b318b2570"; + }; + + buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 ]; + + # ImportError: No module named test_elasticsearch_dsl + doCheck = false; + + meta = { + description = "Python client for Elasticsearch"; + + homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; + + license = stdenv.lib.licenses.asl20; + }; + }); + + evdev = buildPythonPackage rec { - version = "0.4.6"; + version = "0.4.7"; name = "evdev-${version}"; disabled = isPy34; # see http://bugs.python.org/issue21121 src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz"; - sha256 = "08bzyr3zc8ijnv25bysmmvzircblh42ja15f6ijdzmqqw8vfaij8"; + sha256 = "1mz8cfncpxc1wbk2nj7apl0ssqc0vfndysxchq3wabd9vzx5p71k"; }; buildInputs = with self; [ pkgs.linuxHeaders ]; @@ -2971,15 +3105,15 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/mailchimp/mailchimp-${version}.tar.gz"; sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; - }; - + }; + # Test fails because specific version of docopt is searched # (Possible fix: Needs upstream patching in the library) doCheck = false; buildInputs = with self; [ docopt ]; - propagatedBuildInputs = with self; [ requests ]; + propagatedBuildInputs = with self; [ requests ]; meta = { description = "A CLI client and Python API library for the MailChimp email platform"; @@ -3022,6 +3156,23 @@ let }; }; + passlib = buildPythonPackage rec { + version = "1.6.2"; + name = "passlib-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/passlib/passlib-${version}.tar.gz"; + md5 = "2f872ae7c72ca338634c618f2cff5863"; + }; + + buildInputs = with self; [ nose pybcrypt]; + + meta = with stdenv.lib; { + description = "A password hashing library for Python"; + homepage = https://code.google.com/p/passlib/; + }; + }; + peppercorn = buildPythonPackage rec { name = "peppercorn-0.4"; @@ -3401,6 +3552,17 @@ let }; }; + py3status = buildPythonPackage rec { + name = "py3status-2.3"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz"; + md5 = "89ad395268c7791ff5d36412b1efeeb9"; + }; + propagatedBuildInputs = with self; [ requests2 ]; + meta = { + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }; pyramid_zodbconn = buildPythonPackage rec { name = "pyramid_zodbconn-0.7"; @@ -3692,6 +3854,23 @@ let }; }; + ddt = buildPythonPackage (rec { + name = "ddt-1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/ddt/${name}.tar.gz"; + md5 = "29688456f9ee42d09d7d7c864ce6e17b"; + }; + + meta = { + description = "Data-Driven/Decorated Tests, a library to multiply test cases"; + + homepage = https://github.com/txels/ddt; + + license = stdenv.lib.licenses.mit; + }; + }); + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; @@ -3768,15 +3947,33 @@ let }; }; - django = self.django_1_6; + django = self.django_1_7; + + django_1_7 = buildPythonPackage rec { + name = "Django-${version}"; + version = "1.7.7"; + + src = pkgs.fetchurl { + url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; + sha256 = "0crfpnf246c25887by2fjlxinp4rnhya4ksqfydcls9m0s9gh5j8"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.6.6"; + version = "1.6.11"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; - sha256 = "143yp984n8a2bs1dflxjp1s7skmji0cwkw05s9ikbfikwmabsv2k"; + sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y"; }; # error: invalid command 'test' @@ -3790,11 +3987,11 @@ let django_1_5 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.5.9"; + version = "1.5.12"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "1lm0pa6m9f4cd6pv239lqj32z1snf8xjbvlbh8bqihs6a1f51kj7"; + sha256 = "1vbcvn6ncg7hq5i1w95h746vkq9lmp120vx63h3p56z5nsz7gpmk"; }; # error: invalid command 'test' @@ -3808,11 +4005,11 @@ let django_1_4 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4.14"; + version = "1.4.20"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "173ci9ml2vs1z2x51wahssfn8mrmhd02varmg9kibm8z460svvc1"; + sha256 = "1cgb23afinmbvbaryvy3yj5m40h68mq6gvadcqyv3j64cja73b2q"; }; # error: invalid command 'test' @@ -4272,6 +4469,24 @@ let }; }; + wtforms = buildPythonPackage rec { + version = "2.0.2"; + name = "wtforms-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/W/WTForms/WTForms-${version}.zip"; + md5 = "613cf723ab40537705bec02733c78d95"; + }; + + propagatedBuildInputs = with self; [ ordereddict Babel ]; + + meta = { + homepage = https://github.com/wtforms/wtforms; + description = "A flexible forms validation and rendering library for Python"; + license = licenses.bsd3; + }; + }; + flexget = buildPythonPackage rec { version = "1.2.278"; name = "FlexGet-${version}"; @@ -4383,6 +4598,25 @@ let }; }); + falcon = buildPythonPackage (rec { + name = "falcon-0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/falcon/${name}.tar.gz"; + md5 = "bf9e8bdd20700f1ff7ce6397cd441fbd"; + }; + + propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ]; + + meta = { + description = "An unladen web framework for building APIs and app backends"; + + homepage = http://falconframework.org; + + license = stdenv.lib.licenses.asl20; + }; + }); + flup = buildPythonPackage (rec { name = "flup-1.0.2"; disabled = isPy3k; @@ -4905,7 +5139,6 @@ let }; }; - gyp = buildPythonPackage rec { rev = "1977"; name = "gyp-r${rev}"; @@ -5129,6 +5362,23 @@ let }; }; + hypothesis = pythonPackages.buildPythonPackage rec { + name = "hypothesis-0.7.0"; + + doCheck = false; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/h/hypothesis/hypothesis-0.7.0.tar.gz"; + md5 = "0c4112bab04b71979286387b033921b5"; + }; + + meta = with stdenv.lib; { + description = "A Python library for property based testing"; + homepage = https://github.com/DRMacIver/hypothesis; + license = licenses.mpl20; + }; + }; + httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.3"; @@ -6319,7 +6569,7 @@ let sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose pkgs.openssl ]; propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ]; @@ -6386,12 +6636,12 @@ let nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5.1"; + name = "nbxmpp-0.5.2"; src = pkgs.fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/6"; - sha256 = "0agr0ikfdmna5rjvm7lm0mx52cdwqp5b2xbx3inagp70whmdv219"; + url = "https://python-nbxmpp.gajim.org/downloads/7"; + sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn"; }; meta = { @@ -6555,6 +6805,25 @@ let doCheck = false; }); + nosexcover = buildPythonPackage (rec { + name = "nosexcover-1.0.10"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nosexcover/${name}.tar.gz"; + md5 = "12bf494a801b376debeb6a167c247391"; + }; + + propagatedBuildInputs = with self; [ coverage nose ]; + + meta = { + description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; + + homepage = http://github.com/cmheisel/nose-xcover/; + + license = stdenv.lib.licenses.bsd3; + }; + }); + nosejs = buildPythonPackage { name = "nosejs-0.9.4"; src = pkgs.fetchurl { @@ -7257,11 +7526,13 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.15.4"; + version = "0.16.2"; - src = pkgs.fetchurl { - sha256 = "1s57krfa5kpn15ma7dcivizgn987j24i6cxrnjf9hnnann0q26cd"; - url = "https://pypi.python.org/packages/source/p/pgcli/${name}.tar.gz"; + src = pkgs.fetchFromGitHub { + sha256 = "1f30f9v2iz2206aqzwc6jjadlxd7snicazrp9bcy5sizpha3r55i"; + rev = "v${version}"; + repo = "pgcli"; + owner = "amjith"; }; propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; @@ -7301,6 +7572,20 @@ let propagatedBuildInputs = with self; [ unittest2 ]; }; + + python3pika = buildPythonPackage { + name = "python3-pika-0.9.14"; + disabled = !isPy3k; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz; + md5 = "f3a3ee58afe0ae06f1fa553710e1aa28"; + }; + buildInputs = with self; [ nose mock pyyaml ]; + + propagatedBuildInputs = with self; [ unittest2 ]; + }; + + pil = buildPythonPackage rec { name = "PIL-${version}"; version = "1.1.7"; @@ -7351,7 +7636,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] - ++ optionals (isPy26 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPy26 || isPy33 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. @@ -7689,6 +7974,25 @@ let }; }); + pyasn1-modules = buildPythonPackage rec { + name = "pyasn1-modules-${version}"; + version = "0.0.5"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyasn1-modules/${name}.tar.gz"; + sha256 = "0hcr6klrzmw4d9j9s5wrhqva5014735pg4zk3rppac4fs87g0rdy"; + }; + + propagatedBuildInputs = with self; [ pyasn1 ]; + + meta = { + description = "A collection of ASN.1-based protocols modules"; + homepage = https://pypi.python.org/pypi/pyasn1-modules; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; # same as pyasn1 + }; + }; pyaudio = pkgs.stdenv.mkDerivation rec { name = "python-pyaudio-${version}"; @@ -8141,12 +8445,12 @@ let }; pygments = buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; name = "Pygments-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - sha256 = "1js5vq0xvsiykzpj5snxhdz3li9fmk8vc549slg9hcnj80frw0sy"; + sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k"; }; meta = with stdenv.lib; { @@ -8965,6 +9269,24 @@ let }); + pyaml = buildPythonPackage (rec { + name = "pyaml-15.02.1"; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyaml/${name}.tar.gz"; + md5 = "e98cf27f50b9ca291ca4937c135db1c9"; + }; + + buildInputs = with self; [ pyyaml ]; + + meta = { + description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; + homepage = https://github.com/mk-fg/pretty-yaml; + }; + }); + + pyyaml = buildPythonPackage (rec { name = "PyYAML-3.10"; @@ -9037,11 +9359,12 @@ let requests2 = buildPythonPackage rec { - name = "requests-2.4.3"; + name = "requests-${version}"; + version = "2.6.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - md5 = "02214b3a179e445545de4b7a98d3dd17"; + sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw"; }; meta = { @@ -10290,11 +10613,15 @@ let sphinxcontrib_httpdomain = buildPythonPackage (rec { - name = "sphinxcontrib-httpdomain-1.1.9"; + name = "sphinxcontrib-httpdomain-1.3.0"; + + # Check is disabled due to this issue: + # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype + doCheck = false; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-httpdomain/${name}.tar.gz"; - md5 = "0f63aea612cc9e0b55a6c39e5b0f87b7"; + md5 = "ad7ea42bd4c7c0ee57b1cb25bbf24aab"; }; propagatedBuildInputs = with self; [sphinx]; @@ -10309,6 +10636,26 @@ let }); + sphinxcontrib_plantuml = buildPythonPackage (rec { + name = "sphinxcontrib-plantuml-0.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz"; + md5 = "4a8840fe3475a19c2af3fa877ab9d296"; + }; + + propagatedBuildInputs = with self; [sphinx plantuml]; + + meta = { + description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; + + homepage = http://bitbucket.org/birkenfeld/sphinx-contrib; + + license = "BSD"; + }; + }); + + sphinx_pypi_upload = buildPythonPackage (rec { name = "Sphinx-PyPI-upload-0.2.1"; @@ -10607,6 +10954,35 @@ let }; }; + syncthing-gtk = buildPythonPackage rec { + version = "0.6.3"; + name = "syncthing-gtk-${version}"; + src = pkgs.fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-gtk"; + rev = "v${version}"; + sha256 = "1qa5bw2qizjiqvkms8i31wsjf8cw9p0ciamxgfgq6n37wcalv6ms"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.syncthing pygobject3 dateutil pkgs.gtk3 pyinotify pkgs.libnotify pkgs.psmisc ]; + + patchPhase = '' + substituteInPlace "scripts/syncthing-gtk" \ + --replace "/usr/share" "$out/share" \ + ''; + + + meta = with stdenv.lib; { + description = " GTK3 & python based GUI for Syncthing "; + maintainers = [ maintainers.DamienCassou ]; + platforms = pkgs.syncthing.meta.platforms; + homepage = "https://github.com/syncthing/syncthing-gtk"; + license = stdenv.lib.licenses.gpl2; + }; + }; + tarsnapper = buildPythonPackage rec { name = "tarsnapper-0.2.1"; disabled = isPy3k; @@ -10795,6 +11171,40 @@ let }; }; + tlslite = buildPythonPackage rec { + name = "tlslite-${version}"; + version = "0.4.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/tlslite/${name}.tar.gz"; + sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r"; + }; + + meta = { + description = "A pure Python implementation of SSL and TLS"; + homepage = https://pypi.python.org/pypi/tlslite; + license = stdenv.lib.licenses.bsd3; + }; + }; + + qrcode = buildPythonPackage rec { + name = "qrcode-${version}"; + version = "5.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/q/qrcode/${name}.tar.gz"; + sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k"; + }; + + propagatedBuildInputs = with self; [ six ]; + + meta = { + description = "Quick Response code generation for Python"; + home = "https://pypi.python.org/pypi/qrcode"; + license = stdenv.lib.licenses.bsd3; + }; + }; + tmdb3 = buildPythonPackage rec { name = "tmdb3-${version}"; version = "0.6.17"; @@ -12991,18 +13401,18 @@ let libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.9"; + version = "1.2.12"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1vbrkwvsvcfgibdw4drcypg2n6zcpi3zv23zw20nkk5fjfp26w4g"; + sha256 = "17w4mpsp4pxhbzs128ig3gxp12rr0j41mxch8i11dqjrjy7l6bs3"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; - buildPhase = "python setup.py build"; + buildPhase = "${python.interpreter} setup.py build"; - installPhase = "python setup.py install --prefix=$out"; + installPhase = "${python.interpreter} setup.py install --prefix=$out"; meta = { homepage = http://www.libvirt.org/; @@ -13143,12 +13553,12 @@ let }; }; - pythonefl_1_12 = buildPythonPackage rec { + pythonefl_1_13 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; - sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2"; + sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" @@ -13157,7 +13567,7 @@ let meta = { description = "Python bindings for EFL and Elementary."; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; @@ -13223,6 +13633,7 @@ let }; }; + moreItertools = buildPythonPackage rec { name = "more-itertools-2.2"; @@ -13232,7 +13643,7 @@ let url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; }; - + propagatedBuildInputs = with self; [ nose ]; meta = { @@ -13242,6 +13653,7 @@ let }; }; + uncertainties = buildPythonPackage rec { name = "uncertainties-2.4.6.1"; @@ -13251,7 +13663,7 @@ let }; buildInputs = with self; [ nose numpy ]; - + meta = { homepage = "http://pythonhosted.org/uncertainties/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; @@ -13260,6 +13672,23 @@ let }; + funcy = buildPythonPackage rec { + name = "funcy-1.4"; + + src = pkgs.fetchurl { + url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; + sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; + }; + + meta = with stdenv.lib; { + description = "Collection of fancy functional tools focused on practicality."; + homepage = "http://funcy.readthedocs.org/"; + license = stdenv.lib.licenses.bsd3; + + }; + }; + + # python2.7 specific packages } // optionalAttrs isPy27 ( with self; @@ -13514,7 +13943,7 @@ let license = licenses.mit; }; }; - + html2text = buildPythonPackage rec { name = "html2text-2014.12.29"; @@ -13561,20 +13990,21 @@ let }; }; - funcy = buildPythonPackage rec { - name = "funcy-1.4"; + networkx = buildPythonPackage rec { + name = "networkx-1.9.1"; src = pkgs.fetchurl { - url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; - sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; + url = "https://pypi.python.org/packages/source/n/networkx/networkx-1.9.1.tar.gz"; + sha256 = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59"; }; - meta = with stdenv.lib; { - description = "Collection of fancy functional tools focused on practicality."; - homepage = "http://funcy.readthedocs.org/"; - license = stdenv.lib.licenses.bsd3; + buildInputs = with self; [ nose decorator ]; + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks."; + license = licenses.bsd3; }; }; - }); in pythonPackages diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 5ee574bbabfe..1f324de8544e 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,5 +1,7 @@ { supportedSystems, packageSet ? (import ./all-packages.nix) }: +with import ../../lib; + rec { # Ensure that we don't build packages marked as unfree. @@ -7,7 +9,7 @@ rec { config.allowUnfree = false; }); - pkgs = allPackages { system = "x86_64-linux"; }; + pkgs = pkgsFor "x86_64-linux"; /* !!! Hack: poor man's memoisation function. Necessary to prevent @@ -33,11 +35,7 @@ rec { /* The working or failing mails for cross builds will be sent only to the following maintainers, as most package maintainers will not be interested in the result of cross building a package. */ - crossMaintainers = with pkgs.lib.maintainers; [ viric ]; - - - toJob = x: if builtins.isAttrs x then x else - { type = "job"; systems = x; }; + crossMaintainers = [ maintainers.viric ]; /* Build a package on the given set of platforms. The function `f' @@ -45,80 +43,50 @@ rec { platform as an argument . We return an attribute set containing a derivation for each supported platform, i.e. ‘{ x86_64-linux = f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */ - testOn = systems: f: pkgs.lib.genAttrs - (pkgs.lib.filter (x: pkgs.lib.elem x supportedSystems) systems) - (system: f (pkgsFor system)); + testOn = systems: f: genAttrs + (filter (x: elem x supportedSystems) systems) (system: hydraJob (f (pkgsFor system))); /* Similar to the testOn function, but with an additional 'crossSystem' parameter for allPackages, defining the target platform for cross builds. */ testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}: - if pkgs.lib.elem system systems + if elem system systems then f (allPackages { inherit system crossSystem; }) else {}; - /* Map an attribute of the form `foo = [platforms...]' to `testOn - [platforms...] (pkgs: pkgs.foo)'. */ - mapTestOn = pkgs.lib.mapAttrsRecursiveCond - (as: as.type or "" != "job") - (path: value: - let - job = toJob value; - getPkg = pkgs: pkgs.lib.getAttrFromPath path pkgs; - in testOn job.systems getPkg); + /* Given a nested set where the leaf nodes are lists of platforms, + map each leaf node to `testOn [platforms...] (pkgs: + pkgs.<attrPath>)'. */ + mapTestOn = mapAttrsRecursive + (path: systems: testOn systems (pkgs: getAttrFromPath path pkgs)); /* Similar to the testOn function, but with an additional 'crossSystem' * parameter for allPackages, defining the target platform for cross builds, * and triggering the build of the host derivation (cross built - crossDrv). */ - mapTestOnCross = crossSystem: pkgs.lib.mapAttrsRecursiveCond - (as: as.type or "" != "job") - (path: value: - let - job = toJob value; - getPkg = pkgs: pkgs.lib.addMetaAttrs { maintainers = crossMaintainers; } - (pkgs.lib.getAttrFromPath path pkgs); - in testOnCross crossSystem job.systems getPkg); - - - /* Find all packages that have a meta.platforms field listing the - supported platforms. */ - packagesWithMetaPlatform = attrSet: - let pairs = pkgs.lib.concatMap - (x: - let pair = builtins.tryEval - (let - attrVal = (builtins.getAttr x attrSet); - in - { val = processPackage attrVal; - attrVal = attrVal; - attrValIsAttrs = builtins.isAttrs attrVal; - }); - success = (builtins.tryEval pair.value.attrVal).success; - in - pkgs.lib.optional (success && pair.value.attrValIsAttrs && pair.value.val != []) - { name = x; value = pair.value.val; }) - (builtins.attrNames attrSet); - in - builtins.listToAttrs pairs; - - - # May fail as much as it wishes, we will catch the error. - processPackage = attrSet: - if attrSet.recurseForDerivations or false then - packagesWithMetaPlatform attrSet - else if attrSet.recurseForRelease or false then - packagesWithMetaPlatform attrSet - else if attrSet.meta.broken or false then - [] - else - attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []); + mapTestOnCross = crossSystem: mapAttrsRecursive + (path: systems: testOnCross crossSystem systems + (pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs))); + + + /* Recursively map a (nested) set of derivations to an isomorphic + set of meta.platforms values. */ + packagePlatforms = mapAttrs (name: value: + let res = builtins.tryEval ( + if isDerivation value then + value.meta.hydraPlatforms or (value.meta.platforms or []) + else if value.recurseForDerivations or false || value.recurseForRelease or false then + packagePlatforms value + else + []); + in if res.success then res.value else [] + ); /* Common platform groups on which to test packages. */ - inherit (pkgs.lib.platforms) unix linux darwin cygwin allBut all mesaPlatforms; + inherit (platforms) unix linux darwin cygwin allBut all mesaPlatforms; /* Platform groups for specific kinds of applications. */ x11Supported = linux; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8929da61ead3..8f2c548bebcf 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -128,8 +128,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; ntp = linux; openssh = linux; openssl = all; - pam_console = linux; - pam_login = linux; pan = gtkSupported; par2cmdline = all; pciutils = linux; @@ -155,7 +153,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; sqlite = allBut cygwin; squid = linux; ssmtp = linux; - stdenv = prio 175 all; + stdenv = all; strace = linux; su = linux; sudo = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 47026336403a..f2c3f88e6bda 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -12,7 +12,7 @@ { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" /* "x86_64-darwin" */ ] + supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: with import ./release-lib.nix { inherit supportedSystems; }; @@ -23,6 +23,7 @@ let { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; }; manual = import ../../doc; + lib.tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -30,6 +31,7 @@ let constituents = [ jobs.tarball jobs.manual + jobs.lib.tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin @@ -45,28 +47,18 @@ let ]; }; - } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { + } // (mapTestOn ((packagePlatforms pkgs) // rec { abcde = linux; - apacheHttpd = linux; aspell = all; - at = linux; atlas = linux; - autoconf = all; - automake = all; - bash = all; - bashInteractive = all; bazaar = linux; # first let sqlite3 work on darwin binutils = linux; bind = linux; bvi = all; castle_combat = linux; cdrkit = linux; - cksfv = all; classpath = linux; - coreutils = all; - cron = linux; - cvs = linux; ddrescue = linux; dhcp = linux; dico = linux; @@ -89,13 +81,11 @@ let eprover = linux; expect = linux; exult = linux; - findutils = all; flex = all; fontforge = linux; gajim = linux; gawk = all; gcc = linux; - gcc34 = linux; gcc44 = linux; gcj = linux; ghostscript = linux; @@ -111,29 +101,16 @@ let gnutls = linux; gogoclient = linux; gphoto2 = linux; - gpm = linux; gpscorrelate = linux; gqview = gtkSupported; - graphviz = all; - grub = linux; gsl = linux; guile = linux; # tests fail on Cygwin - gzip = all; - hddtemp = linux; - host = linux; html-tidy = all; - iana_etc = linux; icewm = linux; - ifplugd = linux; inkscape = linux; irssi = linux; - jfsutils = linux; jnettop = linux; - jwhois = linux; - kbd = linux; keen4 = ["i686-linux"]; - # klibc = linux; - less = all; lftp = all; libarchive = linux; libtool = all; @@ -153,11 +130,9 @@ let mercurial = unix; mercurialFull = linux; mesa = mesaPlatforms; - mingetty = linux; mk = linux; mktemp = all; mod_python = linux; - module_init_tools = linux; mupen64plus = linux; mutt = linux; mysql = linux; @@ -169,19 +144,12 @@ let nss_ldap = linux; nssmdns = linux; ocaml = linux; - pam_console = linux; - pam_login = linux; - pan = gtkSupported; - par2cmdline = all; pciutils = linux; pdf2xml = all; - perl = all; php = linux; pinentry = linux; pltScheme = linux; pmccabe = linux; - portmap = linux; - postgresql = all; ppl = all; procps = linux; pthreadmanpages = linux; @@ -192,13 +160,8 @@ let qt3 = linux; quake3demo = linux; reiserfsprogs = linux; - rlwrap = all; - rogue = all; - rpm = linux; - rsync = linux; rubber = allBut cygwin; rxvt_unicode = linux; - screen = linux ++ darwin; scrot = linux; sdparm = linux; seccure = linux; @@ -209,32 +172,16 @@ let ssmtp = linux; stdenv = all; stlport = linux; - su = linux; - sudo = linux; superTuxKart = linux; swig = linux; - sysklogd = linux; - syslinux = ["i686-linux"]; - sysvinit = linux; - sysvtools = linux; tahoelafs = linux; tangogps = linux; tcl = linux; - tcpdump = linux; teeworlds = linux; - tetex = linux; - texLive = linux; - texLiveBeamer = linux; - texLiveExtra = linux; tightvnc = linux; time = linux; tinycc = linux; uae = linux; - unrar = linux; - upstart = linux; - usbutils = linux; - utillinux = linux; - utillinuxCurses = linux; viking = linux; vice = linux; vim = linux; @@ -244,7 +191,6 @@ let vsftpd = linux; w3m = all; weechat = linux; - which = all; wicd = linux; wine = ["i686-linux"]; wirelesstools = linux; @@ -270,7 +216,7 @@ let gnome_vfs = linux; }; - haskell-ng.compiler = packagesWithMetaPlatform pkgs.haskell-ng.compiler; + haskell-ng.compiler = packagePlatforms pkgs.haskell-ng.compiler; strategoPackages = { sdf = linux; @@ -349,12 +295,6 @@ let linuxPackages_grsec_testing_server = { }; linuxPackages_grsec_testing_server_xen = { }; - } )) - - # Temporary hack: build some stuff on Darwin. - // (with import ./release-lib.nix { supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; mapTestOn { - stdenv = all; - hello = all; - }); + } )); in jobs |