diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9be21f2c2923..92676378936b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -30,3 +30,6 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). +## Reviewing contributions + +See the nixpkgs manual for more details on how to [Review contributions](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-reviewing-contributions). diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 08d6c8a8a71a..fd5441d987c5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -290,6 +290,7 @@ nckx = "Tobias Geerinckx-Rice "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; + nhooyr = "Anmol Sethi "; nico202 = "Nicolò Balzarotti "; notthemessiah = "Brian Cohen "; NikolaMandic = "Ratko Mladic "; diff --git a/lib/modules.nix b/lib/modules.nix index 6f08a49399ab..8db17c605799 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1,4 +1,5 @@ with import ./lists.nix; +with import ./strings.nix; with import ./trivial.nix; with import ./attrsets.nix; with import ./options.nix; @@ -545,6 +546,84 @@ rec { use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; + /* Return a module that causes a warning to be shown if any of the "from" + option is defined; the defined values can be used in the "mergeFn" to set + the "to" value. + This function can be used to merge multiple options into one that has a + different type. + + "mergeFn" takes the module "config" as a parameter and must return a value + of "to" option type. + + mkMergedOptionModule + [ [ "a" "b" "c" ] + [ "d" "e" "f" ] ] + [ "x" "y" "z" ] + (config: + let value = p: getAttrFromPath p config; + in + if (value [ "a" "b" "c" ]) == true then "foo" + else if (value [ "d" "e" "f" ]) == true then "bar" + else "baz") + + - options.a.b.c is a removed boolean option + - options.d.e.f is a removed boolean option + - options.x.y.z is a new str option that combines a.b.c and d.e.f + functionality + + This show a warning if any a.b.c or d.e.f is set, and set the value of + x.y.z to the result of the merge function + */ + mkMergedOptionModule = from: to: mergeFn: + { config, options, ... }: + { + options = foldl recursiveUpdate {} (map (path: setAttrByPath path (mkOption { + visible = false; + # To use the value in mergeFn without triggering errors + default = "_mkMergedOptionModule"; + })) from); + + config = { + warnings = filter (x: x != "") (map (f: + let val = getAttrFromPath f config; + opt = getAttrFromPath f options; + in + optionalString + (val != "_mkMergedOptionModule") + "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly." + ) from); + } // setAttrByPath to (mkMerge + (optional + (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) + (mergeFn config))); + }; + + /* Single "from" version of mkMergedOptionModule. + Return a module that causes a warning to be shown if the "from" option is + defined; the defined value can be used in the "mergeFn" to set the "to" + value. + This function can be used to change an option into another that has a + different type. + + "mergeFn" takes the module "config" as a parameter and must return a value of + "to" option type. + + mkChangedOptionModule [ "a" "b" "c" ] [ "x" "y" "z" ] + (config: + let value = getAttrFromPath [ "a" "b" "c" ] config; + in + if value > 100 then "high" + else "normal") + + - options.a.b.c is a removed int option + - options.x.y.z is a new str option that supersedes a.b.c + + This show a warning if a.b.c is set, and set the value of x.y.z to the + result of the change function + */ + mkChangedOptionModule = from: to: changeFn: + mkMergedOptionModule [ from ] to changeFn; + /* Like ‘mkRenamedOptionModule’, but doesn't show a warning. */ mkAliasOptionModule = from: to: doRename { inherit from to; diff --git a/lib/types.nix b/lib/types.nix index 83f624e6b448..991fa0e5c291 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -261,7 +261,7 @@ rec { # declarations from the ‘options’ attribute of containing option # declaration. optionSet = mkOptionType { - name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set"; + name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "option set"; }; # Augment the given type with an additional type check function. diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 2983c76c770b..caf72bc776a2 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -17,5 +17,6 @@ NixOS. + diff --git a/nixos/doc/manual/development/reviewing-contributions.xml b/nixos/doc/manual/development/reviewing-contributions.xml new file mode 100644 index 000000000000..d13b40baeb60 --- /dev/null +++ b/nixos/doc/manual/development/reviewing-contributions.xml @@ -0,0 +1,393 @@ + + +Reviewing contributions + + + The following section is a draft and reviewing policy is still being + discussed. + + +The nixpkgs projects receives a fairly high number of contributions via + GitHub pull-requests. Reviewing and approving these is an important task and a + way to contribute to the project. + +The high change rate of nixpkgs make any pull request that is open for + long enough subject to conflicts that will require extra work from the + submitter or the merger. Reviewing pull requests in a timely manner and being + responsive to the comments is the key to avoid these. Github provides sort + filters that can be used to see the most + recently and the least + recently updated pull-requests. + +When reviewing a pull request, please always be nice and polite. + Controversial changes can lead to controversial opinions, but it is important + to respect every community members and their work. + +GitHub provides reactions, they are a simple and quick way to provide + feedback to pull-requests or any comments. The thumb-down reaction should be + used with care and if possible accompanied with some explanations so the + submitter has directions to improve his contribution. + +Pull-requests reviews should include a list of what has been reviewed in a + comment, so other reviewers and mergers can know the state of the + review. + +All the review template samples provided in this section are generic and + meant as examples. Their usage is optional and the reviewer is free to adapt + them to his liking. + +
Package updates + +A package update is the most trivial and common type of pull-request. + These pull-requests mainly consist in updating the version part of the package + name and the source hash. +It can happen that non trivial updates include patches or more complex + changes. + +Reviewing process: + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: package (update) and any topic + label that fit the updated package. + + + Ensure that the package versioning is fitting the + guidelines. + Ensure that the commit text is fitting the + guidelines. + Ensure that the package maintainers are notified. + + mention-bot usually notify GitHub users based on the + submitted changes, but it can happen that it misses some of the + package maintainers. + + + Ensure that the meta field contains correct + information. + + License can change with version updates, so it should be + checked to be fitting upstream license. + If the package has no maintainer, a maintainer must be + set. This can be the update submitter or a community member that + accepts to take maintainership of the package. + + + Ensure that the code contains no typos. + Building the package locally. + + Pull-requests are often targeted to the master or staging + branch so building the pull-request locally as it is submitted can + trigger a large amount of source builds. + It is possible to rebase the changes on nixos-unstable or + nixpkgs-unstable for easier review by running the following commands + from a nixpkgs clone. + +$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git +$ git fetch channels nixos-unstable +$ git fetch origin pull/PRNUMBER/head +$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD + + + + This should be done only once to be able to fetch channel + branches from the nixpkgs-channels repository. + + + Fetching the nixos-unstable branch. + + + Fetching the pull-request changes, PRNUMBER + is the number at the end of the pull-request title and + BASEBRANCH the base branch of the + pull-request. + + + Rebasing the pull-request changes to the nixos-unstable + branch. + + + + + + The nox + tool can be used to review a pull-request content in a single command. + It doesn't rebase on a channel branch so it might trigger multiple + source builds. PRNUMBER should be replaced by the + number at the end of the pull-request title. + +$ nix-shell -p nox --run "nox-review -k pr PRNUMBER" + + + + + Running every binary. + + +Sample template for a package update review + +##### Reviewed points + +- [ ] package name fits guidelines +- [ ] package version fits guidelines +- [ ] package build on ARCHITECTURE +- [ ] executables tested on ARCHITECTURE +- [ ] all depending packages build + +##### Possible improvements + +##### Comments + + +
+ +
New packages + +New packages are a common type of pull-requests. These pull requests + consists in adding a new nix-expression for a package. + +Reviewing process: + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: package (new) and any topic + label that fit the new package. + + + Ensure that the package versioning is fitting the + guidelines. + Ensure that the commit name is fitting the + guidelines. + Ensure that the meta field contains correct + information. + + License must be checked to be fitting upstream + license. + Platforms should be set or the package will not get binary + substitutes. + A maintainer must be set, this can be the package + submitter or a community member that accepts to take maintainership of + the package. + + + Ensure that the code contains no typos. + Ensure the package source. + + Mirrors urls should be used when + available. + The most appropriate function should be used (e.g. + packages from GitHub should use + fetchFromGitHub). + + + Building the package locally. + Running every binary. + + +Sample template for a new package review + +##### Reviewed points + +- [ ] package path fits guidelines +- [ ] package name fits guidelines +- [ ] package version fits guidelines +- [ ] package build on ARCHITECTURE +- [ ] executables tested on ARCHITECTURE +- [ ] `meta.description` is set and fits guidelines +- [ ] `meta.license` fits upstream license +- [ ] `meta.platforms` is set +- [ ] `meta.maintainers` is set +- [ ] build time only dependencies are declared in `nativeBuildInputs` +- [ ] source is fetched using the appropriate function +- [ ] phases are respected +- [ ] patches that are remotely available are fetched with `fetchPatch` + +##### Possible improvements + +##### Comments + + +
+ +
Module updates + +Module updates are submissions changing modules in some ways. These often + contains changes to the options or introduce new options. + +Reviewing process + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: module (update) and any topic + label that fit the module. + + + Ensure that the module maintainers are notified. + + Mention-bot notify GitHub users based on the submitted + changes, but it can happen that it miss some of the package + maintainers. + + + Ensure that the module tests, if any, are + succeeding. + Ensure that the introduced options are correct. + + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and + string types are deprecated). + Description, default and example should be + provided. + + + Ensure that option changes are backward compatible. + + mkRenamedOptionModule and + mkAliasOptionModule functions provide way to make + option changes backward compatible. + + + Ensure that removed options are declared with + mkRemovedOptionModule + Ensure that changes that are not backward compatible are + mentioned in release notes. + Ensure that documentations affected by the change is + updated. + + +Sample template for a module update review + +##### Reviewed points + +- [ ] changes are backward compatible +- [ ] removed options are declared with `mkRemovedOptionModule` +- [ ] changes that are not backward compatible are documented in release notes +- [ ] module tests succeed on ARCHITECTURE +- [ ] options types are appropriate +- [ ] options description is set +- [ ] options example is provided +- [ ] documentation affected by the changes is updated + +##### Possible improvements + +##### Comments + + +
+ +
New modules + +New modules submissions introduce a new module to NixOS. + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: module (new) and any topic label + that fit the module. + + + Ensure that the module tests, if any, are + succeeding. + Ensure that the introduced options are correct. + + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and + string types are deprecated). + Description, default and example should be + provided. + + + Ensure that module meta field is + present + + Maintainers should be declared in + meta.maintainers. + Module documentation should be declared with + meta.doc. + + + Ensure that the module respect other modules + functionality. + + For example, enabling a module should not open firewall + ports by default. + + + + +Sample template for a new module review + +##### Reviewed points + +- [ ] module path fits the guidelines +- [ ] module tests succeed on ARCHITECTURE +- [ ] options have appropriate types +- [ ] options have default +- [ ] options have example +- [ ] options have descriptions +- [ ] No unneeded package is added to system.environmentPackages +- [ ] meta.maintainers is set +- [ ] module documentation is declared in meta.doc + +##### Possible improvements + +##### Comments + + +
+ +
Other submissions + +Other type of submissions requires different reviewing steps. + +If you consider having enough knowledge and experience in a topic and + would like to be a long-term reviewer for related submissions, please contact + the current reviewers for that topic. They will give you information about the + reviewing process. +The main reviewers for a topic can be hard to find as there is no list, but +checking past pull-requests to see who reviewed or git-blaming the code to see +who committed to that topic can give some hints. + +Container system, boot system and library changes are some examples of the + pull requests fitting this category. + +
+ +
Merging pull-requests + +It is possible for community members that have enough knowledge and + experience on a special topic to contribute by merging pull requests. + +TODO: add the procedure to request merging rights. + + + +In a case a contributor leaves definitively the Nix community, he should + create an issue or notify the mailing list with references of packages and + modules he maintains so the maintainership can be taken over by other + contributors. + +
+ diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index c884eaa3ec28..56d08bf1c2d6 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="sec-release-16.09"> -Release 16.09 (“Flounder”, 2016/09/??) +Release 16.09 (“Flounder”, 2016/09/30) In addition to numerous new and upgraded packages, this release has the following highlights: @@ -12,22 +12,45 @@ has the following highlights: - PXE "netboot" media has landed in . - See for documentation. + Many NixOS configurations and Nix packages now use + significantly less disk space, thanks to the extensive + work on closure size reduction. For example, the closure + size of a minimal NixOS container went down from ~424 MiB in 16.03 + to ~212 MiB in 16.09, while the closure size of Firefox went from + ~651 MiB to ~259 MiB. - Xorg-server-1.18.*. If you choose "ati_unfree" driver, - 1.17.* is still used due to ABI incompatibility. + To improve security, packages are now built + using various hardening features. See the Nixpkgs manual + for more information. + + + Support for PXE netboot. See for documentation. + + + + X.org server 1.18. If you use the + ati_unfree driver, 1.17 is still used due to an + ABI incompatibility. + + + + This release is based on Glibc 2.24, GCC 5.4.0 and systemd + 231. The default Linux kernel remains 4.4. + + The following new services were added since the last release: - - (this will get automatically generated at release time) - - + + (this will get automatically generated at release time) + When upgrading from a previous release, please be aware of the following incompatible changes: @@ -36,7 +59,8 @@ following incompatible changes: A large number of packages have been converted to use the multiple outputs feature - of Nix to greatly reduce the amount of required disk space. This may require changes + of Nix to greatly reduce the amount of required disk space, as + mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages @@ -45,6 +69,25 @@ following incompatible changes: + + Previous versions of Nixpkgs had support for all versions of the LTS + Haskell package set. That support has been dropped. The previously provided + haskell.packages.lts-x_y package sets still exist in + name to aviod breaking user code, but these package sets don't actually + contain the versions mandated by the corresponding LTS release. Instead, + our package set it loosely based on the latest available LTS release, i.e. + LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will + drop those old names entirely. The + motivation for this change has been discussed at length on the + nix-dev mailing list and in Github issue + #14897. Development strategies for Haskell hackers who want to rely + on Nix and NixOS have been described in another + nix-dev article. + + Shell aliases for systemd sub-commands were dropped: @@ -58,16 +101,20 @@ following incompatible changes: - /var/setuid-wrappers/ - is now a symlink so - it can be atomically updated - and it's not mounted as tmpfs anymore since setuid binaries are located on /run/ as tmpfs. + + /var/empty is now immutable. Activation script runs chattr +i + to forbid any modifications inside the folder. See + the pull request for what bugs this caused. - Gitlab's maintainence script gitlab-runner was removed and split up into the more clearer - gitlab-run and gitlab-rake scripts because gitlab-runner is a component of Gitlab CI. + Gitlab's maintainance script + gitlab-runner was removed and split up into the + more clearer gitlab-run and + gitlab-rake scripts, because + gitlab-runner is a component of Gitlab + CI. @@ -80,14 +127,14 @@ following incompatible changes: fonts.fontconfig.ultimate.rendering was removed because our presets were obsolete for some time. New presets are hardcoded - into freetype; one selects a preset via fonts.fontconfig.ultimate.preset. + into FreeType; you can select a preset via fonts.fontconfig.ultimate.preset. You can customize those presets via ordinary environment variables, using environment.variables. The audit service is no longer enabled by default. - Use security.audit.enable = true; to explicitly enable it. + Use security.audit.enable = true to explicitly enable it. @@ -100,10 +147,11 @@ following incompatible changes: - goPackages was replaced with separated Go applications - in appropriate nixpkgs categories. Each Go package uses its own - dependency set defined in nix. There's also a new go2nix - tool introduced to generate Go package definition from its Go source automatically. + goPackages was replaced with separated Go + applications in appropriate nixpkgs + categories. Each Go package uses its own dependency set. There's + also a new go2nix tool introduced to generate a + Go package definition from its Go source automatically. @@ -111,6 +159,12 @@ following incompatible changes: was changed to YAML. + + + PHP has been upgraded to 7.0 + + + @@ -127,10 +181,11 @@ following incompatible changes: Special filesystems, like /proc, - /run and others, now have the same mount options as - recommended by systemd. They are now unified across different places in NixOS. - Options are also updated on the system switch if possible. One benefit from - this is improved security -- most such filesystems are now mounted with + /run and others, now have the same mount options + as recommended by systemd and are unified across different places in + NixOS. Mount options are updated during nixos-rebuild + switch if possible. One benefit from this is improved + security — most such filesystems are now mounted with noexec, nodev and/or nosuid options. @@ -141,10 +196,42 @@ following incompatible changes: debugging. Containers configuration within - containers.<name>.config is now properly - typed and checked. In particular, partial configurations are merged - correctly. - (#17365) + containers.<name>.config is now + properly typed and checked. In particular, partial + configurations are merged correctly. + + + The directory container setuid wrapper programs, + /var/setuid-wrappers, is now + updated atomically to prevent failures if the switch to a new + configuration is interrupted. + + + + services.xserver.startGnuPGAgent + has been removed due to GnuPG 2.1.x bump. See + how to achieve similar behavior. You might need to + pkill gpg-agent after the upgrade + to prevent a stale agent being in the way. + + + + + + Declarative users could share the uid due to the bug in + the script handling conflict resolution. + + + + + Gummi boot has been replaced using systemd-boot. + + + + Hydra package and NixOS module were added for convenience. diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index d92deb85d2a5..57e4940378ba 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -131,13 +131,12 @@ let }; subUidRanges = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule subordinateUidRange); default = []; example = [ { startUid = 1000; count = 1; } { startUid = 100001; count = 65534; } ]; - options = [ subordinateUidRange ]; description = '' Subordinate user ids that user is allowed to use. They are set into /etc/subuid and are used @@ -146,13 +145,12 @@ let }; subGidRanges = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule subordinateGidRange); default = []; example = [ { startGid = 100; count = 1; } { startGid = 1001; count = 999; } ]; - options = [ subordinateGidRange ]; description = '' Subordinate group ids that user is allowed to use. They are set into /etc/subgid and are used @@ -310,32 +308,36 @@ let }; subordinateUidRange = { - startUid = mkOption { - type = types.int; - description = '' - Start of the range of subordinate user ids that user is - allowed to use. - ''; - }; - count = mkOption { - type = types.int; - default = 1; - description = ''Count of subordinate user ids''; + options = { + startUid = mkOption { + type = types.int; + description = '' + Start of the range of subordinate user ids that user is + allowed to use. + ''; + }; + count = mkOption { + type = types.int; + default = 1; + description = ''Count of subordinate user ids''; + }; }; }; subordinateGidRange = { - startGid = mkOption { - type = types.int; - description = '' - Start of the range of subordinate group ids that user is - allowed to use. - ''; - }; - count = mkOption { - type = types.int; - default = 1; - description = ''Count of subordinate group ids''; + options = { + startGid = mkOption { + type = types.int; + description = '' + Start of the range of subordinate group ids that user is + allowed to use. + ''; + }; + count = mkOption { + type = types.int; + default = 1; + description = ''Count of subordinate group ids''; + }; }; }; @@ -428,7 +430,7 @@ in { users.users = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule userOpts); example = { alice = { uid = 1234; @@ -444,7 +446,6 @@ in { Additional user accounts to be created automatically by the system. This can also be used to set options for root. ''; - options = [ userOpts ]; }; users.groups = mkOption { @@ -453,11 +454,10 @@ in { { students.gid = 1001; hackers = { }; }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule groupOpts); description = '' Additional groups to be created automatically by the system. ''; - options = [ groupOpts ]; }; # FIXME: obsolete - will remove. diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index a32ed100df30..45d6daf068b3 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -56,8 +56,18 @@ i18n.inputMethod = { Table (ibus-engines.table): An input method that load tables of input methods. table-others (ibus-engines.table-others): - Various table-based input methods. + Various table-based input methods. To use this, and any other table-based + input methods, it must appear in the list of engines along with + table. For example: + +ibus.engines = with pkgs.ibus-engines; [ table table-others ]; + + + +To use any input method, the package must be added in the configuration, + as shown above, and also (after running nixos-rebuild) the + input method must be added from IBus' preference dialog.
Fcitx diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index dc8d76c63e10..b5ee57d9e22e 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -105,4 +105,7 @@ with lib; cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js ''; + # Disable large stuff that's not very useful on the installation CD. + services.xserver.desktopManager.kde4.enablePIM = false; + } diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 0a452b86018a..da28c027c563 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -259,7 +259,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate # Ask the user to set a root password. -if [ -z "$noRootPasswd" ] && [ -x $mountPoint/var/setuid-wrappers/passwd ] && [ -t 0 ]; then +if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /var/setuid-wrappers/passwd ] && [ -t 0 ]; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e005c0465042..2881d843760d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -275,6 +275,7 @@ prometheus = 255; telegraf = 256; gitlab-runner = 257; + postgrey = 258; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -520,6 +521,7 @@ prometheus = 255; #telegraf = 256; # unused gitlab-runner = 257; + postgrey = 258; # 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 ad3edd6fbd5b..fd42d335bb82 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -70,6 +70,7 @@ ./programs/fish.nix ./programs/freetds.nix ./programs/info.nix + ./programs/java.nix ./programs/kbdlight.nix ./programs/light.nix ./programs/man.nix @@ -216,6 +217,7 @@ ./services/mail/opensmtpd.nix ./services/mail/postfix.nix ./services/mail/postsrsd.nix + ./services/mail/postgrey.nix ./services/mail/spamassassin.nix ./services/mail/rspamd.nix ./services/mail/rmilter.nix @@ -345,6 +347,7 @@ ./services/networking/ferm.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix + ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix ./services/networking/gale.nix diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix new file mode 100644 index 000000000000..3292aa369d28 --- /dev/null +++ b/nixos/modules/programs/java.nix @@ -0,0 +1,57 @@ +# This module provides JAVA_HOME, with a different way to install java +# system-wide. + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.java; +in + +{ + + options = { + + programs.java = { + + enable = mkEnableOption "java" // { + description = '' + Install and setup the Java development kit. + + This adds JAVA_HOME to the global environment, by sourcing the + jdk's setup-hook on shell init. It is equivalent to starting a shell + through 'nix-shell -p jdk', or roughly the following system-wide + configuration: + + + environment.variables.JAVA_HOME = ''${pkgs.jdk.home}/lib/openjdk; + environment.systemPackages = [ pkgs.jdk ]; + + + ''; + }; + + package = mkOption { + default = pkgs.jdk; + description = '' + Java package to install. Typical values are pkgs.jdk or pkgs.jre. + ''; + type = types.package; + }; + + }; + + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + environment.shellInit = '' + test -e ${cfg.package}/nix-support/setup-hook && source ${cfg.package}/nix-support/setup-hook + ''; + + }; + +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e597cec6b32d..9abe7d450c93 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -153,7 +153,7 @@ with lib; (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "") (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "") (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] - "See the 16.03 release notes for more information.") + "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") (mkRemovedOptionModule [ "services" "dockerRegistry" ] diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 45e8f64046b0..1a2b8779e007 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -129,11 +129,10 @@ in certs = mkOption { default = { }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule certOpts); description = '' Attribute set of certificates to get signed and renewed. ''; - options = [ certOpts ]; example = { "example.com" = { webroot = "/var/www/challenges/"; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 814dd21b53de..f9aa4136c8d6 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -386,8 +386,7 @@ in security.pam.services = mkOption { default = []; - type = types.loaOf types.optionSet; - options = [ pamOpts ]; + type = with types; loaOf (submodule pamOpts); description = '' This option defines the PAM services. A service typically diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 8a26aae75fe9..ef8e5e55edef 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -198,8 +198,7 @@ in { description = '' This option defines director resources in Bacula File Daemon. ''; - type = types.attrsOf types.optionSet; - options = [ directorOptions ]; + type = with types; attrsOf (submodule directorOptions); }; extraClientConfig = mkOption { @@ -253,8 +252,7 @@ in { description = '' This option defines Director resources in Bacula Storage Daemon. ''; - type = types.attrsOf types.optionSet; - options = [ directorOptions ]; + type = with types; attrsOf (submodule directorOptions); }; device = mkOption { @@ -262,8 +260,7 @@ in { description = '' This option defines Device resources in Bacula Storage Daemon. ''; - type = types.attrsOf types.optionSet; - options = [ deviceOptions ]; + type = with types; attrsOf (submodule deviceOptions); }; extraStorageConfig = mkOption { diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 3ec74458cd29..1923addeb3ac 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -81,12 +81,11 @@ in { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; }; office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule netDeviceOpts); description = '' The list of network devices that will be registered against the brscan4 sane backend. ''; - options = [ netDeviceOpts ]; }; }; @@ -113,4 +112,4 @@ in ]; }; -} \ No newline at end of file +} diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 3a85fa60fe7a..a8a214b21550 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -62,42 +62,46 @@ let }; ignoreOptions = { - level = levelOption; + options = { + level = levelOption; - regex = mkOption { - default = ""; - type = types.str; - description = '' - Regex specifying which log lines to ignore. - ''; + regex = mkOption { + default = ""; + type = types.str; + description = '' + Regex specifying which log lines to ignore. + ''; + }; }; }; ignoreCronOptions = { - user = mkOption { - default = "root"; - type = types.str; - description = '' - User that runs the cronjob. - ''; - }; + options = { + user = mkOption { + default = "root"; + type = types.str; + description = '' + User that runs the cronjob. + ''; + }; - cmdline = mkOption { - default = ""; - type = types.str; - description = '' - Command line for the cron job. Will be turned into a regex for the logcheck ignore rule. - ''; - }; + cmdline = mkOption { + default = ""; + type = types.str; + description = '' + Command line for the cron job. Will be turned into a regex for the logcheck ignore rule. + ''; + }; - timeArgs = mkOption { - default = null; - type = types.nullOr (types.str); - example = "02 06 * * *"; - description = '' - "min hr dom mon dow" crontab time args, to auto-create a cronjob too. - Leave at null to not do this and just add a logcheck ignore rule. - ''; + timeArgs = mkOption { + default = null; + type = types.nullOr (types.str); + example = "02 06 * * *"; + description = '' + "min hr dom mon dow" crontab time args, to auto-create a cronjob too. + Leave at null to not do this and just add a logcheck ignore rule. + ''; + }; }; }; @@ -180,8 +184,7 @@ in description = '' This option defines extra ignore rules. ''; - type = types.loaOf types.optionSet; - options = [ ignoreOptions ]; + type = with types; loaOf (submodule ignoreOptions); }; ignoreCron = mkOption { @@ -189,8 +192,7 @@ in description = '' This option defines extra ignore rules for cronjobs. ''; - type = types.loaOf types.optionSet; - options = [ ignoreOptions ignoreCronOptions ]; + type = with types; loaOf (submodule ignoreCronOptions); }; extraGroups = mkOption { diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix new file mode 100644 index 000000000000..0db631868cc7 --- /dev/null +++ b/nixos/modules/services/mail/postgrey.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ... }: + +with lib; let + + cfg = config.services.postgrey; + +in { + + options = { + services.postgrey = with types; { + enable = mkOption { + type = bool; + default = false; + description = "Whether to run the Postgrey daemon"; + }; + inetAddr = mkOption { + type = nullOr string; + default = null; + example = "127.0.0.1"; + description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock"; + }; + inetPort = mkOption { + type = int; + default = 10030; + description = "The tcp port to bind to"; + }; + greylistText = mkOption { + type = string; + default = "Greylisted for %%s seconds"; + description = "Response status text for greylisted messages"; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.postgrey ]; + + users = { + extraUsers = { + postgrey = { + description = "Postgrey Daemon"; + uid = config.ids.uids.postgrey; + group = "postgrey"; + }; + }; + extraGroups = { + postgrey = { + gid = config.ids.gids.postgrey; + }; + }; + }; + + systemd.services.postgrey = let + bind-flag = if isNull cfg.inetAddr then + "--unix=/var/run/postgrey.sock" + else + "--inet=${cfg.inetAddr}:${cfg.inetPort}"; + in { + description = "Postfix Greylisting Service"; + wantedBy = [ "multi-user.target" ]; + before = [ "postfix.service" ]; + preStart = '' + mkdir -p /var/postgrey + chown postgrey:postgrey /var/postgrey + chmod 0770 /var/postgrey + ''; + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"''; + Restart = "always"; + RestartSec = 5; + TimeoutSec = 10; + }; + }; + + }; + +} diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix old mode 100644 new mode 100755 index 72ec68dee6b3..fe13013286b8 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -33,7 +33,7 @@ in { nodes = mkOption { description = "Confd list of nodes to connect to."; - default = [ "http://127.0.0.1:4001" ]; + default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; }; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index bb8dc640f981..4145f8fa957a 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -5,15 +5,16 @@ with lib; let cfg = config.services.matrix-synapse; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; - mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${if r.compress then "true" else "false"}}''; - mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${if l.tls then "true" else "false"}, x_forwarded: ${if l.x_forwarded then "true" else "false"}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; + mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${fromBool r.compress}}''; + mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; + fromBool = x: if x then "true" else "false"; configFile = pkgs.writeText "homeserver.yaml" '' tls_certificate_path: "${cfg.tls_certificate_path}" ${optionalString (cfg.tls_private_key_path != null) '' tls_private_key_path: "${cfg.tls_private_key_path}" ''} tls_dh_params_path: "${cfg.tls_dh_params_path}" -no_tls: ${if cfg.no_tls then "true" else "false"} +no_tls: ${fromBool cfg.no_tls} ${optionalString (cfg.bind_port != null) '' bind_port: ${toString cfg.bind_port} ''} @@ -25,7 +26,7 @@ bind_host: "${cfg.bind_host}" ''} server_name: "${cfg.server_name}" pid_file: "/var/run/matrix-synapse.pid" -web_client: ${if cfg.web_client then "true" else "false"} +web_client: ${fromBool cfg.web_client} ${optionalString (cfg.public_baseurl != null) '' public_baseurl: "${cfg.public_baseurl}" ''} @@ -53,14 +54,14 @@ media_store_path: "/var/lib/matrix-synapse/media" uploads_path: "/var/lib/matrix-synapse/uploads" max_upload_size: "${cfg.max_upload_size}" max_image_pixels: "${cfg.max_image_pixels}" -dynamic_thumbnails: ${if cfg.dynamic_thumbnails then "true" else "false"} +dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails} url_preview_enabled: False recaptcha_private_key: "${cfg.recaptcha_private_key}" recaptcha_public_key: "${cfg.recaptcha_public_key}" -enable_registration_captcha: ${if cfg.enable_registration_captcha then "true" else "false"} +enable_registration_captcha: ${fromBool cfg.enable_registration_captcha} turn_uris: ${builtins.toJSON cfg.turn_uris} turn_shared_secret: "${cfg.turn_shared_secret}" -enable_registration: ${if cfg.enable_registration then "true" else "false"} +enable_registration: ${fromBool cfg.enable_registration} ${optionalString (cfg.registration_shared_secret != null) '' registration_shared_secret: "${cfg.registration_shared_secret}" ''} @@ -68,9 +69,15 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" turn_user_lifetime: "${cfg.turn_user_lifetime}" user_creation_max_duration: ${cfg.user_creation_max_duration} bcrypt_rounds: ${cfg.bcrypt_rounds} -allow_guest_access: {if cfg.allow_guest_access then "true" else "false"} -enable_metrics: ${if cfg.enable_metrics then "true" else "false"} -report_stats: ${if cfg.report_stats then "true" else "false"} +allow_guest_access: ${fromBool cfg.allow_guest_access} +trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers} +room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types} +${optionalString (cfg.macaroon_secret_key != null) '' + macaroon_secret_key: "${cfg.macaroon_secret_key}" +''} +expire_access_token: ${fromBool cfg.expire_access_token} +enable_metrics: ${fromBool cfg.enable_metrics} +report_stats: ${fromBool cfg.report_stats} signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key" key_refresh_interval: "${cfg.key_refresh_interval}" perspectives: @@ -469,6 +476,34 @@ in { accessible to anonymous users. ''; }; + trusted_third_party_id_servers = mkOption { + type = types.listOf types.str; + default = ["matrix.org"]; + description = '' + The list of identity servers trusted to verify third party identifiers by this server. + ''; + }; + room_invite_state_types = mkOption { + type = types.listOf types.str; + default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"]; + description = '' + A list of event types that will be included in the room_invite_state + ''; + }; + macaroon_secret_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Secret key for authentication tokens + ''; + }; + expire_access_token = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable access token expiration. + ''; + }; key_refresh_interval = mkOption { type = types.str; default = "1d"; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index c6b67e8498ca..8bcf35a8ad38 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -154,43 +154,45 @@ let }; dbOptions = { - type = mkOption { - description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb"]; - default = "rocksdb"; - }; + options = { + type = mkOption { + description = "Rippled database type."; + type = types.enum ["rocksdb" "nudb"]; + default = "rocksdb"; + }; - path = mkOption { - description = "Location to store the database."; - type = types.path; - default = cfg.databasePath; - }; + path = mkOption { + description = "Location to store the database."; + type = types.path; + default = cfg.databasePath; + }; - compression = mkOption { - description = "Whether to enable snappy compression."; - type = types.nullOr types.bool; - default = null; - }; + compression = mkOption { + description = "Whether to enable snappy compression."; + type = types.nullOr types.bool; + default = null; + }; - onlineDelete = mkOption { - description = "Enable automatic purging of older ledger information."; - type = types.addCheck (types.nullOr types.int) (v: v > 256); - default = cfg.ledgerHistory; - }; + onlineDelete = mkOption { + description = "Enable automatic purging of older ledger information."; + type = types.addCheck (types.nullOr types.int) (v: v > 256); + default = cfg.ledgerHistory; + }; - advisoryDelete = mkOption { - description = '' - If set, then require administrative RPC call "can_delete" - to enable online deletion of ledger records. - ''; - type = types.nullOr types.bool; - default = null; - }; + advisoryDelete = mkOption { + description = '' + If set, then require administrative RPC call "can_delete" + to enable online deletion of ledger records. + ''; + type = types.nullOr types.bool; + default = null; + }; - extraOpts = mkOption { - description = "Extra database options."; - type = types.lines; - default = ""; + extraOpts = mkOption { + description = "Extra database options."; + type = types.lines; + default = ""; + }; }; }; @@ -213,8 +215,7 @@ in ports = mkOption { description = "Ports exposed by rippled"; - type = types.attrsOf types.optionSet; - options = [portOptions]; + type = with types; attrsOf (submodule portOptions); default = { rpc = { port = 5005; @@ -238,8 +239,7 @@ in nodeDb = mkOption { description = "Rippled main database options."; - type = types.nullOr types.optionSet; - options = dbOptions; + type = with types; nullOr (submodule dbOptions); default = { type = "rocksdb"; extraOpts = '' @@ -254,15 +254,13 @@ in tempDb = mkOption { description = "Rippled temporary database options."; - type = types.nullOr types.optionSet; - options = dbOptions; + type = with types; nullOr (submodule dbOptions); default = null; }; importDb = mkOption { description = "Settings for performing a one-time import."; - type = types.nullOr types.optionSet; - options = dbOptions; + type = with types; nullOr (submodule dbOptions); default = null; }; diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 1017005226b2..f2834f288f90 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -197,8 +197,7 @@ in devices = mkOption { default = []; example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ]; - type = types.listOf types.optionSet; - options = [ smartdOpts ]; + type = with types; listOf (submodule smartdOpts); description = "List of devices to monitor."; }; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index febf0c95f5bd..c4c4ed227b35 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -169,8 +169,7 @@ in monitoring directly. These are usually attached to serial ports, but USB devices are also supported. ''; - type = types.attrsOf types.optionSet; - options = [ upsOptions ]; + type = with types; attrsOf (submodule upsOptions); }; }; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index a186982ec9c0..7de85b59e2af 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -56,6 +56,7 @@ let serviceConfig = { ExecStart = "${samba}/sbin/${appName} ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Type = "notify"; }; restartTriggers = [ configFile ]; @@ -167,12 +168,12 @@ in type = types.attrsOf (types.attrsOf types.unspecified); example = { public = - { path = "/srv/public"; - "read only" = true; - browseable = "yes"; - "guest ok" = "yes"; - comment = "Public samba share."; - }; + { path = "/srv/public"; + "read only" = true; + browseable = "yes"; + "guest ok" = "yes"; + comment = "Public samba share."; + }; }; }; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index d4b6c05e9432..f1846b963252 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -8,148 +8,150 @@ in options.services.tahoe = { introducers = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule { + options = { + nickname = mkOption { + type = types.str; + description = '' + The nickname of this Tahoe introducer. + ''; + }; + tub.port = mkOption { + default = 3458; + type = types.int; + description = '' + The port on which the introducer will listen. + ''; + }; + tub.location = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The external location that the introducer should listen on. + + If specified, the port should be included. + ''; + }; + package = mkOption { + default = pkgs.tahoelafs; + defaultText = "pkgs.tahoelafs"; + type = types.package; + example = literalExample "pkgs.tahoelafs"; + description = '' + The package to use for the Tahoe LAFS daemon. + ''; + }; + }; + }); description = '' The Tahoe introducers. ''; - options = { - nickname = mkOption { - type = types.str; - description = '' - The nickname of this Tahoe introducer. - ''; - }; - tub.port = mkOption { - default = 3458; - type = types.int; - description = '' - The port on which the introducer will listen. - ''; - }; - tub.location = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The external location that the introducer should listen on. - - If specified, the port should be included. - ''; - }; - package = mkOption { - default = pkgs.tahoelafs; - defaultText = "pkgs.tahoelafs"; - type = types.package; - example = literalExample "pkgs.tahoelafs"; - description = '' - The package to use for the Tahoe LAFS daemon. - ''; - }; - }; }; nodes = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule { + options = { + nickname = mkOption { + type = types.str; + description = '' + The nickname of this Tahoe node. + ''; + }; + tub.port = mkOption { + default = 3457; + type = types.int; + description = '' + The port on which the tub will listen. + + This is the correct setting to tweak if you want Tahoe's storage + system to listen on a different port. + ''; + }; + tub.location = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The external location that the node should listen on. + + This is the setting to tweak if there are multiple interfaces + and you want to alter which interface Tahoe is advertising. + + If specified, the port should be included. + ''; + }; + web.port = mkOption { + default = 3456; + type = types.int; + description = '' + The port on which the Web server will listen. + + This is the correct setting to tweak if you want Tahoe's WUI to + listen on a different port. + ''; + }; + client.introducer = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The furl for a Tahoe introducer node. + + Like all furls, keep this safe and don't share it. + ''; + }; + client.helper = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The furl for a Tahoe helper node. + + Like all furls, keep this safe and don't share it. + ''; + }; + client.shares.needed = mkOption { + default = 3; + type = types.int; + description = '' + The number of shares required to reconstitute a file. + ''; + }; + client.shares.happy = mkOption { + default = 7; + type = types.int; + description = '' + The number of distinct storage nodes required to store + a file. + ''; + }; + client.shares.total = mkOption { + default = 10; + type = types.int; + description = '' + The number of shares required to store a file. + ''; + }; + storage.enable = mkEnableOption "storage service"; + storage.reservedSpace = mkOption { + default = "1G"; + type = types.str; + description = '' + The amount of filesystem space to not use for storage. + ''; + }; + helper.enable = mkEnableOption "helper service"; + package = mkOption { + default = pkgs.tahoelafs; + defaultText = "pkgs.tahoelafs"; + type = types.package; + example = literalExample "pkgs.tahoelafs"; + description = '' + The package to use for the Tahoe LAFS daemon. + ''; + }; + }; + }); description = '' The Tahoe nodes. ''; - options = { - nickname = mkOption { - type = types.str; - description = '' - The nickname of this Tahoe node. - ''; - }; - tub.port = mkOption { - default = 3457; - type = types.int; - description = '' - The port on which the tub will listen. - - This is the correct setting to tweak if you want Tahoe's storage - system to listen on a different port. - ''; - }; - tub.location = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The external location that the node should listen on. - - This is the setting to tweak if there are multiple interfaces - and you want to alter which interface Tahoe is advertising. - - If specified, the port should be included. - ''; - }; - web.port = mkOption { - default = 3456; - type = types.int; - description = '' - The port on which the Web server will listen. - - This is the correct setting to tweak if you want Tahoe's WUI to - listen on a different port. - ''; - }; - client.introducer = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The furl for a Tahoe introducer node. - - Like all furls, keep this safe and don't share it. - ''; - }; - client.helper = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The furl for a Tahoe helper node. - - Like all furls, keep this safe and don't share it. - ''; - }; - client.shares.needed = mkOption { - default = 3; - type = types.int; - description = '' - The number of shares required to reconstitute a file. - ''; - }; - client.shares.happy = mkOption { - default = 7; - type = types.int; - description = '' - The number of distinct storage nodes required to store - a file. - ''; - }; - client.shares.total = mkOption { - default = 10; - type = types.int; - description = '' - The number of shares required to store a file. - ''; - }; - storage.enable = mkEnableOption "storage service"; - storage.reservedSpace = mkOption { - default = "1G"; - type = types.str; - description = '' - The amount of filesystem space to not use for storage. - ''; - }; - helper.enable = mkEnableOption "helper service"; - package = mkOption { - default = pkgs.tahoelafs; - defaultText = "pkgs.tahoelafs"; - type = types.package; - example = literalExample "pkgs.tahoelafs"; - description = '' - The package to use for the Tahoe LAFS daemon. - ''; - }; - }; }; }; config = mkMerge [ diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 005c57dce7c7..e74d68cad902 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -7,7 +7,7 @@ let stateDir = "/var/spool/ddclient"; ddclientUser = "ddclient"; - ddclientFlags = "-foreground -verbose -noquiet -file /etc/ddclient.conf"; + ddclientFlags = "-foreground -verbose -noquiet -file ${config.services.ddclient.configFile}"; ddclientPIDFile = "${stateDir}/ddclient.pid"; in @@ -52,6 +52,17 @@ in ''; }; + configFile = mkOption { + default = "/etc/ddclient.conf"; + type = path; + description = '' + Path to configuration file. + When set to the default '/etc/ddclient.conf' it will be populated with the various other options in this module. When it is changed (for example: '/root/nixos/secrets/ddclient.conf') the file read directly to configure ddclient. This is a source of impurity. + The purpose of this is to avoid placing secrets into the store. + ''; + example = "/root/nixos/secrets/ddclient.conf"; + }; + protocol = mkOption { default = "dyndns2"; type = str; @@ -88,7 +99,7 @@ in 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. + Method to determine the IP address to send to the dynamic DNS provider. ''; }; }; @@ -109,9 +120,11 @@ in }; environment.etc."ddclient.conf" = { + enable = config.services.ddclient.configFile == /etc/ddclient.conf; uid = config.ids.uids.ddclient; mode = "0600"; text = '' + # This file can be used as a template for configFile or is automatically generated by Nix options. daemon=600 cache=${stateDir}/ddclient.cache pid=${ddclientPIDFile} diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix new file mode 100644 index 000000000000..28b6c4f657dd --- /dev/null +++ b/nixos/modules/services/networking/flannel.nix @@ -0,0 +1,153 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.flannel; + + networkConfig = filterAttrs (n: v: v != null) { + Network = cfg.network; + SubnetLen = cfg.subnetLen; + SubnetMin = cfg.subnetMin; + SubnetMax = cfg.subnetMax; + Backend = cfg.backend; + }; +in { + options.services.flannel = { + enable = mkEnableOption "flannel"; + + package = mkOption { + description = "Package to use for flannel"; + type = types.package; + default = pkgs.flannel.bin; + }; + + publicIp = mkOption { + description = '' + IP accessible by other nodes for inter-host communication. + Defaults to the IP of the interface being used for communication. + ''; + type = types.nullOr types.str; + default = null; + }; + + iface = mkOption { + description = '' + Interface to use (IP or name) for inter-host communication. + Defaults to the interface for the default route on the machine. + ''; + type = types.nullOr types.str; + default = null; + }; + + etcd = { + endpoints = mkOption { + description = "Etcd endpoints"; + type = types.listOf types.str; + default = ["http://127.0.0.1:2379"]; + }; + + prefix = mkOption { + description = "Etcd key prefix"; + type = types.str; + default = "/coreos.com/network"; + }; + + caFile = mkOption { + description = "Etcd certificate authority file"; + type = types.nullOr types.path; + default = null; + }; + + certFile = mkOption { + description = "Etcd cert file"; + type = types.nullOr types.path; + default = null; + }; + + keyFile = mkOption { + description = "Etcd key file"; + type = types.nullOr types.path; + default = null; + }; + }; + + network = mkOption { + description = " IPv4 network in CIDR format to use for the entire flannel network."; + type = types.str; + }; + + subnetLen = mkOption { + description = '' + The size of the subnet allocated to each host. Defaults to 24 (i.e. /24) + unless the Network was configured to be smaller than a /24 in which case + it is one less than the network. + ''; + type = types.int; + default = 24; + }; + + subnetMin = mkOption { + description = '' + The beginning of IP range which the subnet allocation should start with. + Defaults to the first subnet of Network. + ''; + type = types.nullOr types.str; + default = null; + }; + + subnetMax = mkOption { + description = '' + The end of IP range which the subnet allocation should start with. + Defaults to the last subnet of Network. + ''; + type = types.nullOr types.str; + default = null; + }; + + backend = mkOption { + description = "Type of backend to use and specific configurations for that backend."; + type = types.attrs; + default = { + Type = "vxlan"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.flannel = { + description = "Flannel Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + FLANNELD_PUBLIC_IP = cfg.publicIp; + FLANNELD_ETCD_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; + FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; + FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; + FLANNELD_IFACE = cfg.iface; + ETCDCTL_CERT_FILE = cfg.etcd.certFile; + ETCDCTL_KEY_FILE = cfg.etcd.keyFile; + ETCDCTL_CA_FILE = cfg.etcd.caFile; + ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints; + }; + preStart = '' + echo "setting network configuration" + until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + do + echo "setting network configuration, retry" + sleep 1 + done + ''; + postStart = '' + while [ ! -f /run/flannel/subnet.env ] + do + sleep 1 + done + ''; + serviceConfig.ExecStart = "${cfg.package}/bin/flannel"; + }; + + services.etcd.enable = mkDefault cfg.etcd.endpoints == ["http://127.0.0.1:2379"]; + }; +} diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 0cbf57314c4b..926857a0ff4e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -187,44 +187,43 @@ in outTunnels = mkOption { default = {}; - type = with types; loaOf optionSet; + type = with types; loaOf (submodule ( + { name, config, ... }: { + options = commonTunOpts name; + config = { + name = mkDefault name; + }; + } + )); description = '' Connect to someone as a client and establish a local accept endpoint ''; - options = [ ({ name, config, ... }: { - options = commonTunOpts name; - config = { - name = mkDefault name; - }; - }) ]; }; inTunnels = mkOption { default = {}; - type = with types; loaOf optionSet; + type = with types; loaOf (submodule ( + { name, config, ... }: { + options = { + inPort = mkOption { + type = types.int; + default = 0; + description = "Service port. Default to the tunnel's listen port."; + }; + accessList = mkOption { + type = with types; listOf str; + default = []; + description = "I2P nodes that are allowed to connect to this service."; + }; + } // commonTunOpts name; + config = { + name = mkDefault name; + }; + } + )); description = '' Serve something on I2P network at port and delegate requests to address inPort. ''; - options = [ ({ name, config, ... }: { - - options = { - inPort = mkOption { - type = types.int; - default = 0; - description = "Service port. Default to the tunnel's listen port."; - }; - accessList = mkOption { - type = with types; listOf str; - default = []; - description = "I2P nodes that are allowed to connect to this service."; - }; - } // commonTunOpts name; - - config = { - name = mkDefault name; - }; - - }) ]; }; }; }; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 9d163e60d5ea..a0cfc8f8fb94 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -122,23 +122,23 @@ in }; networking.nat.forwardPorts = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { + sourcePort = mkOption { + type = types.int; + example = 8080; + description = "Source port of the external interface"; + }; + + destination = mkOption { + type = types.str; + example = "10.0.0.1:80"; + description = "Forward tcp connection to destination ip:port"; + }; + }; + }); default = []; example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ]; - options = { - sourcePort = mkOption { - type = types.int; - example = 8080; - description = "Source port of the external interface"; - }; - - destination = mkOption { - type = types.str; - example = "10.0.0.1:80"; - description = "Forward tcp connection to destination ip:port"; - }; - }; - description = '' List of forwarded ports from the external interface to diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 82173a841a3f..8ee86ea863e3 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -116,52 +116,54 @@ in attribute name. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + config = mkOption { + type = types.lines; + description = '' + Configuration of this OpenVPN instance. See + openvpn8 + for details. + ''; + }; + + up = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed when the instance is starting. + ''; + }; + + down = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed when the instance is shutting down. + ''; + }; + + autoStart = mkOption { + default = true; + type = types.bool; + description = "Whether this OpenVPN instance should be started automatically."; + }; + + updateResolvConf = mkOption { + default = false; + type = types.bool; + description = '' + Use the script from the update-resolv-conf package to automatically + update resolv.conf with the DNS information provided by openvpn. The + script will be run after the "up" commands and before the "down" commands. + ''; + }; - config = mkOption { - type = types.lines; - description = '' - Configuration of this OpenVPN instance. See - openvpn8 - for details. - ''; }; - up = mkOption { - default = ""; - type = types.lines; - description = '' - Shell commands executed when the instance is starting. - ''; - }; - - down = mkOption { - default = ""; - type = types.lines; - description = '' - Shell commands executed when the instance is shutting down. - ''; - }; - - autoStart = mkOption { - default = true; - type = types.bool; - description = "Whether this OpenVPN instance should be started automatically."; - }; - - updateResolvConf = mkOption { - default = false; - type = types.bool; - description = '' - Use the script from the update-resolv-conf package to automatically - update resolv.conf with the DNS information provided by openvpn. The - script will be run after the "up" commands and before the "down" commands. - ''; - }; - - }; + }); }; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index 91ad63b88139..ba05e15389f6 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -35,7 +35,6 @@ in { Restart="on-failure"; RestartSec="1"; StartLimitInterval="0"; - PrivateTmp=true; PrivateDevices=true; CapabilityBoundingSet="CAP_CHOWN CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT"; NoNewPrivileges=true; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index f82f8bfddbb7..247c4f1efb07 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -164,7 +164,7 @@ in description = "Define the virtual hosts"; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule vHostOpts); example = { myhost = { @@ -180,7 +180,6 @@ in }; }; - options = [ vHostOpts ]; }; ssl = mkOption { diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 1d15a1419722..46ccf4ae62d5 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -129,7 +129,24 @@ in }; listenAddresses = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { + addr = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Host, IPv4 or IPv6 address to listen to. + ''; + }; + port = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Port to listen to. + ''; + }; + }; + }); default = []; example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ]; description = '' @@ -140,22 +157,6 @@ in NOTE: setting this option won't automatically enable given ports in firewall configuration. ''; - options = { - addr = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Host, IPv4 or IPv6 address to listen to. - ''; - }; - port = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - Port to listen to. - ''; - }; - }; }; passwordAuthentication = mkOption { diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 16c4ee7e33bb..e433ec7c5b9b 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -34,7 +34,7 @@ let ''; in { description = "Supplicant ${iface}${optionalString (iface=="WLAN"||iface=="LAN") " %I"}"; - wantedBy = [ "network.target" ]; + wantedBy = [ "network.target" ] ++ deps; bindsTo = deps; after = deps; before = [ "network.target" ]; @@ -75,7 +75,107 @@ in options = { networking.supplicant = mkOption { - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { + options = { + + configFile = { + + path = mkOption { + type = types.path; + example = literalExample "/etc/wpa_supplicant.conf"; + description = '' + External wpa_supplicant.conf configuration file. + The configuration options defined declaratively within networking.supplicant have + precedence over options defined in configFile. + ''; + }; + + writable = mkOption { + type = types.bool; + default = false; + description = '' + Whether the configuration file at configFile.path should be written to by + wpa_supplicant. + ''; + }; + + }; + + extraConf = mkOption { + type = types.lines; + default = ""; + example = '' + ap_scan=1 + device_name=My-NixOS-Device + device_type=1-0050F204-1 + driver_param=use_p2p_group_interface=1 + disable_scan_offload=1 + p2p_listen_reg_class=81 + p2p_listen_channel=1 + p2p_oper_reg_class=81 + p2p_oper_channel=1 + manufacturer=NixOS + model_name=NixOS_Unstable + model_number=2015 + ''; + description = '' + Configuration options for wpa_supplicant.conf. + Options defined here have precedence over options in configFile. + NOTE: Do not write sensitive data into extraConf as it will + be world-readable in the nix-store. For sensitive information + use the configFile instead. + ''; + }; + + extraCmdArgs = mkOption { + type = types.str; + default = ""; + example = "-e/var/run/wpa_supplicant/entropy.bin"; + description = + "Command line arguments to add when executing wpa_supplicant."; + }; + + driver = mkOption { + type = types.nullOr types.str; + default = "nl80211,wext"; + description = "Force a specific wpa_supplicant driver."; + }; + + bridge = mkOption { + type = types.str; + default = ""; + description = "Name of the bridge interface that wpa_supplicant should listen at."; + }; + + userControlled = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. + This is useful for laptop users that switch networks a lot and don't want + to depend on a large package such as NetworkManager just to pick nearby + access points. + ''; + }; + + socketDir = mkOption { + type = types.str; + default = "/var/run/wpa_supplicant"; + description = "Directory of sockets for controlling wpa_supplicant."; + }; + + group = mkOption { + type = types.str; + default = "wheel"; + example = "network"; + description = "Members of this group can control wpa_supplicant."; + }; + + }; + }; + }); default = { }; @@ -109,107 +209,6 @@ in service that can be accessed through D-Bus. ''; - options = { - - configFile = { - - path = mkOption { - type = types.path; - example = literalExample "/etc/wpa_supplicant.conf"; - description = '' - External wpa_supplicant.conf configuration file. - The configuration options defined declaratively within networking.supplicant have - precedence over options defined in configFile. - ''; - }; - - writable = mkOption { - type = types.bool; - default = false; - description = '' - Whether the configuration file at configFile.path should be written to by - wpa_supplicant. - ''; - }; - - }; - - extraConf = mkOption { - type = types.lines; - default = ""; - example = '' - ap_scan=1 - device_name=My-NixOS-Device - device_type=1-0050F204-1 - driver_param=use_p2p_group_interface=1 - disable_scan_offload=1 - p2p_listen_reg_class=81 - p2p_listen_channel=1 - p2p_oper_reg_class=81 - p2p_oper_channel=1 - manufacturer=NixOS - model_name=NixOS_Unstable - model_number=2015 - ''; - description = '' - Configuration options for wpa_supplicant.conf. - Options defined here have precedence over options in configFile. - NOTE: Do not write sensitive data into extraConf as it will - be world-readable in the nix-store. For sensitive information - use the configFile instead. - ''; - }; - - extraCmdArgs = mkOption { - type = types.str; - default = ""; - example = "-e/var/run/wpa_supplicant/entropy.bin"; - description = - "Command line arguments to add when executing wpa_supplicant."; - }; - - driver = mkOption { - type = types.nullOr types.str; - default = "nl80211,wext"; - description = "Force a specific wpa_supplicant driver."; - }; - - bridge = mkOption { - type = types.str; - default = ""; - description = "Name of the bridge interface that wpa_supplicant should listen at."; - }; - - userControlled = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. - This is useful for laptop users that switch networks a lot and don't want - to depend on a large package such as NetworkManager just to pick nearby - access points. - ''; - }; - - socketDir = mkOption { - type = types.str; - default = "/var/run/wpa_supplicant"; - description = "Directory of sockets for controlling wpa_supplicant."; - }; - - group = mkOption { - type = types.str; - default = "wheel"; - example = "network"; - description = "Members of this group can control wpa_supplicant."; - }; - - }; - - }; - }; }; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 8da0f817ae2a..b751e9dad069 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -18,94 +18,96 @@ in networks = mkOption { default = { }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule { + options = { + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra lines to add to the tinc service configuration file. + ''; + }; + + name = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The name of the node which is used as an identifier when communicating + with the remote nodes in the mesh. If null then the hostname of the system + is used. + ''; + }; + + ed25519PrivateKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path of the private ed25519 keyfile. + ''; + }; + + debugLevel = mkOption { + default = 0; + type = types.addCheck types.int (l: l >= 0 && l <= 5); + description = '' + The amount of debugging information to add to the log. 0 means little + logging while 5 is the most logging. man tincd for + more details. + ''; + }; + + hosts = mkOption { + default = { }; + type = types.loaOf types.lines; + description = '' + The name of the host in the network as well as the configuration for that host. + This name should only contain alphanumerics and underscores. + ''; + }; + + interfaceType = mkOption { + default = "tun"; + type = types.addCheck types.str (n: n == "tun" || n == "tap"); + description = '' + The type of virtual interface used for the network connection + ''; + }; + + listenAddress = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The ip adress to bind to. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.tinc_pre; + defaultText = "pkgs.tinc_pre"; + description = '' + The package to use for the tinc daemon's binary. + ''; + }; + + chroot = mkOption { + default = true; + type = types.bool; + description = '' + Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security. + The chroot is performed after all the initialization is done, after writing pid files and opening network sockets. + + Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment. + ''; + }; + }; + }); + description = '' Defines the tinc networks which will be started. Each network invokes a different daemon. ''; - options = { - - extraConfig = mkOption { - default = ""; - type = types.lines; - description = '' - Extra lines to add to the tinc service configuration file. - ''; - }; - - name = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The name of the node which is used as an identifier when communicating - with the remote nodes in the mesh. If null then the hostname of the system - is used. - ''; - }; - - ed25519PrivateKeyFile = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - Path of the private ed25519 keyfile. - ''; - }; - - debugLevel = mkOption { - default = 0; - type = types.addCheck types.int (l: l >= 0 && l <= 5); - description = '' - The amount of debugging information to add to the log. 0 means little - logging while 5 is the most logging. man tincd for - more details. - ''; - }; - - hosts = mkOption { - default = { }; - type = types.loaOf types.lines; - description = '' - The name of the host in the network as well as the configuration for that host. - This name should only contain alphanumerics and underscores. - ''; - }; - - interfaceType = mkOption { - default = "tun"; - type = types.addCheck types.str (n: n == "tun" || n == "tap"); - description = '' - The type of virtual interface used for the network connection - ''; - }; - - listenAddress = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The ip adress to bind to. - ''; - }; - - package = mkOption { - type = types.package; - default = pkgs.tinc_pre; - defaultText = "pkgs.tinc_pre"; - description = '' - The package to use for the tinc daemon's binary. - ''; - }; - - chroot = mkOption { - default = true; - type = types.bool; - description = '' - Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security. - The chroot is performed after all the initialization is done, after writing pid files and opening network sockets. - - Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment. - ''; - }; - }; }; }; diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 08680b517808..b398f346b942 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -65,71 +65,73 @@ in A list of services provided by xinetd. ''; - type = types.listOf types.optionSet; + type = with types; listOf (submodule ({ - options = { + options = { + + name = mkOption { + type = types.string; + example = "login"; + description = "Name of the service."; + }; + + protocol = mkOption { + type = types.string; + default = "tcp"; + description = + "Protocol of the service. Usually tcp or udp."; + }; + + port = mkOption { + type = types.int; + default = 0; + example = 123; + description = "Port number of the service."; + }; + + user = mkOption { + type = types.string; + default = "nobody"; + description = "User account for the service"; + }; + + server = mkOption { + type = types.string; + example = "/foo/bin/ftpd"; + description = "Path of the program that implements the service."; + }; + + serverArgs = mkOption { + type = types.string; + default = ""; + description = "Command-line arguments for the server program."; + }; + + flags = mkOption { + type = types.string; + default = ""; + description = ""; + }; + + unlisted = mkOption { + type = types.bool; + default = false; + description = '' + Whether this server is listed in + /etc/services. If so, the port + number can be omitted. + ''; + }; + + extraConfig = mkOption { + type = types.string; + default = ""; + description = "Extra configuration-lines added to the section of the service."; + }; - name = mkOption { - type = types.string; - example = "login"; - description = "Name of the service."; }; - protocol = mkOption { - type = types.string; - default = "tcp"; - description = - "Protocol of the service. Usually tcp or udp."; - }; - - port = mkOption { - type = types.int; - default = 0; - example = 123; - description = "Port number of the service."; - }; - - user = mkOption { - type = types.string; - default = "nobody"; - description = "User account for the service"; - }; - - server = mkOption { - type = types.string; - example = "/foo/bin/ftpd"; - description = "Path of the program that implements the service."; - }; - - serverArgs = mkOption { - type = types.string; - default = ""; - description = "Command-line arguments for the server program."; - }; - - flags = mkOption { - type = types.string; - default = ""; - description = ""; - }; - - unlisted = mkOption { - type = types.bool; - default = false; - description = '' - Whether this server is listed in - /etc/services. If so, the port - number can be omitted. - ''; - }; - - extraConfig = mkOption { - type = types.string; - default = ""; - description = "Extra configuration-lines added to the section of the service."; - }; - - }; + })); }; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 0f20725a9e4a..a7cf74c15cc5 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -8,7 +8,7 @@ let cfg = config.services.dbus; - homeDir = "/var/run/dbus"; + homeDir = "/run/dbus"; systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [ "${d}/share/dbus-1/system-services" @@ -20,6 +20,8 @@ let "${d}/etc/dbus-1/session.d" ])); + daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation"; + configDir = pkgs.runCommand "dbus-conf" { preferLocalBuild = true; allowSubstitutes = false; @@ -27,6 +29,14 @@ let '' mkdir -p $out + cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out + + # avoid circular includes + sed -ri 's@(/etc/dbus-1/(system|session)\.conf)@@g' $out/{system,session}.conf + + # include by full path + sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf + sed '${./dbus-system-local.conf.in}' \ -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ -e 's,@extra@,${systemExtraxml},' \ @@ -72,11 +82,16 @@ in ''; }; + socketActivated = mkOption { + type = types.bool; + default = false; + description = '' + Make the user instance socket activated. + ''; + }; }; - }; - ###### implementation config = mkIf cfg.enable { @@ -114,13 +129,29 @@ in config.system.path ]; - # Don't restart dbus-daemon. Bad things tend to happen if we do. - systemd.services.dbus.reloadIfChanged = true; + systemd.services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ configDir ]; + serviceConfig.ExecStart = [ + "" + "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf ${daemonArgs}" + ]; + }; - systemd.services.dbus.restartTriggers = [ configDir ]; + systemd.user = { + services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ configDir ]; + serviceConfig.ExecStart = [ + "" + "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/session.conf ${daemonArgs}" + ]; + }; + sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; + }; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; - }; - } diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 29cfbb8e9a08..a3a23b222fbb 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -42,7 +42,7 @@ in { default = ""; description = '' Extra configuration that should be put in the global section of - the PHP FPM configuration file. Do not specify the options + the PHP-FPM configuration file. Do not specify the options pid, error_log or daemonize here, since they are generated by NixOS. @@ -54,7 +54,7 @@ in { default = pkgs.php; defaultText = "pkgs.php"; description = '' - The PHP package to use for running the FPM service. + The PHP package to use for running the PHP-FPM service. ''; }; @@ -86,7 +86,7 @@ in { } ''; description = '' - A mapping between PHP FPM pool names and their configurations. + A mapping between PHP-FPM pool names and their configurations. See the documentation on php-fpm.conf for details on configuration directives. If no pools are defined, the phpfpm service is disabled. @@ -98,8 +98,24 @@ in { inherit lib; })); default = {}; + example = literalExample '' + { + mypool = { + listen = "/path/to/unix/socket"; + extraConfig = ''' + user = nobody + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + '''; + } + }''; description = '' - If no pools are defined, the phpfpm service is disabled. + PHP-FPM pools. If no pools or poolConfigs are defined, the PHP-FPM + service is disabled. ''; }; }; diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix index 6dab467b35ef..064ead5ce4bb 100644 --- a/nixos/modules/services/web-servers/winstone.nix +++ b/nixos/modules/services/web-servers/winstone.nix @@ -113,8 +113,7 @@ in { options = { services.winstone = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ winstoneOpts ]; + type = with types; attrsOf (submodule winstoneOpts); description = '' Defines independent Winstone services, each serving one WAR-file. ''; diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index ef3cffd582ee..8a453e015577 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -74,7 +74,7 @@ in services.zope2.instances = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule zope2Opts); example = literalExample '' { plone01 = { @@ -96,7 +96,6 @@ in } ''; description = "zope2 instances to be created automaticaly by the system."; - options = [ zope2Opts ]; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 1927341e45d4..3aa4821a0521 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -14,7 +14,7 @@ let # files), segfault sometimes and consume significant resources. # They can be re-enabled in the KDE System Settings under "Desktop # Search". - nepomukConfig = pkgs.writeTextFile + disableNepomuk = pkgs.writeTextFile { name = "nepomuk-config"; destination = "/share/config/nepomukserverrc"; text = @@ -70,6 +70,18 @@ in type = types.package; description = "Custom kde-workspace, used for NixOS rebranding."; }; + + enablePIM = mkOption { + type = types.bool; + default = true; + description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies."; + }; + + enableNepomuk = mkOption { + type = types.bool; + default = false; + description = "Whether to enable Nepomuk (deprecated)."; + }; }; }; @@ -138,7 +150,6 @@ in pkgs.kde4.kde_wallpapers # contains kdm's default background pkgs.kde4.oxygen_icons - pkgs.virtuoso # to enable Nepomuk to find Virtuoso # Starts KDE's Polkit authentication agent. pkgs.kde4.polkit_kde_agent @@ -149,20 +160,26 @@ in xorg.xmessage # so that startkde can show error messages xorg.xset # used by startkde, non-essential xorg.xauth # used by kdesu - pkgs.shared_desktop_ontologies # used by nepomuk - pkgs.strigi # used by nepomuk + ] + ++ optionals cfg.enablePIM + [ pkgs.kde4.kdepim_runtime pkgs.kde4.akonadi pkgs.mysql # used by akonadi - pkgs.kde4.kdepim_runtime ] - ++ lib.optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled - ++ lib.optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil - ++ lib.optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm - ++ [ nepomukConfig ] ++ phononBackendPackages; + ++ (if cfg.enableNepomuk then + [ pkgs.shared_desktop_ontologies # used by nepomuk + pkgs.strigi # used by nepomuk + pkgs.virtuoso # to enable Nepomuk to find Virtuoso + ] else + [ disableNepomuk ]) + ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled + ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil + ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm + ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; - environment.profileRelativeEnvVars = mkIf (lib.elem "gstreamer" cfg.phononBackends) { + environment.profileRelativeEnvVars = mkIf (elem "gstreamer" cfg.phononBackends) { GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; }; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 75d80609f73f..ce82af4ca68c 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -134,13 +134,8 @@ let (*) echo "$0: Desktop manager '$desktopManager' not found.";; esac - # FIXME: gdbus should not be in glib.dev! - ${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) '' - ${pkgs.glib.dev}/bin/gdbus call --session \ - --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \ - --method org.freedesktop.DBus.UpdateActivationEnvironment \ - "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \ - | ${pkgs.coreutils}/bin/paste -sd,)}" + ${optionalString cfg.updateDbusEnvironment '' + ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all ''} test -n "$waitPID" && wait "$waitPID" diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index bb97d0c53a6b..8747c1e3d4ac 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -213,33 +213,30 @@ while (my ($unit, $state) = each %{$activePrev}) { elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { $unitsToSkip{$unit} = 1; } else { - # If this unit is socket-activated, then stop the - # socket unit(s) as well, and restart the - # socket(s) instead of the service. - my $socketActivated = 0; - if ($unit =~ /\.service$/) { - my @sockets = split / /, ($unitInfo->{Sockets} // ""); - if (scalar @sockets == 0) { - @sockets = ("$baseName.socket"); - } - foreach my $socket (@sockets) { - if (defined $activePrev->{$socket}) { - $unitsToStop{$unit} = 1; - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $socket); - $socketActivated = 1; - } - } - } - if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { - # This unit should be restarted instead of # stopped and started. $unitsToRestart{$unit} = 1; recordUnit($restartListFile, $unit); - } else { + # If this unit is socket-activated, then stop the + # socket unit(s) as well, and restart the + # socket(s) instead of the service. + my $socketActivated = 0; + if ($unit =~ /\.service$/) { + my @sockets = split / /, ($unitInfo->{Sockets} // ""); + if (scalar @sockets == 0) { + @sockets = ("$baseName.socket"); + } + foreach my $socket (@sockets) { + if (defined $activePrev->{$socket}) { + $unitsToStop{$socket} = 1; + $unitsToStart{$socket} = 1; + recordUnit($startListFile, $socket); + $socketActivated = 1; + } + } + } # If the unit is not socket-activated, record # that this unit needs to be started below. @@ -251,7 +248,6 @@ while (my ($unit, $state) = each %{$activePrev}) { } $unitsToStop{$unit} = 1; - } } } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index cae045f78c37..c3be7407d592 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -131,51 +131,51 @@ in to the respective devices corresponding to those partitions. ''; - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { - options = { + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where GRUB will be written. Generally + this boot path should double as an EFI path. + ''; + }; + + efiSysMountPoint = mkOption { + default = null; + example = "/boot1/efi"; + type = types.nullOr types.str; + description = '' + The path to the efi system mount point. Usually this is the same + partition as the above path and can be left as null. + ''; + }; + + efiBootloaderId = mkOption { + default = null; + example = "NixOS-fsid"; + type = types.nullOr types.str; + description = '' + The id of the bootloader to store in efi nvram. + The default is to name it NixOS and append the path or efiSysMountPoint. + This is only used if boot.loader.efi.canTouchEfiVariables is true. + ''; + }; + + devices = mkOption { + default = [ ]; + example = [ "/dev/sda" "/dev/sdb" ]; + type = types.listOf types.str; + description = '' + The path to the devices which will have the GRUB MBR written. + Note these are typically device paths and not paths to partitions. + ''; + }; - path = mkOption { - example = "/boot1"; - type = types.str; - description = '' - The path to the boot directory where GRUB will be written. Generally - this boot path should double as an EFI path. - ''; }; - - efiSysMountPoint = mkOption { - default = null; - example = "/boot1/efi"; - type = types.nullOr types.str; - description = '' - The path to the efi system mount point. Usually this is the same - partition as the above path and can be left as null. - ''; - }; - - efiBootloaderId = mkOption { - default = null; - example = "NixOS-fsid"; - type = types.nullOr types.str; - description = '' - The id of the bootloader to store in efi nvram. - The default is to name it NixOS and append the path or efiSysMountPoint. - This is only used if boot.loader.efi.canTouchEfiVariables is true. - ''; - }; - - devices = mkOption { - default = [ ]; - example = [ "/dev/sda" "/dev/sdb" ]; - type = types.listOf types.str; - description = '' - The path to the devices which will have the GRUB MBR written. - Note these are typically device paths and not paths to partitions. - ''; - }; - - }; + }); }; configurationName = mkOption { diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index f2755b49f88d..1f412fe2d8f2 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -236,165 +236,165 @@ in /dev/mapper/name. ''; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule ( + { name, ... }: { options = { - options = { name, ... }: { options = { - - name = mkOption { - visible = false; - default = name; - example = "luksroot"; - type = types.str; - description = "Name of the unencrypted device in /dev/mapper."; - }; - - device = mkOption { - example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; - type = types.str; - description = "Path of the underlying encrypted block device."; - }; - - header = mkOption { - default = null; - example = "/root/header.img"; - type = types.nullOr types.str; - description = '' - The name of the file or block device that - should be used as header for the encrypted device. - ''; - }; - - keyFile = mkOption { - default = null; - example = "/dev/sdb1"; - type = types.nullOr types.str; - description = '' - The name of the file (can be a raw device or a partition) that - should be used as the decryption key for the encrypted device. If - not specified, you will be prompted for a passphrase instead. - ''; - }; - - keyFileSize = mkOption { - default = null; - example = 4096; - type = types.nullOr types.int; - description = '' - The size of the key file. Use this if only the beginning of the - key file should be used as a key (often the case if a raw device - or partition is used as key file). If not specified, the whole - keyFile will be used decryption, instead of just - the first keyFileSize bytes. - ''; - }; - - # FIXME: get rid of this option. - preLVM = mkOption { - default = true; - type = types.bool; - description = "Whether the luksOpen will be attempted before LVM scan or after it."; - }; - - allowDiscards = mkOption { - default = false; - type = types.bool; - description = '' - Whether to allow TRIM requests to the underlying device. This option - has security implications; please read the LUKS documentation before - activating it. - ''; - }; - - yubikey = mkOption { - default = null; - type = types.nullOr types.optionSet; - description = '' - The options to use for this LUKS device in Yubikey-PBA. - If null (the default), Yubikey-PBA will be disabled for this device. - ''; - - options = { - twoFactor = mkOption { - default = true; - type = types.bool; - description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)."; - }; - - slot = mkOption { - default = 2; - type = types.int; - description = "Which slot on the Yubikey to challenge."; - }; - - saltLength = mkOption { - default = 16; - type = types.int; - description = "Length of the new salt in byte (64 is the effective maximum)."; - }; - - keyLength = mkOption { - default = 64; - type = types.int; - description = "Length of the LUKS slot key derived with PBKDF2 in byte."; - }; - - iterationStep = mkOption { - default = 0; - type = types.int; - description = "How much the iteration count for PBKDF2 is increased at each successful authentication."; - }; - - gracePeriod = mkOption { - default = 2; - type = types.int; - description = "Time in seconds to wait before attempting to find the Yubikey."; - }; - - ramfsMountPoint = mkOption { - default = "/crypt-ramfs"; - type = types.str; - description = "Path where the ramfs used to update the LUKS key will be mounted during early boot."; - }; - - /* TODO: Add to the documentation of the current module: - - Options related to the storing the salt. - */ - storage = { - device = mkOption { - default = "/dev/sda1"; - type = types.path; - description = '' - An unencrypted device that will temporarily be mounted in stage-1. - Must contain the current salt to create the challenge for this LUKS device. - ''; - }; - - fsType = mkOption { - default = "vfat"; - type = types.str; - description = "The filesystem of the unencrypted device."; - }; - - mountPoint = mkOption { - default = "/crypt-storage"; - type = types.str; - description = "Path where the unencrypted device will be mounted during early boot."; - }; - - path = mkOption { - default = "/crypt-storage/default"; - type = types.str; - description = '' - Absolute path of the salt on the unencrypted device with - that device's root directory as "/". - ''; - }; - }; + name = mkOption { + visible = false; + default = name; + example = "luksroot"; + type = types.str; + description = "Name of the unencrypted device in /dev/mapper."; }; - }; - }; }; + device = mkOption { + example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; + type = types.str; + description = "Path of the underlying encrypted block device."; + }; + + header = mkOption { + default = null; + example = "/root/header.img"; + type = types.nullOr types.str; + description = '' + The name of the file or block device that + should be used as header for the encrypted device. + ''; + }; + + keyFile = mkOption { + default = null; + example = "/dev/sdb1"; + type = types.nullOr types.str; + description = '' + The name of the file (can be a raw device or a partition) that + should be used as the decryption key for the encrypted device. If + not specified, you will be prompted for a passphrase instead. + ''; + }; + + keyFileSize = mkOption { + default = null; + example = 4096; + type = types.nullOr types.int; + description = '' + The size of the key file. Use this if only the beginning of the + key file should be used as a key (often the case if a raw device + or partition is used as key file). If not specified, the whole + keyFile will be used decryption, instead of just + the first keyFileSize bytes. + ''; + }; + + # FIXME: get rid of this option. + preLVM = mkOption { + default = true; + type = types.bool; + description = "Whether the luksOpen will be attempted before LVM scan or after it."; + }; + + allowDiscards = mkOption { + default = false; + type = types.bool; + description = '' + Whether to allow TRIM requests to the underlying device. This option + has security implications; please read the LUKS documentation before + activating it. + ''; + }; + + yubikey = mkOption { + default = null; + description = '' + The options to use for this LUKS device in Yubikey-PBA. + If null (the default), Yubikey-PBA will be disabled for this device. + ''; + + type = with types; nullOr (submodule { + options = { + twoFactor = mkOption { + default = true; + type = types.bool; + description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)."; + }; + + slot = mkOption { + default = 2; + type = types.int; + description = "Which slot on the Yubikey to challenge."; + }; + + saltLength = mkOption { + default = 16; + type = types.int; + description = "Length of the new salt in byte (64 is the effective maximum)."; + }; + + keyLength = mkOption { + default = 64; + type = types.int; + description = "Length of the LUKS slot key derived with PBKDF2 in byte."; + }; + + iterationStep = mkOption { + default = 0; + type = types.int; + description = "How much the iteration count for PBKDF2 is increased at each successful authentication."; + }; + + gracePeriod = mkOption { + default = 2; + type = types.int; + description = "Time in seconds to wait before attempting to find the Yubikey."; + }; + + ramfsMountPoint = mkOption { + default = "/crypt-ramfs"; + type = types.str; + description = "Path where the ramfs used to update the LUKS key will be mounted during early boot."; + }; + + /* TODO: Add to the documentation of the current module: + + Options related to the storing the salt. + */ + storage = { + device = mkOption { + default = "/dev/sda1"; + type = types.path; + description = '' + An unencrypted device that will temporarily be mounted in stage-1. + Must contain the current salt to create the challenge for this LUKS device. + ''; + }; + + fsType = mkOption { + default = "vfat"; + type = types.str; + description = "The filesystem of the unencrypted device."; + }; + + mountPoint = mkOption { + default = "/crypt-storage"; + type = types.str; + description = "Path where the unencrypted device will be mounted during early boot."; + }; + + path = mkOption { + default = "/crypt-storage/default"; + type = types.str; + description = '' + Absolute path of the salt on the unencrypted device with + that device's root directory as "/". + ''; + }; + }; + }; + }); + }; + + }; })); }; boot.initrd.luks.yubikeySupport = mkOption { diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 38b4b437369d..2cf6a4cca9a4 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -471,8 +471,7 @@ let addresses = mkOption { default = [ ]; - type = types.listOf types.optionSet; - options = [ addressOptions ]; + type = with types; listOf (submodule [ addressOptions ]); description = '' A list of address sections to be added to the unit. See systemd.network @@ -482,8 +481,7 @@ let routes = mkOption { default = [ ]; - type = types.listOf types.optionSet; - options = [ routeOptions ]; + type = with types; listOf (submodule [ routeOptions ]); description = '' A list of route sections to be added to the unit. See systemd.network @@ -624,35 +622,32 @@ in systemd.network.links = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ linkOptions ]; + type = with types; attrsOf (submodule [ linkOptions ]); description = "Definition of systemd network links."; }; systemd.network.netdevs = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ netdevOptions ]; + type = with types; attrsOf (submodule [ netdevOptions ]); description = "Definition of systemd network devices."; }; systemd.network.networks = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ networkOptions networkConfig ]; + type = with types; attrsOf (submodule [ networkOptions networkConfig ]); description = "Definition of systemd networks."; }; systemd.network.units = mkOption { description = "Definition of networkd units."; default = {}; - type = types.attrsOf types.optionSet; - options = { name, config, ... }: + type = with types; attrsOf (submodule ( + { name, config, ... }: { options = concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; - }; + })); }; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b724995bb1fc..4a59d6474808 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -389,13 +389,13 @@ in systemd.units = mkOption { description = "Definition of systemd units."; default = {}; - type = types.attrsOf types.optionSet; - options = { name, config, ... }: + type = with types; attrsOf (submodule ( + { name, config, ... }: { options = concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; - }; + })); }; systemd.packages = mkOption { @@ -406,43 +406,37 @@ in systemd.targets = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ targetOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = targetOptions; } unitConfig] ); description = "Definition of systemd target units."; }; systemd.services = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ serviceOptions unitConfig serviceConfig ]; + type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ]); description = "Definition of systemd service units."; }; systemd.sockets = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ socketOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ]); description = "Definition of systemd socket units."; }; systemd.timers = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ timerOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ]); description = "Definition of systemd timer units."; }; systemd.paths = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ pathOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]); description = "Definition of systemd path units."; }; systemd.mounts = mkOption { default = []; - type = types.listOf types.optionSet; - options = [ mountOptions unitConfig mountConfig ]; + type = with types; listOf (submodule [ { options = mountOptions; } unitConfig mountConfig ]); description = '' Definition of systemd mount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from @@ -452,8 +446,7 @@ in systemd.automounts = mkOption { default = []; - type = types.listOf types.optionSet; - options = [ automountOptions unitConfig automountConfig ]; + type = with types; listOf (submodule [ { options = automountOptions; } unitConfig automountConfig ]); description = '' Definition of systemd automount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from @@ -600,33 +593,30 @@ in systemd.user.units = mkOption { description = "Definition of systemd per-user units."; default = {}; - type = types.attrsOf types.optionSet; - options = { name, config, ... }: + type = with types; attrsOf (submodule ( + { name, config, ... }: { options = concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; - }; + })); }; systemd.user.services = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ serviceOptions unitConfig serviceConfig ]; + type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] ); description = "Definition of systemd per-user service units."; }; systemd.user.timers = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ timerOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); description = "Definition of systemd per-user timer units."; }; systemd.user.sockets = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ socketOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ] ); description = "Definition of systemd per-user socket units."; }; @@ -808,6 +798,8 @@ in systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; systemd.services.systemd-logind.stopIfChanged = false; + systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; + systemd.services.systemd-journald.stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ]; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index af1969d82e78..fd6e58cd5b43 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -33,7 +33,6 @@ in options = { environment.etc = mkOption { - type = types.loaOf types.optionSet; default = {}; example = literalExample '' { example-configuration-file = @@ -47,7 +46,8 @@ in Set of files that have to be linked in /etc. ''; - options = singleton ({ name, config, ... }: + type = with types; loaOf (submodule ( + { name, config, ... }: { options = { enable = mkOption { @@ -117,7 +117,7 @@ in in mkDefault (pkgs.writeText name' config.text)); }; - }); + })); }; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d47f6854e338..49ba66ad50af 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -258,7 +258,7 @@ in let mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount"; device' = escapeSystemdPath fs.device; - device'' = "${device}.device"; + device'' = "${device'}.device"; in nameValuePair "mkfs-${device'}" { description = "Initialisation of Filesystem ${fs.device}"; wantedBy = [ mountPoint' ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9042418b7234..058e79b11f96 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -97,21 +97,22 @@ let addrOpts = v: assert v == 4 || v == 6; - { - address = mkOption { - type = types.str; - description = '' - IPv${toString v} address of the interface. Leave empty to configure the - interface using DHCP. - ''; - }; + { options = { + address = mkOption { + type = types.str; + description = '' + IPv${toString v} address of the interface. Leave empty to configure the + interface using DHCP. + ''; + }; - prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); - description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (${if v == 4 then "24" else "64"}). - ''; + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = '' + Subnet mask of the interface, specified as the number of + bits in the prefix (${if v == 4 then "24" else "64"}). + ''; + }; }; }; @@ -141,8 +142,7 @@ let { address = "10.0.0.1"; prefixLength = 16; } { address = "192.168.1.1"; prefixLength = 24; } ]; - type = types.listOf types.optionSet; - options = addrOpts 4; + type = with types; listOf (submodule (addrOpts 4)); description = '' List of IPv4 addresses that will be statically assigned to the interface. ''; @@ -154,8 +154,7 @@ let { address = "fdfd:b3f0:482::1"; prefixLength = 48; } { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; } ]; - type = types.listOf types.optionSet; - options = addrOpts 6; + type = with types; listOf (submodule (addrOpts 6)); description = '' List of IPv6 addresses that will be statically assigned to the interface. ''; @@ -415,8 +414,7 @@ in is true, then every interface not listed here will be configured using DHCP. ''; - type = types.loaOf types.optionSet; - options = [ interfaceOpts ]; + type = with types; loaOf (submodule interfaceOpts); }; networking.vswitches = mkOption { @@ -434,53 +432,55 @@ in interface. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + interfaces = mkOption { + example = [ "eth0" "eth1" ]; + type = types.listOf types.str; + description = + "The physical network interfaces connected by the vSwitch."; + }; + + controllers = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ptcp:6653:[::1]" ]; + description = '' + Specify the controller targets. For the allowed options see man 8 ovs-vsctl. + ''; + }; + + openFlowRules = mkOption { + type = types.lines; + default = ""; + example = '' + actions=normal + ''; + description = '' + OpenFlow rules to insert into the Open vSwitch. All openFlowRules are + loaded with ovs-ofctl within one atomic operation. + ''; + }; + + extraOvsctlCmds = mkOption { + type = types.lines; + default = ""; + example = '' + set-fail-mode secure + set Bridge stp_enable=true + ''; + description = '' + Commands to manipulate the Open vSwitch database. Every line executed with ovs-vsctl. + All commands are bundled together with the operations for adding the interfaces + into one atomic operation. + ''; + }; - interfaces = mkOption { - example = [ "eth0" "eth1" ]; - type = types.listOf types.str; - description = - "The physical network interfaces connected by the vSwitch."; }; - controllers = mkOption { - type = types.listOf types.str; - default = []; - example = [ "ptcp:6653:[::1]" ]; - description = '' - Specify the controller targets. For the allowed options see man 8 ovs-vsctl. - ''; - }; - - openFlowRules = mkOption { - type = types.lines; - default = ""; - example = '' - actions=normal - ''; - description = '' - OpenFlow rules to insert into the Open vSwitch. All openFlowRules are - loaded with ovs-ofctl within one atomic operation. - ''; - }; - - extraOvsctlCmds = mkOption { - type = types.lines; - default = ""; - example = '' - set-fail-mode secure - set Bridge stp_enable=true - ''; - description = '' - Commands to manipulate the Open vSwitch database. Every line executed with ovs-vsctl. - All commands are bundled together with the operations for adding the interfaces - into one atomic operation. - ''; - }; - - }; + }); }; @@ -499,25 +499,27 @@ in bridge's network interface. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + interfaces = mkOption { + example = [ "eth0" "eth1" ]; + type = types.listOf types.str; + description = + "The physical network interfaces connected by the bridge."; + }; + + rstp = mkOption { + example = true; + default = false; + type = types.bool; + description = "Whether the bridge interface should enable rstp."; + }; - interfaces = mkOption { - example = [ "eth0" "eth1" ]; - type = types.listOf types.str; - description = - "The physical network interfaces connected by the bridge."; }; - rstp = mkOption { - example = true; - default = false; - type = types.bool; - description = "Whether the bridge interface should enable rstp."; - }; - - }; + }); }; @@ -538,65 +540,66 @@ in name specifying the name of the bond's network interface ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + interfaces = mkOption { + example = [ "enp4s0f0" "enp4s0f1" "wlan0" ]; + type = types.listOf types.str; + description = "The interfaces to bond together"; + }; + + lacp_rate = mkOption { + default = null; + example = "fast"; + type = types.nullOr types.str; + description = '' + Option specifying the rate in which we'll ask our link partner + to transmit LACPDU packets in 802.3ad mode. + ''; + }; + + miimon = mkOption { + default = null; + example = 100; + type = types.nullOr types.int; + description = '' + Miimon is the number of millisecond in between each round of polling + by the device driver for failed links. By default polling is not + enabled and the driver is trusted to properly detect and handle + failure scenarios. + ''; + }; + + mode = mkOption { + default = null; + example = "active-backup"; + type = types.nullOr types.str; + description = '' + The mode which the bond will be running. The default mode for + the bonding driver is balance-rr, optimizing for throughput. + More information about valid modes can be found at + https://www.kernel.org/doc/Documentation/networking/bonding.txt + ''; + }; + + xmit_hash_policy = mkOption { + default = null; + example = "layer2+3"; + type = types.nullOr types.str; + description = '' + Selects the transmit hash policy to use for slave selection in + balance-xor, 802.3ad, and tlb modes. + ''; + }; - interfaces = mkOption { - example = [ "enp4s0f0" "enp4s0f1" "wlan0" ]; - type = types.listOf types.str; - description = "The interfaces to bond together"; }; - lacp_rate = mkOption { - default = null; - example = "fast"; - type = types.nullOr types.str; - description = '' - Option specifying the rate in which we'll ask our link partner - to transmit LACPDU packets in 802.3ad mode. - ''; - }; - - miimon = mkOption { - default = null; - example = 100; - type = types.nullOr types.int; - description = '' - Miimon is the number of millisecond in between each round of polling - by the device driver for failed links. By default polling is not - enabled and the driver is trusted to properly detect and handle - failure scenarios. - ''; - }; - - mode = mkOption { - default = null; - example = "active-backup"; - type = types.nullOr types.str; - description = '' - The mode which the bond will be running. The default mode for - the bonding driver is balance-rr, optimizing for throughput. - More information about valid modes can be found at - https://www.kernel.org/doc/Documentation/networking/bonding.txt - ''; - }; - - xmit_hash_policy = mkOption { - default = null; - example = "layer2+3"; - type = types.nullOr types.str; - description = '' - Selects the transmit hash policy to use for slave selection in - balance-xor, 802.3ad, and tlb modes. - ''; - }; - - }; + }); }; networking.macvlans = mkOption { - type = types.attrsOf types.optionSet; default = { }; example = literalExample { wan = { @@ -608,26 +611,28 @@ in This option allows you to define macvlan interfaces which should be automatically created. ''; - options = { + type = with types; attrsOf (submodule { + options = { + + interface = mkOption { + example = "enp4s0"; + type = types.str; + description = "The interface the macvlan will transmit packets through."; + }; + + mode = mkOption { + default = null; + type = types.nullOr types.str; + example = "vepa"; + description = "The mode of the macvlan device."; + }; - interface = mkOption { - example = "enp4s0"; - type = types.str; - description = "The interface the macvlan will transmit packets through."; }; - mode = mkOption { - default = null; - type = types.nullOr types.str; - example = "vepa"; - description = "The mode of the macvlan device."; - }; - - }; + }); }; networking.sits = mkOption { - type = types.attrsOf types.optionSet; default = { }; example = literalExample { hurricane = { @@ -644,46 +649,49 @@ in description = '' This option allows you to define 6-to-4 interfaces which should be automatically created. ''; - options = { + type = with types; attrsOf (submodule { + options = { + + remote = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.1"; + description = '' + The address of the remote endpoint to forward traffic over. + ''; + }; + + local = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.22"; + description = '' + The address of the local endpoint which the remote + side should send packets to. + ''; + }; + + ttl = mkOption { + type = types.nullOr types.int; + default = null; + example = 255; + description = '' + The time-to-live of the connection to the remote tunnel endpoint. + ''; + }; + + dev = mkOption { + type = types.nullOr types.str; + default = null; + example = "enp4s0f0"; + description = '' + The underlying network device on which the tunnel resides. + ''; + }; - remote = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.0.0.1"; - description = '' - The address of the remote endpoint to forward traffic over. - ''; }; - local = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.0.0.22"; - description = '' - The address of the local endpoint which the remote - side should send packets to. - ''; - }; - - ttl = mkOption { - type = types.nullOr types.int; - default = null; - example = 255; - description = '' - The time-to-live of the connection to the remote tunnel endpoint. - ''; - }; - - dev = mkOption { - type = types.nullOr types.str; - default = null; - example = "enp4s0f0"; - description = '' - The underlying network device on which the tunnel resides. - ''; - }; - - }; + }); }; networking.vlans = mkOption { @@ -706,23 +714,26 @@ in specifying the name of the vlan interface. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + id = mkOption { + example = 1; + type = types.int; + description = "The vlan identifier"; + }; + + interface = mkOption { + example = "enp4s0"; + type = types.str; + description = "The interface the vlan will transmit packets through."; + }; - id = mkOption { - example = 1; - type = types.int; - description = "The vlan identifier"; }; - interface = mkOption { - example = "enp4s0"; - type = types.str; - description = "The interface the vlan will transmit packets through."; - }; + }); - }; }; networking.wlanInterfaces = mkOption { @@ -760,73 +771,76 @@ in would have to be created explicitly. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + device = mkOption { + type = types.string; + example = "wlp6s0"; + description = "The name of the underlying hardware WLAN device as assigned by udev."; + }; + + type = mkOption { + type = types.string; + default = "managed"; + example = "ibss"; + description = '' + The type of the WLAN interface. The type has to be either managed, + ibss, monitor, mesh or wds. + Also, the type has to be supported by the underlying hardware of the device. + ''; + }; + + meshID = mkOption { + type = types.nullOr types.string; + default = null; + description = "MeshID of interface with type mesh."; + }; + + flags = mkOption { + type = types.nullOr types.string; + default = null; + example = "control"; + description = '' + Flags for interface of type monitor. The valid flags are: + none: no special flags + fcsfail: show frames with FCS errors + control: show control frames + otherbss: show frames from other BSSes + cook: use cooked mode + active: use active mode (ACK incoming unicast packets) + ''; + }; + + fourAddr = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to enable 4-address mode with type managed."; + }; + + mac = mkOption { + type = types.nullOr types.str; + default = null; + example = "02:00:00:00:00:01"; + description = '' + MAC address to use for the device. If null, then the MAC of the + underlying hardware WLAN device is used. + + INFO: Locally administered MAC addresses are of the form: + + x2:xx:xx:xx:xx:xx + x6:xx:xx:xx:xx:xx + xA:xx:xx:xx:xx:xx + xE:xx:xx:xx:xx:xx + + ''; + }; - device = mkOption { - type = types.string; - example = "wlp6s0"; - description = "The name of the underlying hardware WLAN device as assigned by udev."; }; - type = mkOption { - type = types.string; - default = "managed"; - example = "ibss"; - description = '' - The type of the WLAN interface. The type has to be either managed, - ibss, monitor, mesh or wds. - Also, the type has to be supported by the underlying hardware of the device. - ''; - }; + }); - meshID = mkOption { - type = types.nullOr types.string; - default = null; - description = "MeshID of interface with type mesh."; - }; - - flags = mkOption { - type = types.nullOr types.string; - default = null; - example = "control"; - description = '' - Flags for interface of type monitor. The valid flags are: - none: no special flags - fcsfail: show frames with FCS errors - control: show control frames - otherbss: show frames from other BSSes - cook: use cooked mode - active: use active mode (ACK incoming unicast packets) - ''; - }; - - fourAddr = mkOption { - type = types.nullOr types.bool; - default = null; - description = "Whether to enable 4-address mode with type managed."; - }; - - mac = mkOption { - type = types.nullOr types.str; - default = null; - example = "02:00:00:00:00:01"; - description = '' - MAC address to use for the device. If null, then the MAC of the - underlying hardware WLAN device is used. - - INFO: Locally administered MAC addresses are of the form: - - x2:xx:xx:xx:xx:xx - x6:xx:xx:xx:xx:xx - xA:xx:xx:xx:xx:xx - xE:xx:xx:xx:xx:xx - - ''; - }; - - }; }; networking.useDHCP = mkOption { diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index f570813805cf..b3055f49f9b2 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -129,6 +129,9 @@ let --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv PATH="$PATH" \ + ${if cfg.additionalCapabilities != null then + ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" + } \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ''; @@ -205,6 +208,41 @@ let '' ); + serviceDirectives = cfg: { + ExecReload = pkgs.writeScript "reload-container" + '' + #! ${pkgs.stdenv.shell} -e + ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ + bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" + ''; + + SyslogIdentifier = "container %i"; + + EnvironmentFile = "-/etc/containers/%i.conf"; + + Type = "notify"; + + # Note that on reboot, systemd-nspawn returns 133, so this + # unit will be restarted. On poweroff, it returns 0, so the + # unit won't be restarted. + RestartForceExitStatus = "133"; + SuccessExitStatus = "133"; + + Restart = "on-failure"; + + # Hack: we don't want to kill systemd-nspawn, since we call + # "machinectl poweroff" in preStop to shut down the + # container cleanly. But systemd requires sending a signal + # (at least if we want remaining processes to be killed + # after the timeout). So send an ignored signal. + KillMode = "mixed"; + KillSignal = "WINCH"; + + DevicePolicy = "closed"; + DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices; + }; + + system = config.nixpkgs.system; bindMountOpts = { name, config, ... }: { @@ -235,6 +273,27 @@ let }; + allowedDeviceOpts = { name, config, ... }: { + options = { + node = mkOption { + example = "/dev/net/tun"; + type = types.str; + description = "Path to device node"; + }; + modifier = mkOption { + example = "rw"; + type = types.str; + description = '' + Device node access modifier. Takes a combination + r (read), w (write), and + m (mknod). See the + systemd.resource-control(5) man page for more + information.''; + }; + }; + }; + + mkBindFlag = d: let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; @@ -302,6 +361,8 @@ let dummyConfig = { extraVeths = {}; + additionalCapabilities = []; + allowedDevices = []; hostAddress = null; hostAddress6 = null; localAddress = null; @@ -368,6 +429,26 @@ in ''; }; + additionalCapabilities = mkOption { + type = types.listOf types.str; + default = []; + example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ]; + description = '' + Grant additional capabilities to the container. See the + capabilities(7) and systemd-nspawn(1) man pages for more + information. + ''; + }; + enableTun = mkOption { + type = types.bool; + default = false; + description = '' + Allows the container to create and setup tunnel interfaces + by granting the NET_ADMIN capability and + enabling access to /dev/net/tun. + ''; + }; + privateNetwork = mkOption { type = types.bool; default = false; @@ -392,9 +473,8 @@ in }; extraVeths = mkOption { - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule networkOptions); default = {}; - options = networkOptions; description = '' Extra veth-pairs to be created for the container ''; @@ -409,8 +489,7 @@ in }; bindMounts = mkOption { - type = types.loaOf types.optionSet; - options = [ bindMountOpts ]; + type = with types; loaOf (submodule bindMountOpts); default = {}; example = { "/home" = { hostPath = "/home/alice"; isReadOnly = false; }; @@ -422,6 +501,16 @@ in ''; }; + allowedDevices = mkOption { + type = types.listOf types.optionSet; + options = [ allowedDeviceOpts ]; + default = []; + example = [ { node = "/dev/net/tun"; modifier = "rw"; } ]; + description = '' + A list of device nodes to which the containers has access to. + ''; + }; + } // networkOptions; config = mkMerge @@ -488,59 +577,39 @@ in restartIfChanged = false; - serviceConfig = { - ExecReload = pkgs.writeScript "reload-container" - '' - #! ${pkgs.stdenv.shell} -e - ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ - bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" - ''; - - SyslogIdentifier = "container %i"; - - EnvironmentFile = "-/etc/containers/%i.conf"; - - Type = "notify"; - - # Note that on reboot, systemd-nspawn returns 133, so this - # unit will be restarted. On poweroff, it returns 0, so the - # unit won't be restarted. - RestartForceExitStatus = "133"; - SuccessExitStatus = "133"; - - Restart = "on-failure"; - - # Hack: we don't want to kill systemd-nspawn, since we call - # "machinectl poweroff" in preStop to shut down the - # container cleanly. But systemd requires sending a signal - # (at least if we want remaining processes to be killed - # after the timeout). So send an ignored signal. - KillMode = "mixed"; - KillSignal = "WINCH"; - - DevicePolicy = "closed"; - }; + serviceConfig = serviceDirectives dummyConfig; }; in { systemd.services = listToAttrs (filter (x: x.value != null) ( # The generic container template used by imperative containers [{ name = "container@"; value = unit; }] # declarative containers - ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" ( - unit // { - preStart = preStartScript cfg; - script = startScript cfg; - postStart = postStartScript cfg; - } // ( - if cfg.autoStart then - { - wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; - after = [ "network.target" ]; - restartTriggers = [ cfg.path ]; - reloadIfChanged = true; - } - else {}) + ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let + config = cfg // ( + if cfg.enableTun then + { + allowedDevices = cfg.allowedDevices + ++ [ { node = "/dev/net/tun"; modifier = "rw"; } ]; + additionalCapabilities = cfg.additionalCapabilities + ++ [ "CAP_NET_ADMIN" ]; + } + else {}); + in + unit // { + preStart = preStartScript config; + script = startScript config; + postStart = postStartScript config; + serviceConfig = serviceDirectives config; + } // ( + if config.autoStart then + { + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + restartTriggers = [ config.path ]; + reloadIfChanged = true; + } + else {}) )) config.containers) )); diff --git a/nixos/release.nix b/nixos/release.nix index 7fcff78f6b95..bff17da607f3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -284,6 +284,7 @@ in rec { tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; + tests.samba = callTest tests/samba.nix {}; tests.sddm = callTest tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix new file mode 100644 index 000000000000..7f27903a3026 --- /dev/null +++ b/nixos/tests/flannel.nix @@ -0,0 +1,55 @@ +import ./make-test.nix ({ pkgs, ...} : rec { + name = "flannel"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; + + nodes = let + flannelConfig = { + services.flannel = { + enable = true; + network = "10.1.0.0/16"; + iface = "eth1"; + etcd.endpoints = ["http://etcd:2379"]; + }; + + networking.firewall.allowedUDPPorts = [ 8472 ]; + }; + in { + etcd = { config, pkgs, ... }: { + services = { + etcd = { + enable = true; + listenClientUrls = ["http://etcd:2379"]; + listenPeerUrls = ["http://etcd:2380"]; + initialAdvertisePeerUrls = ["http://etcd:2379"]; + initialCluster = ["etcd=http://etcd:2379"]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 2379 ]; + }; + + node1 = { config, ... }: { + require = [flannelConfig]; + }; + + node2 = { config, ... }: { + require = [flannelConfig]; + }; + }; + + testScript = '' + startAll; + + $node1->waitForUnit("flannel.service"); + $node2->waitForUnit("flannel.service"); + + my $ip1 = $node1->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'"); + my $ip2 = $node2->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'"); + + $node1->waitUntilSucceeds("ping -c 1 $ip2"); + $node2->waitUntilSucceeds("ping -c 1 $ip1"); + ''; +}) diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix index edece352cafe..01f6a0358b2e 100644 --- a/nixos/tests/logstash.nix +++ b/nixos/tests/logstash.nix @@ -25,7 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : { ''; outputConfig = '' stdout { codec => rubydebug } - elasticsearch { embedded => true } ''; }; }; @@ -38,6 +37,5 @@ import ./make-test.nix ({ pkgs, ...} : { $one->waitForUnit("logstash.service"); $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers"); $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); - $one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash"); ''; }) diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix new file mode 100644 index 000000000000..d6658ef0400b --- /dev/null +++ b/nixos/tests/samba.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "samba"; + + meta.maintainers = [ pkgs.lib.maintainers.eelco ]; + + nodes = + { client = + { config, pkgs, ... }: + { fileSystems = pkgs.lib.mkVMOverride + { "/public" = { + fsType = "cifs"; + device = "//server/public"; + options = [ "guest" ]; + }; + }; + }; + + server = + { config, pkgs, ... }: + { services.samba.enable = true; + services.samba.shares.public = + { path = "/public"; + "read only" = true; + browseable = "yes"; + "guest ok" = "yes"; + comment = "Public samba share."; + }; + networking.firewall.allowedTCPPorts = [ 139 445 ]; + networking.firewall.allowedUDPPorts = [ 137 138 ]; + }; + }; + + # client# [ 4.542997] mount[777]: sh: systemd-ask-password: command not found + + testScript = + '' + $server->start; + $server->waitForUnit("samba-smbd"); + $server->waitForUnit("samba-nmbd"); + $server->succeed("mkdir -p /public; echo bar > /public/foo"); + + $client->start; + $client->waitForUnit("network.target"); + $client->succeed("[[ \$(cat /public/foo) = bar ]]"); + ''; +}) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 7b4e7d54f323..40d82914bf75 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,14 +6,14 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.12.0"; + core_version = "0.13.0"; version = core_version; src = fetchurl { urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0f1cda66c841a548a07cc37e80b0727354b1236d9f374c7d44362acdb85eb3e1"; + sha256 = "0c7d7049689bb17f4256f1e5ec20777f42acef61814d434b38e6c17091161cda"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 2cf9849e351b..382d4a1b6675 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out) INSTALL=install"; buildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin [ IOKit ]; + ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { homepage = http://linukz.org/cd-discid.shtml; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index d00dcafd7b8c..c5593a8d600b 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis qt zlib readline makeWrapper ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_APPS=Qt;CLI" ]; + cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; preConfigure = '' diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix new file mode 100644 index 000000000000..a3f58012e534 --- /dev/null +++ b/pkgs/applications/editors/tecoc/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchgit +, ncurses }: + +stdenv.mkDerivation rec { + + name = "tecoc-git-${version}"; + version = "20150606"; + + src = fetchgit { + url = "https://github.com/blakemcbride/TECOC.git"; + rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb"; + sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj"; + }; + + buildInputs = [ ncurses ]; + + configurePhase = '' + cp src/makefile.linux src/Makefile + ''; + buildPhase = '' + make CC=${stdenv.cc}/bin/cc -C src/ + ''; + installPhase = '' + mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros + cp src/tecoc $out/bin + cp src/aaout.txt doc/* $out/share/doc/${name} + cp lib/* lib2/* $out/lib/teco/macros + (cd $out/bin + ln -s tecoc Make + ln -s tecoc mung + ln -s tecoc teco + ln -s tecoc Inspect ) + ''; + + meta = with stdenv.lib; { + description = "A clone of the good old TECO editor"; + longDescription = '' + For those who don't know: TECO is the acronym of Tape Editor and + COrrector (because it was a paper tape edition tool in its debut + days). Now the acronym follows after Text Editor and Corrector, + or Text Editor Character-Oriented. + + TECO is a character-oriented text editor, originally developed + bu Dan Murphy at MIT circa 1962. It is also a Turing-complete + imperative interpreted programming language for text + manipulation, done via user-loaded sets of macros. In fact, Emacs + was born as a set of Editor MACroS for TECO. + + TECOC is a portable C implementation of TECO-11. + ''; + homepage = https://github.com/blakemcbride/TECOC; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: test in other platforms - especially Darwin diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index a128899d24e7..5f2fffa5f508 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -5,12 +5,12 @@ let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; - sha256 = "0s1i6yhm1z9ayzjh8cprcc9jvj5m87l9snyqg6w7zlj3q9zn4rn6"; + sha256 = "0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p"; }; nativeBuildInputs = [ pkgconfig qmakeHook ]; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 72a4bfe57b89..a28890e2466f 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libtermkey lua lpeg - ] ++ stdenv.lib.optional stdenv.isLinux [ + ] ++ stdenv.lib.optionals stdenv.isLinux [ acl libselinux ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 380e5d298864..40fe178d6257 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + ++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 655fa5b9405d..b339d8aeb7b3 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "manuelschneid3r"; repo = "albert"; rev = "v${version}"; - sha256 = "1x8fpc6rnjifh405p385avdaww4v8ld6qwczqwmkzgbcn15gman7"; + sha256 = "12ag30l3dd05hg0d08ax4c8dvp24lgd677szkq445xzvvhggxr37"; }; nativeBuildInputs = [ cmake makeQtWrapper ]; @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { wrapQtProgram $out/bin/albert ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/manuelSchneid3r/albert; description = "Desktop agnostic launcher"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.ericsagnes ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index d76c935f0a69..734364b9ccda 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile -, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python -, zlib, fftw, opensubdiv, freetype +, ilmbase, libXi, libX11, libXext, libXrender +, libjpeg, libpng, libsamplerate, libsndfile +, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, zlib, fftw, opensubdiv, freetype, jemalloc , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada @@ -10,17 +11,18 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.77a"; + name = "blender-2.78"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p"; + sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp"; }; buildInputs = - [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype - libjpeg libpng libsamplerate libsndfile libtiff mesa openal - opencolorio openexr openimageio openjpeg python zlib fftw + [ boost cmake ffmpeg gettext glew ilmbase + libXi libX11 libXext libXrender + freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal + opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) ] ++ optional jackaudioSupport libjack2 @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_FFTW3=ON" - "-DWITH_SDL=ON" + #"-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" "-DWITH_SYSTEM_OPENJPEG=ON" diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 3e76f6c36e71..33adacefb9de 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; }; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - buildInputs = [ qt4 zlib bzip2 ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix new file mode 100644 index 000000000000..eda95bc0c5e7 --- /dev/null +++ b/pkgs/applications/misc/gnuradio-ais/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-ais-${version}"; + version = "2016-08-26"; + + src = fetchFromGitHub { + owner = "bistromath"; + repo = "gr-ais"; + rev = "1863d1bf8a7709a8dfedb3ddb8e2b99112e7c872"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for ais"; + homepage = https://github.com/bistromath/gr-ais; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix new file mode 100644 index 000000000000..a47925cab90d --- /dev/null +++ b/pkgs/applications/misc/gnuradio-gsm/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-gsm-${version}"; + version = "2016-08-25"; + + src = fetchFromGitHub { + owner = "ptrkrysik"; + repo = "gr-gsm"; + rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; + sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for gsm"; + homepage = https://github.com/ptrkrysik/gr-gsm; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix new file mode 100644 index 000000000000..5e729a75557e --- /dev/null +++ b/pkgs/applications/misc/gnuradio-rds/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-rds-${version}"; + version = "2016-08-27"; + + src = fetchFromGitHub { + owner = "bastibl"; + repo = "gr-rds"; + rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; + sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio makeWrapper + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for radio data system"; + homepage = https://github.com/bastibl/gr-rds; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix new file mode 100644 index 000000000000..7a0eadf74e5a --- /dev/null +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pcsclite, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "libosmocore-${version}"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "osmocom"; + repo = "libosmocore"; + rev = "8649d57f507d359c99a89654aac7e19ce22db282"; + sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am"; + }; + + buildInputs = [ + autoreconfHook pcsclite pkgconfig + ]; + + preConfigure = '' + autoreconf -i -f + ''; + + meta = with stdenv.lib; { + description = "libosmocore"; + homepage = https://github.com/osmocom/libosmocore; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index e62deb9a3488..3fe0503d7f9d 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig , geoclue2 -, guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg +, guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb , vidModeSupport ? true, libX11, libXxf86vm @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ geoclue2 ] - ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python - pygobject3 pyxdg ] + ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3 + python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { substituteInPlace src/redshift-gtk/redshift-gtk \ --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" ''; - postInstall = stdenv.lib.optionalString guiSupport '' wrapProgram "$out/bin/redshift-gtk" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 042401a727e9..6a326dba39c6 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify +, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg , pythonPackages, udisks2, wrapGAppsHook }: pythonPackages.buildPythonApplication rec { @@ -17,6 +17,7 @@ pythonPackages.buildPythonApplication rec { asciidoc-full # For building man page. hicolor_icon_theme wrapGAppsHook + librsvg # required for loading svg icons (udiskie uses svg icons) ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix index 6ada451edf1b..8876b64ed0c9 100644 --- a/pkgs/applications/misc/webthree-umbrella/default.nix +++ b/pkgs/applications/misc/webthree-umbrella/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ - "-DCMAKE_BUILD_TYPE=Release" "-DGUI=${toString withGUI}" "-DETHASHCL=${toString withOpenCL}" "-DPROFILING=${toString withProfiling}" @@ -85,22 +84,10 @@ stdenv.mkDerivation rec { curl libmicrohttpd mesa - (optional withOpenCL [ - opencl-headers - ocl-icd - ]) - (optional withGUI [ - qtwebengine - qtbase - qtdeclarative - ]) - (optional withProfiling gperftools) - (optional withEVMJIT [ - llvm - zlib - ncurses - ]) - ]; + ] ++ optionals withOpenCL [ opencl-headers ocl-icd ] + ++ optionals withGUI [ qtwebengine qtbase qtdeclarative ] + ++ optional withProfiling gperftools + ++ optionals withEVMJIT [ llvm zlib ncurses ]; runPath = with stdenv.lib; (makeLibraryPath (flatten [ stdenv.cc.cc buildInputs ])); diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index a22612993c5f..1d287f4100c2 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { zeitgeist ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" + cmakeFlags = [ "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" "-DHALF_BRO_INCOM_WEBKIT2=ON" "-DUSE_GTK3=1" diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index fbb08a9bd225..62dbbcf21495 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -23,6 +23,6 @@ buildGoPackage rec { description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 79074d2d28e6..b4c20e22680b 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] - ++ optional mesosSupport [ mesos ]; + ++ optional mesosSupport mesos; untarDir = "${name}-bin-cdh4"; installPhase = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 1b4e3e7d19f0..51e7e671175d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "11.4.20"; + version = "11.4.21"; sha256 = { - "x86_64-linux" = "1mnjc00y1vs3c22hqf328idgsrrlq097kld67ab9q8d6l8r8qkr6"; - "i686-linux" = "1s7m56if2wq34sc8aq46xnhrrnbhnsfi85jw0yp4dpcdwv6s38v5"; + "x86_64-linux" = "179ajawqy43jhgvysc386hdyz9hdandwvh8m2y2rassvycn9kr8z"; + "i686-linux" = "1y4z9rb06f2a3cj51xawgpzgar9x7gvr4jrazncqfpfqkv7zayv1"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 44cf13e2917c..904002c3b442 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" ''; - cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release"; + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'"; prePatch = '' patchShebangs . diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 0ff4d5a5f2a2..f8509a46248d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.3.0"; + version = "45.4.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "a2d1728cec3775a3a012ada32a8934fa1a94ff0af315e395e765c94873593c4e2ddb1ec5acee33a83f2970137087ff1fd6ba23b0bbea3780e4f67a3b46146911"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "d29362ecf4abe3cb7224058ffb421feafe5ddb277ad8cae407907c0939028e7e03079ec3b6a691cf260ea29908be7df4377dbc626704da622548056f45b6e9d7"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "51fb3626875acbf78f0d2337feee07aeaca24dec59042a2b6374afb205dce099df477ab3384e0e9c545fe68ac13af921a8d3a1c4c93f721d7831f3aca15e4783"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "660376e67491f11d484ff112b8b8d1dc9187a7bb7f7ff1e8665d3693e5eee9737bff8f23f69f4d71b2d3f3be0ad4d816febb4894bb17ac911e19ef18411fc667"; } - { locale = "be"; arch = "linux-i686"; sha512 = "be5fed683ee9b325f135e65fc6f641d81b7294f3d13f411b36b4e73d68a8b8592d0c93fa6ad55fc9aa8a281a5d2069f3f8dcf029038d867f3b87baf8e4a93411"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "4b92f1999478d9a97737b31f34ca78bcbf6d657297b0ef791327c73d89a1737a29df9eaca47aed3e0f1ddf0d4925ba6c0a51584ca8009237ea98fec9007e69b9"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "76d2450774254052ee216644f53025ffd4a928932955d856e16141a95b557fc327b17f01d4c47ff3b7f8a8c267a6a78511c126980554bf64f5fa5c06eba758fe"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "53f2463e8838e6dc53fd1212745f401dbbffec484036745114f04e90e2270421efb0e579724023f1a153e2fbf5afb9e31b383b9d0a8e74ec15cdd17aff04b58c"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "c798161824be7fd3253308b3157c0dfb5dbec085f2b530fa4a7cd8992b8e602031c0c8f6959449a3a7f988f10b00b1f99f331b017c8d38358a017e54c2ff5166"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8f8fafa9a79696a81e2e4a7e033edec1e37c44fc6b4a5a20cea0853f88ac978fa536109a81f5fe7baf574af6e1778975b8df5e0a47a0c6cb8161dd19f3e2c067"; } - { locale = "br"; arch = "linux-i686"; sha512 = "9007da613fd8930e669da228197d5be59d53a26f94453523ae468a0b4172adb4509e5ae1677ca21421031238910d19f45323fb09ef52ac95205f1fa3a1d8ce46"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "57cead8865a052981729f55f85f402329dd4151cf3f89ad5c6cc1a83a068a9ba1e309db521ecde1cf90a3737b04a7d992087a68b93506ce0ab4a7ea26253b761"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "5401395d2e57ada9b62fd1d8a90006e60884a38086fe74bc720109d1fd8d989292bcb2781c1b30f19fbfcb867bf157bf33c3948463ab1e0fd8ddbfbc790b492d"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "1d69ddc33643c7227d80cbb61087a73ff46c79e1531479531201b4e49a53400fc576f445306dad20b318f189e8b739179390f9ca7fd340e2d2cac46650569da6"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "25a9c864e60aced998c1599786a9cb3db92c02b9d855c7500fd466cd92f4bc8ff6fc7c5cb37c52b3dbba990ae4ce0eee1854f4f3459b4c2ce50e4e4ccd3ff445"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "0b1b72a4f43192afa03fcf17e234fa6d09ab20cccadc0a58682b37c96a576c31d2e5022d3d778992c188b826816d7d36e56fbf4055a0be2213e45062a162939d"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "b69312902ede9687c804a068f9fcf70c0c3c68786d92c72a5b38ed38e9773382223e5d09a2067632b02ae9e2f224c85e0c95de9ada535e0b8e37ce5f6aa86006"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "bd03a664a14c2b7271db1ae66f65fada02eb995da9d8466f345d25b40bbd7f836e48e9e8f19276f7109e5e42effc3be70d0c20705d386620319c6e2c920027c4"; } - { locale = "da"; arch = "linux-i686"; sha512 = "2fce874759494b51d9f9081f26985834527984cec849f1f07ebd0f3b7523bdeb7a39cae6d17f021e82972f392ae7cc33d6b81606f81afc7bc35a75698889905d"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "c7fd6b68f50c2ea4abb2d72dfb804db0e5ff3a8dd932f36fb7e9f194f4a12469bf64785ba18ad6f989b5456e6a0387c17fcf421075341998dce315f658b70058"; } - { locale = "de"; arch = "linux-i686"; sha512 = "8661fd16bcb94fba14156ea0d569364b495dd470359491b482f6e9c957a6ffd1c9b3a60728d6a0755a1789d6c3029952bead677df38d3f7e972469cd877d96a2"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "c98b8afbd38e3ea31196a2dfdd3e8a13639aed9a3052a25dbcf851139a75167481b67c94542be310c5a2fd8850c8396ff2fbb57ac14b0158c87b6e30562d1eb6"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "2e5f781f0ea57f4cc129693d5085d17047ecdde3273a97b83717e793bef2693ddd543078c667635e2603e5a4867fdee60cecf0fe47170f84d31456c72f4753a1"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "fcaad0f6ea4f9610bbfb5efd414005ab1b62d13799e2f0ff0188c0e262910c881f0e7ca838c6d18df0bc629eb26e4dc34e48635fb64029f484c0fe3aec12cef0"; } - { locale = "el"; arch = "linux-i686"; sha512 = "d71b2805881cf5b7f0c06e398289907f224bbb58ffe676c32587f98cdfa6d80b1a8497bf4d1d515a4b1ba8472f5250dc7df178a0fd47baf51746409c18157d69"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "89309f36b503f1be5a23f24def962a7ed6604369fc1e3a254deaf3fca6b020837813e7b3a5896320620301eb14025c604121c4b6727f1362d6783da6256be039"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "233fb74c88ff43fc5520fef6fc052019551405ed43e786448c9b7921fb620b81b8b1569dbd3c57b7e8a0aa34043b29fa388100ab0ad66545bb84675de43d4b9b"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "70dddef3561b53d359ed59205dd77d661f6842a7ac4a62d79f2f2576a7d2b9a8735ae7e48759b669bade841dd7329857d4c273fd6e202f1ae22201b7d461def3"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "bf1f75d614dc0e401981b81d84911f2e13a1c8fc668b8a7c531963162ac293f72d6252aceb4447c97c57cc3b632452de6475f294f82090751141c3f8f681b868"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "5b7ba243783d5bd3eb1acc6cad872b5f2885cf289d33274932ceee2159295c84230f692a1338fc4c4c3e1947436917251ed54a6995922b4777bdee7e5303ec29"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "9fddac56cc41a0b83c794ad7b7744573a6039c736d785a46666fb5c40360aae0397d129e523a7ac8b7e9b07295b56741e96e8cea770533c7c3611c209f9ae5ad"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "f7d7a051bc7411d2811aa5672da7aff51ee96065eb26e47e9eda721c0e125a529353a6290195cc257f36e44dbca6d81dff1342478a52b0d700f7def335135440"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "b0b32a37d13b76899037c7d34e2444cb45d54166516c6f6f141ae4713e5cca36827c0c02f4d9614a1c7eb5d9d859087586dda3e311d221f19091414557f9b713"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "918affe04e2dbf1f8d2f65a8a16cb30d575631d323eeb5cd29e76f2b30d003337e35792e57f78ca6bf8abd253f005296b44b71ecd4c48d055456b8820a2b8551"; } - { locale = "et"; arch = "linux-i686"; sha512 = "7a2aaa9e81fa166ad66ef6a275ea1e1b1f333946e73bd22c7954b78641949a870e8c4ff38f763ef22bbf25cf81ad0138e5d4b154b1d2cb90126ef53e56b6e676"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "cfb751a0d94cbc3e130abe78dceb81117750b16c9665860a083a71554ce96e9102fa3c8b084c7acf07c9e10a8fe30e54e5964a214486c2bd16d93678a4b6948d"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "c99dd3738739f06963cf3e31d72831d8861c898ac512b0563f0d9ab21e671fed55c0e16e07ff87e058873095204a81f1756d77453e792bcc522c81d6ac26638c"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "4726d30ed22d79edca4d3a6082ecf40cb107b28aeebcc1ed21faca951cd955fca524d4c16f4e9ac71fd57651c2392d79c5adcafea9a7dadbe84dc3e3511f47f4"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "3fe4ae74f046a0fcf95570ff7cd00abfa63567153bbabd036ecd8cccf1aab075b19e43642e247c741165d3990f1690d4c7f4b3eb16aaa34188d1bd17c202e06d"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "5e76a85eb66d62c2fcd42d0274e43c052131bd2a8d54bce256e417782d1b97985cc9a917fba18ab1118e72fd3bacb94abdf5620c1be9a7225f6c9b62f1eb0e02"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "216e084442018d1e5925d4deb14c11bda248d5015696b22167693f2534dd98049dd385bc3061348085113487b93cfea675cb7ea528ca4385022b33860b39633a"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "6fbb2935899d94b3f56b27c131e2574f6735fba4147430a1dd5cd8728db29b90fd1416bc3661b1a3a927f496e9d716ae165ed8c65951184c2b1e07c962f876df"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "f752dbe8d2e90c0b5e60faa0b34280050463ea1bdda0749c9d46a46f08339e5952eacf70f0765144677362c9dad51c24a3bdffeb89e309563e472484f436993f"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "302d8bf3941e0dff52918202f7f885dcb14ae9504baf52686a5c9201a644d469c57925181074ac0789d437d9bd8bfa965ae2ccbd54f51dbe2bc352b29d4a1e9c"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "be52801d6995cd377d451a640e319c2b812d83d62cbb2c3bf7063a18f03838f9b758add09875aa9e4e973b3ce3ac285f6f3486a7495590acf5672ccb900e5528"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "a475b35c3fbd9fee3e4fd1475b9d3138d58df296744660dd8cc1932f121bbe9b1a2324c6452a4159b5c97a3846f38e92b9214a512d739a897cffeb40805cc0c7"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "88e209d87e38dd950b1248351d6b0518f63dd27423d2f30df1b177740dda4fb3568e19361b066ddd758fe071a7f2c747f8ff9307d6745b9d68002bb34be5dc77"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "a56c26c2393323a8ec9190a89b3c1a4a27de9086222791e6cc84de0f640e2700274b92ffda0a21aa1de39684443108499122a12fbf5ceec3df69301132cf3463"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "bc180ce7132641596151a1b6516b6ab9aa6070c542fbe90be7e440580c8f7a488348ba238922e33c8aea10505814604d5f5568d03978bcc75db536a31f66c4ce"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "92bba67974146f832d91c6d023b60a7d4dd3f0391f4df9744379035bbf6fe2ca43d8eb81e05184658da34d5519b310f06fe4429287874ba618d3720931ef89a6"; } - { locale = "he"; arch = "linux-i686"; sha512 = "37da8123306823963ac02c9756d5ce3e76207ee0a1652fdad42cf2c8467062f1369c8f6640625fdc049e2c024d6ed71cb3c9c669d18e1d737246d510102d1d89"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "62bb1f1735c13ac7adef4ce922eff64aba486bb2274691b8c3df12c4d87c30660dd2054e6fa314f56a690a0a8bf3533237d0d4bce89f83cc7a955e8de3f9fc43"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "b36128139442da20bdda63bf325a12e6f7467fe8f1baf8a56a3b0c55c8cce45f8c5a629b25a97b12c86e10fc12cddc2edd9aeea651bb9026427c6486270d80a2"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "ec3c826ed484ced10b417320d50f3c0c9b955b71eb656b2469c7a3268d712579901cba904a789f5f6a2fab6d7707401ff1ea0e112a575091c4196d7bd178387d"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "274b913c0a5c293b45c622c360380560c62b19772c0d5616d46040b6330cc5c330177084f743f2edc2624c88bcafda748fcd3beae606adf7eafbc4711845517e"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "5af289d7d57645959c0b1f1437239e8ed989720c586b6dff7734bd675258f6876b467b2e4a29686ac0f703685e41204b702df758ea25410271ecad9d9beee203"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "fff9201e818d17b8ed453d272c5095625edac664555fc028efa9f08d23ad151d5aa22e3ddd9ee0eae9d0dfdfac27ca882107f12aa023741bcbd20be61e11c457"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "cbe561fbd504b14c59e5db745dcbf83edbb5bf1813f86888419d0dc5cab43bc700f96782c36d1bc8c8732311758209faee5d9755e872e626c0a6012e5be6e441"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "954e697b2400b93fc575c7336a613d3d63702e80a12617a9c86b08e294bf4dad54c2cae4669525e88ecb55a0c029bab028105659a12656f03ce2ba0f0a7e71b1"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9e27956960fb2154e8c4b895123ceb0cbc8538f3f4563e2888db2d056605de0612a629c66f3db9a9acc3db7032ef39b553a9791a11489e89b6485c00f0e1b903"; } - { locale = "id"; arch = "linux-i686"; sha512 = "bdedb03a25ec664c0443fa4e1e0d5dfa84ac5644e2a5dcefc67a714b71c2d18d9a38962e7ca2661f4d0d4d518d3e4eab51fb499efc32825a0446387cd22ed34e"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "2c18f2b919a64f540e5a1e59a430d1c710959711757e06fb38a12b67f0ff139ddde822ef7cdf5836a32d3bf904e56fb56e9d8d97f9d49cf35b67650be54e131c"; } - { locale = "is"; arch = "linux-i686"; sha512 = "73e866f713fc38ab7e56b97c985db69d49bdea2007c84e2ba54638f07433fc37a1a65a1189dd2b847394811e57ba8c767e20756686ec7fc86dcc3248168b110d"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "031c069a6c6dd79f21594dcd64801c9f11bf4e41ba8efd3b17020fdebae585ea746910c0186a5dcfb5a073ff33807d8324932e5ef3c2e04b5d35e24a714f2cd2"; } - { locale = "it"; arch = "linux-i686"; sha512 = "86bf4650fabfb9716d228e8449792b620a0692e3f5c6af19398cb37b1079cdf79f42795e16cd13c6ed261c1a81b7b3a23ba305299d03bcf1d716ee0ccade903d"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "5225af86242544e4fdc176fa68463c9ab03e4066ae57266f112aec179f7085b7621df7e46e34302bc3e3e30dc713eb45af568b86bfb1a4fa6b01f50fe677b5b2"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "401e4c7b9831f2a3342764b6a2de732c89fe5687ff1e611c4ba1b630f22936c0343b3ef5ec444925ccc68c8ad45cd98d67ca502c32094adb567bfa64481e82c0"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "7962eaef19bc5bdcf5f3aa9dad6df110ffed9b247d13dd61f3c4c170e4c854985d061847b84058bac35c16391821bdbbf5ed05120687cfc75c4baeba2de6f5ee"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "d09e2083db577b308a65d1600bf15cbc6cae7b5137c66782d922a28588803a58348f87df5b9cb2cf9ca00713d542d441c5947475b551c8d5d929dc6293c00a48"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "b8689c851b176ec82b73566bffecff54c0e6c85efcae7deb9dd542360fd7a0f8a6f8e53c193060dc36a98203ad7024a0c1d408ac2348f59fd9f3cbd591a17e5e"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "8d5bd77d3d5d1b6168b65458bbb4f2409c447cfb6d019fcf7f8d81b3d4d486203533d3acb8a59257e664296636ee5b192b237ebf070b37a729926ff11bd81090"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "7314e8138a913c7610227cbbf71d535f85bf008e09610d742d996be391ff4be0e9dd4daed8fa3ccf1e1556e5c66982e3f2cea0d34d76d78588fe9926420af75f"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "6b1cbcd9888b400ebcb4eccd416e12d09f29431a4afa3b890b05721d1c4108c35549c2f70800ca386f3b21c66b42be3d00a730d4fd2a4ba9c62069c92ab726f7"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "27f278b9f54b563f0aa907448eba04b4f84c9ab33eadb4737a662058e904e68baa481625c0303764ac7416cf5cad7bcf94a651db981fbcf94ab8e93625555415"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "d932296e6cc61c634ab09a66328335e0c6049e9d6ca660a862dce3cbe8cc0900fb3bdc0956b82c9f70f18f5c68c1f37acacdd7a3b8a697acd24df1197683aea3"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "010e833b541b1a9ef20d10a1678b7b25cf2a9268cfc6b6f0f1c1e5b1803bfdc4cd214b9e3a86132f1335531f107773dfe01f9f4dcd996262dc2c3ece491b36a4"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "b2ed20a973248031fb63b5652f6eea2c572c1fc2d8dc780db4cfa6a0450ccc211effc1d79ac67718b444f0247f8659d134586a0abe829df4090f65b1cdb59d93"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "5924aaeeb828464552b0de572ce24cbb94558aa30d599cb518d7dae74e6974d7da9ac5035c5bb2195fe826a8197907c29f02f5f0e83e36c84bb023b208fb56c7"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "6ac911f182c6c9b7e2617118efb76285136f0320d99f49401e5732841ffd846770bdd7ec98a200922536cfbd855debd037bdbe279b0f43e644d6e107afd73e68"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e16db609e60e4c79336e31d267af552124b2d2b62fac0066e0a84a6e48f082a46699010a9f2540df30ff5c1d4f8d481c4cfc4caea4acc68f50ab83f996105209"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "90217da5f30de60aef9da734355d6b5e0a93526e0d8f91db6c21405e2666df12d1ae37acb94638966b1bff6e3de3713c5243b683e4d321b916125ef89af42c15"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "b77b19d6c413a92ae3c0da43f989725b3d74fd9d7c1f343711ea73d5a10e4310f005a2d728fa708fcad3b281c5694964ab91966df00b2667a7a8ef616c3a86eb"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "d4ce84451941a9382d4fa6225b697e2bea2f72dcf76c72b779bd1e3d955803d7ad3bcbed47e9a7dafde72cd20bfa1e8616b691d275e1e390b2af415e0ea9610c"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c3585047b7b5611e5925f873e3a996142e9b73b5f5389729f3b609f3554030d39a988183f15aa2a5d07036fecc147cdd0abc02b13601a0e02e794c40cada5b40"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e28dce49f6660bea1f56f2515ae539701cc160956318305464ea6b8cf1cf6be21fa8b97b30b234eec9f7e5bc3987ed939b5eca50174ab148a988706f00a2ef0f"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "81a225e7d4f56b0c231d690b4da3f819a1549e8f5194cd6dd2da23d7909c24d9f5f9262e6bec5eee8701ce510980426c7d2612149c4c88da68f910cb7b046d1e"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "c4c724f0be3d6a1ada175ec87f840b177ab2a074d5ec858a49732ca7b5289a7d3b1e09b9d0e5c195e1e7565175cdef35e5b6e6e1a3344d7e307f9901e0ca1e6f"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "8e55f3b680a7b7d4299e59360413a339a99569af8c3a890cb95437c76dfd903f5fc60b6abfb3820e4dbd7d637015ebf8600f351f858022b535709879c9b0608a"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "cf91019d92850db3954690a403c13948f53d79574d874aa10effeac92d759d1b5e62cad9184f58c29b6e478903a4c6f4e27cc3e7e2457605332e361da5ab3ab4"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "ed1106a9855752c951f232de0946665914051dda0e9ded0052b4ef10b7f8d19ce3994165eabeb8b2a1f04009fb7909a48c79c484451335ee24541ab3eee52f4c"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "e3175d29cee4f253f7adf4f1d9b9826840e434d11d0c3f10fd9163f904ca315764b4943fb9d2c8a2324aedaac26047e95b6cf87c3218bc5b941e0b9a07e2b49f"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "62c15a60e2d600068273695f00e4d37416cd7c1804bbc814a3e0b7c0de2a3f23a03b4d6fa5666f25971b7726bd0cde1fccb40cde1e95522704c14252d52384dd"; } - { locale = "si"; arch = "linux-i686"; sha512 = "a94106b78937fa105eb254044f5ba808edb17b7b0f9b2b56ad918a48566ed43e181b652f4b4feb37d81ed749a5ecd9bd6997cfe6fd1cd7fc001567d9a888f582"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "974c8349b19e34e9262a98b44c691354061a8f802c8ce47609251023eb91a97096cc107fbd653e9ef9536deb81259cead57b5bcebadb602af8fe51b7e1224fc6"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "63fea9c688a89717b5626e407abf82e650916ede2f01189a54d33e4af366474b39383c2d64bde4bfdfdde3bfe767afb8677b1638b3b327c8a387d0dc00b1318e"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "96684db63e28088ca0d1f6c3bc30b3075ee2f135900359060add36a34d539132655ec403847acd4d7823bf80d6fb5f7ce7a0c618031b64f6af725a8b3c4c5a22"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "6279d3656f2b0a71e7082fd728bd2b551b16838263d7f83a32eebbb28e6d69df11be3f25db259a464428529ddf389f221048f445f0a0f34de1c263aca6fc48ae"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "c69e0ae0d72229c59ca0fa68789c1bdab1ceff5159906ccb27766b854b677328cb1c305d5568c058b93c4e512fd5b7f7626531c5a6f1655519f0c07ecc02308f"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "d63f84b4e5d8b9728e354487b243c3de604c571af39e43a7552cebdf28139271a8acab85bd1dfc6506e1231bb1ed49dc127f3b0400c9fdaeba2bf6c3ea78829d"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "df10b39b6cc461c2418d8b297fed5f7ce34e31a0892737b99076b11095602f250b7018af109555a0ce7959695e00c56835786a9ca10573bfca07d1f21af7dedb"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "57f710812a1f26212ad0cbc4a3506424d36d0560f5d7d17f8e01d7ed4836fb7a385753b17388b30074cd00985ce7edd7882cb5c326b89840cc816f0b5f1c19cd"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "88a92d428e32b7c3f63fc898c1c3a448ef3b78afde1334d86dc4e68819f05cb8cba9816e875aaf36f52f1f04c42f9833d690c43dc5eedff3743416a76d33f38d"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "f86b0d7fd4f5875dee70ec00efe7f4c99a59d34e877b21288c89f9d5c83d04b31eeafe7dadc01ee5bd91a76363dace2da86e5bc219909fa06d47c5351931efc4"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8994b908589746e5d8dc980b5dd06294988399be8e1ced10c6d4b3a6da440f69d6de7f101b9f96723fe55afdc21a7336c141058aa7fc70d283533e5fdd096b85"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "852a0132af6ed9d0c3da36025e0183b9c5bfc4a34af7870373989602059f05f6f5f779439c68ce577e6821295c2aa45135a2b90624b941c736089c391364e566"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "bf8332314c43a8f2709be4440e9eace27ce4ca097d0db7a25de99ac6447606fda297bdccd5d7bf865a964f5276f04371a022134c22962fa5743cc90f4e1a627e"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "e46e71d28a9bf4eefe453ad3841bfdbc261594e2b29322bc2e5cc072957674e1121c246d3be3fb56c84f64692d048f6792be526dd600dc85d5b2d7f5d2aaeab4"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "1c5d2d1f01129aa4456c166120ab21dd021e92bcd9ba9f4c1d2911699f856516bd9c9a5ae356397d117ae376fc5a44eb3b3880a2fe7e4f61a3b5bc581544f2b1"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "7b3acee5c624600f908ec6ff7e664d2414a3fc48208bd54baf0cf209f66460e560137a52445805ccfb410913f2ab8ecee30f4a702fbe0c8bf758bf89411d06fe"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "3b90f1a04c8922889182b81c88a071de2ff54f3524110739878e80738513216ba133ab973219eef822d7c1f605c1d2fa1b32fdbee2451e4c6427a27f9d25599a"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "bd37a54a586e91b29c668a2995fc37ec5b2e6d0bab5af640575981aff2be91e97181f5f89e0c4720979fac38b19530c056562a2c4a07c3b9868b347ea5f7f831"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "a571cfd9e0e43e9ebf5d29969a9af08c16c3fb44abad302207ee17018b105cb7079a0e3da02433264cddfc2da7922296c41f4d5ee76d722b07211c9cb78c8caa"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "6560d28c15ec9e46787d8eaa1fd9b20630828f15b2ebea98591e25123e5c51a90e12889ac2474467f9d1e3e41b88ae3cacc75ebb67391af0abbe18aaffa29a48"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "0ad5965f5028c7d0642cdbb140caabab24536e9bb386b6b14c59af52758e667a6217c7251445c462d3c283c72215a449545f06a1d176ad178a17ed51640715c3"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "a44dc60451845e27560ba41ff5a37446f955076e0da8cbf8ed9ffe06c217dee8847f57c6a58913581ccd4d4039b0f2b570b660882e68bd0e9050371cd1220022"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "17cbdb81577522510f7538d843755f09465700f558d164e6e292070859c9e298165e16c57e5c6db109be6b570666986fd506b60ce6b8ea6f983070c36c5b28c4"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "8db134f67ea813c12d97b0a44fb6169f42b45b8f9e7e151cb6389ee6628e301c95b5ca7492ec5c803cd44225b1929539e81c4df840bb533ef12740c4b9b82f28"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "b3da97b15b71aa536d0acdf08e9e980ddd1917113579db8c9058068bd104b3029c721bf1bac1c9ed56c39540bdb7fd667605259b1c2a8d910401259d2cb0e3e5"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "2e83efd53b191d7bee999fa45f09583c818377443b9bbf3203b7f11a31b67d371e34980267cc509c47a57b4a6540b1f7f4293252f02138b24869c29bfc64423d"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "9d9ef1a1bcbb32cf04e26ad499bf1f8122b3b1a964e6c4eb6726d2271fba28c78f0d7bc60641d8cc6c2a0e1153a25483a6f8eb12568128045f7d6cf5ed6746d3"; } + { locale = "be"; arch = "linux-i686"; sha512 = "21cf44b0eb90d3662ef690c56a393bd4453809631209c8953156a1b59b6011fce407c4b3d54d956e5c376f36dac663cd874b4c917f41b9132e445968fd7bc439"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "ce33a0750430a462aa07ad8995656dbf2689077746de8ee42ec361c544ccd53e182192f95f6ac755ee739035b5f2a2c8233ac1c37c0d156c4a2aabb39806039d"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "fe763ecd1a572ed6e3864aa9d934b821fae2f91f02d959e22e96314e26271a9f5695930a0388fadd6bd34e0f7ab6938a48bfd346901e139128e0e24483c36d90"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "935bc0f19a45314341f76cb53dc4c617a5104a0a17c56f60679974eaec9fc8d9ee609d543a5a310bf4d1e8db6cdc54b660db5b2b85af7838dc5711e10ecff77c"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "d9bdc81c10d1ef370275d3f152669ca50a7fb2b126cdd396d63aa8b7c97a46d815b1fa77b8135887b0f6c825ba87617c81e1f3698e455d75b2bc9862e47fe761"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "0b420e4168df1a0b7ff8e4983892de9b08cf644a6e7b28c090477b3efe557a7a34a17ac90a722b497298759d98c1a3346ff84789598359e4052a35b44b3bbba2"; } + { locale = "br"; arch = "linux-i686"; sha512 = "5e0726512ff28ee00498a4a8493d4f00e8375950fe8489c3e5906b37bf057c76eca66ccea8aaf7e165ca56b02ed14041efcab8b75170ae4daa2b2df2bf2ddc8f"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "1240f62d8a0530ead4b19983a36bdd894b5f812c82b68c49a4f7d9a961e0ff2542244ef405e03bb281ec65f070e815246487347a99bec76dd3509ec4512c1d47"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "ce79eebfe0a93a9e15237317fa3dcca6fd6f20c90adf431366e5d30ce026da0f4af4e1be0745cfa6620b2a75838fbed93a85ed0695c486eb46b58cfb3cea3571"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "f290ac184b7086349a173b1597341731b6c696c8806b3b5adb8e7f0121f298ae9971f8f96981662bac72079f03d7d2ce17f0c385662d06657a1519d7bf32ef64"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "a06b8a0db00b35ba16541a72623fc764c87c45e15e69079b757449e9c67988764f65bf6ae214ac4a0c0c541549fb6fb48bd1dbb2efe02541e3bda12938e2d787"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "b96dca42026adb793ab5d37544d42ff8d5668adbff6a94f6c37a33ea63eb87622a7eeee8c02976b16c1d8c38b3348387aa46daa2bf5ccfd66f2a176ba4c113ff"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "dee0395f80b3e0db7b6cedf3d7e22b574f3f2734da518db684ab8ddfb502a127d2e0c75849819638ea61fd8604b84f8b1118c036d8ffd5f444ebd8adce19fa2e"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "8162ba8abda1906ce0fa78455faf823ce4bf6eaab9ecafa50b5669f2485861f59fe2be3820d75d7f168432ede5e9ced170928e883ebd06f8ab3145065f31e610"; } + { locale = "da"; arch = "linux-i686"; sha512 = "f5bee461d1e0ba0ffc1de1fee05d41d0aa9db904061a7e4947d2a22ce8e3eb9ab40e15ace81a9cb248f72b5c08b699b39b46031f5673045eefe2e3346e7ae18a"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "dab187762c44a7092136d5b12be43bb3675c37dbaa1ffb36171e9cc76ffd94fd0f80872008bd686515f0a84c3adc9c36d5eff9240e871dff457145bc21981777"; } + { locale = "de"; arch = "linux-i686"; sha512 = "35994979446f4bcf5a6b79875e84999188d8ee58143b741e583302b29c0619566b5d4d65e640156168974e4c59c7d454ffeac47a8aaf35c344bcf2ec44520334"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "ae7169f84c945cd7886ef0ee84a1e57cb3017ad89b991c0f8dfb36d5537c2d9253345e111916a234c228a99e153c9d8c2f5bbb61e3d4d5fcbe95f507d863b735"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "1b10d6c4da26452c89089c2938db3559cc46c098baf917ebbcfc1d107bd9591630749aeae87a5b9e8819ebb5e4ad2b7d5321531bbdc3045df604e3929d2d6d93"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "c6195bdf00e05921a19eb37a74c34794cb08d8b8cd43609eed9f64bbe89788d9c87a45df449cc400e6cee31b7ac6f02ce57083581c85885acd620931c657a833"; } + { locale = "el"; arch = "linux-i686"; sha512 = "e7d7f38fecea77d93bb99656a6dd566c6f396e108910152917cd1c908f09d1f276385ed771d5500feac572356e688e43ab3a91651d64bd7d522db9daaa4f32ef"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "bec617a64ce06f7aacfd936cb85f29684d1afc4246c05f1de6bf1e11819a44eec0e395a446e64676fe6453ce41f173f938a845fb50a625e3f5bb325098e09d11"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "c06fcb56eafbe894e15a0380f49ce5455c95b2b6c9520ef3b15f699778a575e5c643db5797e72441a68e063bce0bd4c0003cd0b58c78c7d1a744223598ab3549"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1b095d5e254c2eef894b9954f42031b6e7eedbf0c753ac3e9f7b51b152dfb9c21d90ace238fe5bd58c63292587e477d23121dd0f96f7489b7564ae1bca27eef7"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "7561111abeda21de3c4c9f585528ea9fc76409b15c0679b22743180f3b987aefac19ff45a682519511e347b0881e0f924f4efe35a782ceb4da9c6af05132fb78"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "2beacec69acea8bdc98b5a7df5111318c6b47bbe1bb4356d3f9a2ce3b783ce6fad01a3ef11658c9d24d89e5c3f3e5c71de6b6623e93187d1221c25d415dac3c4"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "c6d1fc35bb89ed23b5f4e3be2fa6c28c3e29a7e821be1ae79345bb26a6db1ecae67b27f7ac9d3bd5bd803b6c7613aba3f0ad35cb07b607c1030f84a365da2b2c"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "e3c95879782c17963e9f17dfde11a416502bb89d5c712ae445bd476e1bc1fb76bb0716764150b2b1f92ab8487d736c39f29ceb023f226b92f8c07bfb7da8e76e"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "3f8f3263650fd4722da121566cd9afe8e671005eafee26f550a940dd76b1ed02c3f34f32f886c2cb2e2b1ed029f9997f2686a2494f4b24b6f32a7bcb8226f6aa"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "587ca874ed5e035291099db107cf29f19562c0adb785c33ad92bab9d5eac2f2615143b5587bf7da7df61c071995eaf7894e5733d2fb311ffa14671c14aed54d3"; } + { locale = "et"; arch = "linux-i686"; sha512 = "a08b99a3e444135d538f3b53669a2f4e900f86406e74076a2ca986c7d9bf55661aac248fa564eda3b6bd491cd284690da9c61a56a43f2884167998a10b666785"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "97043053f1512e6ac7298208e219bd2cd8dd1abd403ecbae90e365aa69b098becdef3f6cec9998fc71b237d78e3b7693fa93cf9452317bf1f4793425f23c0b5d"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "2de3d5915801e62196339e6acaa7f601740212a59f4ec6c684cb40c830bc6fdab843b3497a168bc6b2889f80449900406c05cabb3ba656d7d6b0be5750a31aab"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "834f9e712183f14af927ccb719325dad1a7f778d7d3beeec87cbb559d039b8764efb9447b8a0e40eb0ad55c88b525e5bbc2e2f5729c11b173ef86f63e4f92974"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "b8b1c42b3ab0a365c9a478fea0e83ac49b709dd2d117c1d8ed6fd7946b5dd32a1d3907b653c5aa0fada4ba8cc365ee9fc723fbbed76219a7c5d4b70eb68dbf65"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "64b5bc313fa64abc56961b0c6abdcc6fa72cd321f422857fece9bfb3673747d5992d96dc9d98a76c71148b6261ea9a750147c94f171c548170c0681d597d8402"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "45e7a37ac6c18d31e834b88789d6039bed489bc1cb4601399b3cf76feef52c3c36249e297750d39e3e3071c2d90a1ff6f0bcfef8bec89997ac552cceff88e78f"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "02a31ae95b6a6dac76eabd8e1de27ff50f29725be221841a738f60e41306d39ea050b73f78105561344d042ed988955e1801b5379bcecadccc89481c3bfcc13e"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "bc14d4d16f0b196eaf92d551df6b565bfdf56806dc97714e97db7fd201c6e4e80df0485f77ff4bc5218b8c2f96a01a39f87c6c3e156c5c0cd72a8b932248370e"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "025411d23fae36123a86b72818b486412aad0f532631e4c48da5dea9b41d7b2875aba463a4a721e422cc4b141c8cce155dab01fd7056dfbadd435cd3e3061f08"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "56d20e9bd013dea41f8686f7ab4da48b1c96e0d93c7639e990daf174cf7c9313ab659eb9256f8ee52adc9659d6ce766921eab1a24a0f963a8a8dc1d614ed34e9"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "1bd36aababa4fa8e47bb62d9a49b2a5303b5b0404f5ea370fd4b6b152327766a42bc6c15a85c693aaf532b9c3aa8598911e313a861d3eb946bb4ac8d0642de6f"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "bc0f98937cb2c2ef98ebf6625179f77d36d12f6c95eb413cd570f4b3a9fbe733888b57ef946fcde2daf59183291a8bd1258e8c7f80b260e6af3138c8b83117f9"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "d2729fddbd4db455b1f2b738d9bbd6d155db664c01ba6617128728caffe8f96aada8b02d49fb1b90695c4bf37db6960f51d6c074b5df94ab4e74996370679d2a"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "6306be1026b9127e455a3b0c720f7de495811c3bfb578090ee33d8b4200bec3390c006767d45ce165b57325f1c41e98ce078cf78bdf0a2e9d0bf5fd704cf8374"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "cb977c4f60041ccba81ae9708b381d8e073c2041104549973f33695d6f08663d23fc9dccc112d6fd9e4c61847211ecd2b762b81d842853ff80a7b813955295c9"; } + { locale = "he"; arch = "linux-i686"; sha512 = "e39c70ed7711a4c7c5baf0594917e2727bf0d081f9d38d2f0d539e557fa9c20e639c3e98ef8926cdc9f57ffee2c4b8896b044bd1fe9aeca39e64af2b56e35dfd"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "86ad9d155916dbf7318fe054286b8808bd6072735b6264db61d51745abaa975311776d9a15da13b9f6c536e78714501f1855291bcf59b49cebc047da112fcc91"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "e82a125725373a5fcadb4ad010809fd307f5caea4bbdb428cce3c267da197bc73355f655397283fc6bf93838ce41896b7d6dd1174fc56526a04b61559babf42d"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "ba8928e57b1eeeaa2b1e1b95ef87908247695b09d3f7220113820cc13a07223088a1c0468e362488b303a60456e2d63c631150025715d3a4b66b6a6204e31c9b"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "276a97640f24aade9d0658529e13d4e50b70bd5e98d30c43d7af6e0cdb368d3a54ed9365aea9cc03bef6938bb3c7dc0649ca09543278538fea5dc24a15ab5072"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "ab527b02bc792b2fe2a939a82b5ef4797f7ae94144a5161e11722d46d38da75203139faa85655248e4aba12090d79a46a0db0310b32ec0db02c4e68e932f0d2f"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "34e1f7e790deb7d4594f2edcf6ba1641730bdb6ceb72fb08071daed02713de8ff6931e3986fb3125646ecb3d2f299e5bf5028fc0425ac9790d57d4aace9e81f0"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "e7df1f64c41110d56959237555ff3a066b8d503f28c6d504c7080f3af2548d5ee66a60771872065222db57624b40d1a647aa278f89c04fa3c520730147227c83"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "356ac76891199061fd4698c51903ddc7e92858252a6ca502543b0403790b9b80ba8799e847a00331f19b6ab56d2e3d02fac79ec7b5502ed8227c5abd82ad3fc3"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "410ca6dbd22d870ec4d74e0dc19b65009d860e93b905dc43ae0d5086f83ad1dbae81d2213b0f39afbd5e428287d0f35e5c7b923df594494e66fcf08d4663cf82"; } + { locale = "id"; arch = "linux-i686"; sha512 = "ddab3b64afba2862a18879845cea3945fd3a34295ab07e5c7f53435ef8af005fdaa3beb5fedbee27818917a320fa5e1d1cdc618ac1767db9ceb1bf3c912720b0"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "4b26928f579b56c965992b4425a9af6d85fd7a288d699942448ff8f331833e53625f0d48e62794356ed7056ce75d0efa3fcce3f3be9acee099060b4c5a20e281"; } + { locale = "is"; arch = "linux-i686"; sha512 = "8ad9065d628cddc34fad8afb5477edc2ecbac7add4162c87e6790bbee58e8d40e40b087f879fd09a44f180b30e3929bcfe2ed268fe5bd549c0d5c011be7d974a"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "f2a14977d98e0e7575dbe1f3f068472bb90d25a9c333ed191ee17fbf647b1c47143136ef7fc1871bcdbf3b55c2d414a05a119a7a2337b9cd05f039d74915c727"; } + { locale = "it"; arch = "linux-i686"; sha512 = "18a3951092f38dded053b25658da79188aff3a3dd6e008f269b0b4c32151f7d2d2483932145ccc50c6c9d199af94b43abde65b61e8b1093d9b4c52692382d8ca"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "f834a9ba6f6cc2745d4e54eb73ef174e913009e82e989d1386e8598f9f83c32fa65de6902de641b62ebbf183a25f0037d119bb61884f3548d8f425fa63c9f5d0"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "f91904e585e30ac18e4065046ec184607705bce423ea79aadbecf32fa0f9f598a439ae8f955e79389c411f0836dd6bcf9a74e1e78cb70471a3c523a807e43c41"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "3052946955110d0f1df66df9933079bbe0b0247f9eef0a07c02c43f6463055bcde33e27b7ec1beb511e70f3b524d55ab404a0be755599f9e15f1902b4eb457c4"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "e0f79d30960bff54ee064ae381dd89b877c2f5055424eaf017382f6b2d1d0b34544cf3d88fefce8f2e294e84477e5109a17fca83083b0c5602ea5d0eec7b9c0c"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "ce515c74e7d69394f79ff7adf6ffe2118b0dc76f49672f19cbc299b21705ba18a88c6780f88bf28bcbf208ad33914da13031617a20494160d771ec09c10a798d"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "f9d00ec17abd13d575d651caad02e1a46adef760ca6b706df31708375b7c721f3cfd1d99964cc2e16615f5fc422855dba8fa722d57b355782dba1541cf32e1e1"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "2572ee32695dd0abf10a486453a3ca9d7fc26e88993a374677fb5f96edb319a5ba2892d8f9a236195ecd8199a7936d3969830571411ea35a8dc1f229089595e2"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "26db6cf82400b4a1bff5747d4e301c46f3391b97e28b64716e2b2dcfb2ab2da583142b487f90fe0798bee3cdf49d5965b9d9b124e95f1d65b32c9f84c42a7ebc"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "9b83eed9b3e93a5ddf463aa631bb4905abb8e02574e1be8a4cc9fe5cea7f3aee743b0f570a748fba67adbf6096a8443378ddfeedaa9cb0aa8f072dadf906929d"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "ff00b25886df3a9ff0eb9c4c9a1b34be21edc69ac20f0d994b9dd9b0618037c92c15ead664b071d09766a0e764acb5e118185dc3f08c42f2cca62c4c70fc8ffe"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "6796f4f3d1525a3b617c99eacec76c1cdc5c8fcadc39120d1da052518cb663093c695060b37120ea6337e21b9fcc20c5a5119878ba1068553772f2d8ed89db32"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "ab236204028e79bb98e78b2900b434f1237e407e864d346fae975d123fa87e727710e41e19625b6c69548497cd9d7716467dc01002e4ff6025301a141125c723"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "0544c952ae8fddf43b784bab00aa9d4fd05566e06b9df15990ea91cc65aace6066855a8bdc3f6e6eb01e2a7030a49df67962de4af8d9d84d003cb2553af71006"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "618d3e621bed807521f4b933a44e8e87b38b2843a5f85f59a83a60a3df6e13a96d1b3c250a9d77200b03be69116cbdeb33c7e2e2b4d02b8672ab90f0e303dfe3"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "226844283b3aa5dd4f224a85101529099c8fde81aed5d354b685953019b27d445ac3347f642ea93145be4dce328c4f1711e0bd21bd9f5a2b97e6b822130546cd"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "4ba51ed645292165343bd104dc36ba0126435fdc06764e587379ed4de6a89a9f7711890f5f12f6176851ffcfbcd267cc1927b6e8c2a710d505cb3bbc7120209c"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "2702db95f2e166dd5097ae7c2c83fea39f666a0a9e811e7876042e6b5ee0dcad6061fb6b6950a2f8fd8f97c434476155b8e2a306e1fee5cc54100e2d2ec7d619"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "ec7bb46f323030f180bb7e83b40e421a245ca4a1aec5f548a2bde1796db00fec415889cca836394b172b1923638e61eba4b71f56bf8aaa55b902deaa7f57842e"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "48406e53ba5276f3721cc5a9af825aa48215862134addefdb136ccc013dc63ca664baa820c2f34f4dd02e79e747bcd4ab73b59ab71773f05c5fede7bfc005745"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "27f8bfc56044d000c8c43c759c16c3eb891a0d3b6aa4d62a18477a3dd816f0b67e899a1ec375376ee83fa97d0d2d836fcb5b1eb3407b09b194600206072d6c49"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "7fa5298de1e5128b4895491d99ab5222f23c1e36e2f07582b6e970de95f45b6ae89a8e4a03b394d0910129ca16be593a47217124b1619ec567ec9d470fe78100"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "2e25f6ed8e9c92a888c9b2fc0105d5912a9b85fe438c8889728d5522aebf23e86655af2066046e9ed0ea232a59d19b4affe73fa14d4e15af7cb337fef4438b49"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "c2adc7519b2a6670e7c0e7190c6788a5c5c8882b86bbd58c3472de51e958a22126c575413b6a604eca737d120b1da1863f35702f65220bb0e7f81e4deaa21587"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "ac7c8df9f06cf03c4b91e22668697bc74fff7dfa2edbf6873786e98acd5bf79535d8ad9a913811ed3567cb7e4427a8b3751a7adb011bd0567e433064e712be43"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "f4f80a8b25410b2a48c95dad316fc98b9f5391f08d3df699628b4bf9e343d00ded9cd1ff71b0d5e441ffe6c6a2edae29790a93b5e2117d7343a537d6cbd0738b"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "73009743b635761c1ac5d588837084cfb7041f639fc81646d2b6ad7bd92be5d7f742562c8c5522248f20dbca7fd430826617ae706821f107911303d416cb5f4c"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "cd2dbc81d761077f4fcff759dcb2ff02ae0e61b0b91007e7514081926e9f3cb2bcd2e65fc3ca44ad5d07caa4e4bd9e450feb25bc184f8c136ea3aa6cc4d05968"; } + { locale = "si"; arch = "linux-i686"; sha512 = "d5a416aff2e5fd3b294d8028ee6008c9086b9c5fdb15b52b8810e9e623865b946d46e1b812849ecd7331923f7e7ba01711a909396c8676db917b2a36f7370504"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "8284411d705c804fb0e90f7358e79e0687ef892342ed06c2030803d07b1a901e7f1a6ac2acb375eac10566b1885826c4fa187d3517a2bea35222bd2604d3992a"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "c905adaeca4c3daa57cd54d9a7ce49762e4ab4d32594dffcbf5b9d581409a9f7a0eea1abb51ffa94c35433d20cfd0be3baa914d9821e8f754cdcdb80de7a82fc"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "2741ea21d5714836116595529f4e240accf95ae1e549ac4cb083669beb20d40e7fdeb7805a836ada5d4310e31d74c8bebb1cb5c8f48b3fa585edfd880109b2a1"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "b61cb4971cfd9701dc8aad80848e41bdd399a53fc3282d72e7a866b782cebce928bbc163d2557c24dd0fa3f51f2d2cc40e27fc578d39392d00c15ad08d0df3ad"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "47491dfb70268c3ef00d4599e487fc2af35277de2746a106f59eb1b0813a4201c1e3ff735b0d7b48ea23bf3aac18fa1bb8e0c7948651e421f2677b988633e3ca"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "7773088708cc1ca1c115acaafc2d1456b854a413daf9622c2d267dc33e8a4727b6836743c9cfaf8c5694c729241e317a53b8411e37b8d4f94b67bc02c2878e41"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "db776cedad7842e02a87347e2f97aa5e583e2d1e2859659032e338b5c855f24241a4a1950fdb3a13b6dec643a73a7cb5f7e527ecdf50deafa5138c9f273d3408"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "e9eb4827e12db0173643bab8ffca55d50238a1184a2e2ae3543248400f39685b999a068ddab523e429c2667f2966e4a0a09c432837f5e852065459cda67e96b4"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "a38c5f80c0e6a442d035f7b4c18a350421948e9246ac65389959978cfe51f317644c06ecc567bb09739bee0303e4e2b8920bc7903900eabe92ad244e20370345"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "d7692def00b3a47e86fc01ad192a610352a6c958e53d1b2e4ac6d27a017643e2c0e9887a173268278b9ee7d2e3116368a8dde4d2fce6ea9b56a2bb3963a31ba7"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "4656a0d46d358476fcba3be275740a289d79159fa346f4903cac0830341f9a630f1eb0c007d8429cde47821c441d01e792634d32d6e7b94f1bb2c94f18a56563"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "d6ed8ef83f1d4af62a5c2f92c791822d1b711ed4a51d9656c0e73dbe20510efe017f615537c892b43e43a5503ace92652faa5fa5f2d9956349386fe784fe0dc5"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "7a994549f4f8c33b185d094e5d207942b62bdf983546aec357404b46e74ec0b790c9b83ffd3cf3687b5bf09457cdbc14593af30ea425718baeb5ecc5703ec15b"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "c5833f7c43919a842f7b840a35ec8752401c24c559d620cdbdc83e70d77e5fbb5a364e44ac3c5f1f1339d9752b9a9825ac0e00d314aa9025760800fc4fc3ce18"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "f1338235583f5888fb7bd30c4c66341bf7ebc4a771e76571e22a5ef445398c9d2ced0f2f93d99bb2f180fa73a4a1f3560616570c8711e54d40a9b931e5eeb4d1"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "a40710948603a427c098619be1f203f2e7182eeb697de2b1dfdf824e556353b133839f0e5ce929fa9e31e70b1f248053bddeeba394dfb74e6c747aaa537d1df0"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "5dc6979da2242e45c5ca8a4ca50dd2858c1781256e5b2a9b8bed84e1b2af9f98e5ddea285e49549b3afc1a98df2ab89d74c99a6082309f0150ff426c1d9449c0"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "fa795ede70edb6c6237502cde8acdb7d5573db1d995d5e96f274b83f8ea0b827c37a5bcfc74b4aa99f1e15bf8dd68e30d756a0bcecc9e5946c2c5e275dad29bd"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "de8a0e22cfc727ccbc460a26a0cb80985c1957da99b050f6f00e4b20b050ba605d815577d392504d0a5e53ba4e12045f3a9a36626ed21682c493259fe0400ecf"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "381d66fc71d3f03f979ccd76aef75fdcf8eb2e182b4a0fa81c08976d195bd696d0213482d40ab365f2dad594587ba8359df4db2cf8febd8d724d5c50f3ba72ed"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d988114967c4656a13fa3fd562166e7444811ce16c5fc2af06619a47b941b8e07de0993a5593f2e5bad22ff6e856e969dc4cedb9c8df0f532a807e4a30b0c2ef"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "097a53d990af79e54e445e05c35fc08c86c0d003a04c48daadebb8dc0bd13f57072a82da01c3ae293f4a6766b3e2082bebe12bbb2a8c2f1c7d8eab23eecc2262"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9d4dd9e429623009e21b41383776864804803affc9837068bbafd7507bbc5ed70362582da0adb5c811d21c068a96bb4725c4581bf81ac0acb3d57b19fdb4fff6"; } ]; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fff0bc5edc46..038f4cb1a739 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -104,7 +104,7 @@ let "CONFIG+=no-client" ]; - buildInputs = [ libcap ] ++ optional iceSupport [ zeroc_ice ]; + buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; }; stableSource = rec { diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index cf1a8552b25e..05ec51d66814 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 82e0cce47d66..49b969e8f6bf 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Open Source Continuous File Synchronization"; license = stdenv.lib.licenses.mpl20; maintainers = with stdenv.lib.maintainers; [ pshendry joko peterhoeg ]; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 56fbf20f52d1..9cac49d5189a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; }) ]; - + sourceRoot = "kicad-${version}"; cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON -DKICAD_BUILD_VERSION=${version} -DKICAD_REPO_NAME=stable @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { postUnpack = '' pushd $(pwd) - ''; + ''; postInstall = '' popd @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { make $MAKE_FLAGS make install popd - + pushd kicad-footprints-* mkdir -p $out/share/kicad/modules cp -R *.pretty $out/share/kicad/modules/ diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 3bc1441212ee..e833b4afbbd2 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { cd src ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index fbe509675a14..517602bb633e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; version = "0.5.0"; maintainers = [ maintainers.dochang ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index d08907b59aa4..395541d62503 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "09biddxw3ar797kxf9mywjkb2iwky6my39gpp51ni846y7lqdq05"; + sha256 = "ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 22a5245ec40c..e3d09adba57b 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mplus-${version}"; - version = "059"; + version = "061"; src = fetchurl { - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz"; - sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq"; + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + sha256 = "1yrv65l2y8f9jmpalqb5iiay7z1x3754mnqpgp2bax72g8k8728g"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix new file mode 100644 index 000000000000..492a4627de33 --- /dev/null +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "maia-icon-theme"; + + src = fetchFromGitHub { + owner = "manjaro"; + repo = "artwork-maia"; + rev = "23235fa56e6111d30e9f92576030cc855a0facbe"; + sha256 = "1d5bv13gds1nx88pc6a9gkrz1lb8sji0wcc5h3bf4mjw0q072nfr"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + rm icons/CMakeLists.txt + cp -dr --no-preserve='ownership' icons $out/share/icons/Maia + ''; + + meta = with stdenv.lib; { + description = "Icons based on Breeze and Super Flat Remix"; + homepage = https://github.com/manjaro/artwork-maia; + licence = licenses.free; + maintainers = [ maintainers.mounium ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index 599815b59a70..b6ed62a29c81 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -46,14 +46,12 @@ let ]; inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 - clutter-gst clutter_gtk; + clutter clutter-gst clutter_gtk cogl; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_26; - cogl = pkgs.cogl_1_22; gtk = gtk3; gtkmm = gtkmm3; gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix index 9a08b58e1ea4..a1f9d0d81719 100644 --- a/pkgs/desktops/kde-4.14/kactivities.nix +++ b/pkgs/desktops/kde-4.14/kactivities.nix @@ -7,6 +7,12 @@ kde { sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7"; }; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index cbfe2ebf6d53..a66d189a6007 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -1,5 +1,5 @@ { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio +, libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib }: @@ -18,8 +18,6 @@ kde { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; - passthru.propagatedUserEnvPackages = [ virtuoso ]; - meta = { license = "LGPL"; }; diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index ac62c970eec0..554d6acd9eb4 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -5,6 +5,12 @@ }: kde { + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index ec57c908dc58..c7c8c250a838 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -9,7 +9,11 @@ kdeApp { name = "kdelibs"; - outputs = [ "out" ]; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; nativeBuildInputs = [ automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 6e4cd9a9c73c..e6f98a121946 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = { description = "High-performance JIT compiler for PHP/Hack"; homepage = "http://hhvm.com"; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 2dd3a23d7668..b05496eabf26 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation { buildInputs = [ cmake libedit libxml2 zlib ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" ] ++ diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix index 4360ec9ad1b2..c502b0e215e5 100644 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ b/pkgs/development/compilers/llvm/3.4/lld.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { buildInputs = [ cmake ncurses zlib python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index 540faf01e079..cd498b5cf519 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { 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}" diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix index 2e0018c34c20..2fed0fc8abed 100644 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ b/pkgs/development/compilers/llvm/3.4/polly.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { buildInputs = [ cmake isl python gmp ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_INSTALL_ROOT=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 42ca4ba70e4d..d11259c82f07 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -15,7 +15,6 @@ in stdenv.mkDerivation { 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? diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index e7018eea3bc9..476fc7bcd43f 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -24,13 +24,12 @@ stdenv.mkDerivation rec { 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" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index b1047f8679ec..7ee90818ac99 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { buildInputs = [ cmake ncurses zlib python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 1dad5227d645..8e7c8151df13 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { 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}" diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index c943c790ea22..42b3fd74e6c8 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { buildInputs = [ cmake isl python gmp ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_INSTALL_ROOT=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index ff0f34391af0..c1d0cf8062c8 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -16,7 +16,6 @@ let 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? diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix index c02c75ac02db..b07b8eb35fa6 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { 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" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index cee99bbbdea6..207971b81727 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { 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}" diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index aa71bb68553a..6c1a89cf60a9 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -16,7 +16,6 @@ let 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? diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix index 00bfb3518b10..62402142a129 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index fe69130e71a7..acd4892201a1 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DPYTHON_VERSION_MAJOR=2" diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index cc6cfd64fd08..8128bfd23925 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index f10dcb6784ca..deeedaad5bfd 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index ca8a74c28bb6..d578d7ca70a4 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index de9339bb8a28..1036e43ea941 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { postBuild = "rm -fR $out"; cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix deleted file mode 100644 index 730b3b569c61..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "7"; - patchVersion = "79"; - downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "1hv9bmj08y8gavhhkip5w5dg96b1dy4sc2cidpjcbwpb2mzh5lhs"; - sha256_x86_64 = "140xl5kfdrlmh8wh2x3j23x53dbil8qxsvc7gf3138mz4805vmr9"; - jceName = "UnlimitedJCEPolicyJDK7.zip"; - jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; - sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; -} diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix deleted file mode 100644 index 311f07e8e45b..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "7"; - patchVersion = "80"; - downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "1fjpm8pa74c4vgv93lnky6pd3igln56yxdn4kbhgcg12lwc17vcx"; - sha256_x86_64 = "08wn62sammvsvlqac0n8grrikl0ykh9ikqdy823i2mcnccqsgnds"; - jceName = "UnlimitedJCEPolicyJDK7.zip"; - jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; - sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; -} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3e660bf5b500..788160b5888b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0vnya755gn1xqjf3crfd1fn9rjzr7p5pjli5mbaxy4wi6za0j3xg"; + sha256 = "0xspp04y0l0yxfi1zyv0qsj9b6px5i88xpannwpc45mkj6nplmja"; }; patchPhase = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02c7b40485be..8e5415ca4ab8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -971,11 +971,17 @@ self: super: { }); # https://github.com/commercialhaskell/stack/issues/2263 - stack = appendPatch super.stack (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; - sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; + stack = (dontJailbreak super.stack).overrideScope (self: super: { + http-client = self.http-client_0_5_3_2; + http-client-tls = self.http-client-tls_0_3_3; + http-conduit = self.http-conduit_2_2_2_1; + optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; + criterion = super.criterion.override { inherit (super) optparse-applicative; }; }); + # Test suite fails a QuickCheck property. + optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. @@ -1008,4 +1014,7 @@ self: super: { # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; + # https://github.com/fpco/store/issues/77 + store = dontCheck super.store; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 64e6b3c3862c..73dc41fae3d4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -262,7 +262,6 @@ default-package-overrides: - cabal-rpm ==0.10.0 - cabal-sort ==0.0.5.3 - cabal-src ==0.3.0.1 - - cabal2nix ==2.0.2 - cache ==0.1.0.0 - cacophony ==0.8.0 - cairo ==0.13.3.0 @@ -1613,7 +1612,6 @@ default-package-overrides: - sqlite-simple ==0.4.9.0 - srcloc ==0.5.1.0 - stache ==0.1.7 - - stack ==1.1.2 - stack-run-auto ==0.1.1.4 - stackage-curator ==0.14.1.1 - stackage-types ==1.2.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 587fab177056..8cf9836fc45f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14772,8 +14772,8 @@ self: { }: mkDerivation { pname = "SFML"; - version = "2.3.2.2"; - sha256 = "b61578cc1bc95554aca715ed0ae15eadf89dbf3fe49866541903d384387fdf2d"; + version = "2.3.2.3"; + sha256 = "a8d38a6be04c8eb31c6dbf889e383afb25f7a8bb29b398ab948d6c3d773391b4"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ csfml-audio csfml-graphics csfml-network csfml-system csfml-window @@ -25703,11 +25703,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "atl"; - version = "15409.2"; - sha256 = "0273021bd03c2210b6dab28a24ccc6c16a14c365d7fd0403ccc00d3d7207c2af"; + version = "17072"; + sha256 = "3aee6a8ddfe9d9b0db710889fb49b8a08662ee3026153e15ca83100e2a34a07a"; libraryHaskellDepends = [ base ]; description = "Arrow Transformer Library"; - license = "LGPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "atlassian-connect-core" = callPackage @@ -51005,6 +51005,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "dictionaries" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , data-default, directory, exceptions, filepath, text, time, zlib + }: + mkDerivation { + pname = "dictionaries"; + version = "0.1.0.0"; + sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab"; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers data-default directory + exceptions filepath text time zlib + ]; + jailbreak = true; + description = "Tools to handle StarDict dictionaries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dictionary-sharing" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -52753,6 +52770,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_6" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.6"; + sha256 = "148342aaca67c4c6f4a7c15bc50eb13d7f145943277e6f55c1a455208531c0f2"; + libraryHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -54432,22 +54473,23 @@ self: { }) {}; "dynamic-plot" = callPackage - ({ mkDerivation, async, base, colour, constrained-categories + ({ mkDerivation, base, colour, colour-space, constrained-categories , containers, data-default, deepseq, diagrams-cairo, diagrams-core , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens - , manifolds, MemoTrie, MonadRandom, mtl, process, random - , semigroups, tagged, time, transformers, vector, vector-space + , linearmap-category, manifolds, MemoTrie, MonadRandom, mtl + , process, random, semigroups, tagged, time, transformers, vector + , vector-space }: mkDerivation { pname = "dynamic-plot"; - version = "0.1.4.0"; - sha256 = "7b67a4433324a76e2a6892cbcb9ce2250db09dd32583d6d29b63161ca954b18d"; + version = "0.2.0.0"; + sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528"; libraryHaskellDepends = [ - async base colour constrained-categories containers data-default - deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib - free-vector-spaces glib gtk lens manifolds MemoTrie MonadRandom mtl - process random semigroups tagged time transformers vector - vector-space + base colour colour-space constrained-categories containers + data-default deepseq diagrams-cairo diagrams-core diagrams-gtk + diagrams-lib free-vector-spaces glib gtk lens linearmap-category + manifolds MemoTrie MonadRandom mtl process random semigroups tagged + time transformers vector vector-space ]; homepage = "https://github.com/leftaroundabout/dynamic-plot"; description = "Interactive diagram windows"; @@ -55115,16 +55157,13 @@ self: { }) {}; "effect-monad" = callPackage - ({ mkDerivation, base, ghc-prim, type-level-sets }: + ({ mkDerivation, base, type-level-sets }: mkDerivation { pname = "effect-monad"; - version = "0.6.1"; - sha256 = "884b7f1b26767329051ca846ad20cef871decd992f63c2d7d50475b163d3724d"; - revision = "2"; - editedCabalFile = "5cb34f683ee8c60c89647fd5a283cbe4b640a596cf2608a937a0819503e3b3ea"; - libraryHaskellDepends = [ base ghc-prim type-level-sets ]; - jailbreak = true; - description = "Embeds effect systems into Haskell using parameteric effect monads"; + version = "0.7.0.0"; + sha256 = "de9dbb8ee23595510e3674f090a1e066308f64174ef03dd99a5c75070d825416"; + libraryHaskellDepends = [ base type-level-sets ]; + description = "Embeds effect systems into Haskell using graded monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -58251,6 +58290,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "exp-pairs_0_1_5_2" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix + , QuickCheck, random, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, wl-pprint + }: + mkDerivation { + pname = "exp-pairs"; + version = "0.1.5.2"; + sha256 = "8dadc2dc4b4f666c9fe70068634a1eb07598943d6ace86560878ed8ec0aeac9d"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim wl-pprint + ]; + testHaskellDepends = [ + base matrix QuickCheck random smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + jailbreak = true; + homepage = "https://github.com/Bodigrim/exp-pairs"; + description = "Linear programming over exponent pairs"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "expand" = callPackage ({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }: mkDerivation { @@ -59023,6 +59085,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-logger_2_4_7" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring + , bytestring-builder, directory, easy-file, filepath, hspec, text + , unix, unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "2.4.7"; + sha256 = "201b07d898da91472aa86662399feb093a7379bc04315f8e84db52fbf3464a38"; + libraryHaskellDepends = [ + array auto-update base bytestring bytestring-builder directory + easy-file filepath text unix unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59235,7 +59317,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fay_0_23_1_15" = callPackage + "fay_0_23_1_16" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , data-default, data-lens-light, directory, filepath, ghc-paths , haskell-src-exts, language-ecmascript, mtl, mtl-compat @@ -59246,8 +59328,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.15"; - sha256 = "d8a1912c8359877e8d9cfec4c07275d21167cb03e607f7dd8190d201d967af59"; + version = "0.23.1.16"; + sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63394,6 +63476,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "from-sum" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "from-sum"; + version = "0.1.0.0"; + sha256 = "cfc80660a6986b2a2dc07605a26a6bc3b010b9aecfbeb4a852e671106b37475c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/from-sum"; + description = "Canonical fromMaybeM and fromEitherM functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "frontmatter" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck , text, yaml @@ -65319,8 +65414,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.2.0.2"; - sha256 = "039cb76d733452b664c701a068e65ac86a3731a8dd33bc9192623d1e88bdf288"; + version = "0.2.0.4"; + sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -65330,14 +65425,14 @@ self: { "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, QuickCheck - , validity + , validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.1.0.1"; - sha256 = "1193630423059f558d99e20f14e60daabb664539e25ca7c92ebca3f776dd94c2"; + version = "0.1.0.2"; + sha256 = "f26522673e67c3780662bbce48734a4e955d6fbc5dd7e8c701866180cbf7b8bb"; libraryHaskellDepends = [ - base containers genvalidity QuickCheck validity + base containers genvalidity QuickCheck validity validity-containers ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; @@ -65346,29 +65441,32 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, genvalidity, hspec, QuickCheck, validity }: + ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck + , validity + }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.2.0.4"; - sha256 = "848014573766b08edbb3a5ab043a60ed0fdbe8370b4cfac6a48ef8102cc4d2d2"; + version = "0.2.0.5"; + sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; }) {}; "genvalidity-text" = callPackage - ({ mkDerivation, base, genvalidity, hspec, QuickCheck, text - , validity + ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text + , validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.1.0.0"; - sha256 = "faca82b1d58fb2cd40575f0743c2579def715e697eebbaba7fc75c6b73b28c4e"; + version = "0.1.0.1"; + sha256 = "1906c0df7b65355f38ce1c13b1e1094a5f9d6da2c4c432ceee74523154814b54"; libraryHaskellDepends = [ - base genvalidity QuickCheck text validity + array base genvalidity QuickCheck text validity validity-text ]; testHaskellDepends = [ base genvalidity hspec QuickCheck text ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -66379,6 +66477,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_2_1" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp + , singletons, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.2.1"; + sha256 = "bc76eccd4686d12e77ada1b08c8bb087d46d102acedf37c502391a5da01d55f8"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-knownnat + ghc-typelits-natnormalise integer-gmp singletons transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit template-haskell + ]; + homepage = "http://www.clash-lang.org/"; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit @@ -66400,6 +66521,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_2_2" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.2.2"; + sha256 = "5236eda806fd52ec51a9a10666129d1c66e20c45e4167008f1b7442a25353f12"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise singletons tasty tasty-hunit + ]; + homepage = "http://clash-lang.org/"; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit @@ -66417,6 +66560,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_5_1" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.5.1"; + sha256 = "999459e94b1b577d5ad591390f56b2b29ccf6c1244d1c2d09ffae11524629b4c"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, equational-reasoning, ghc , ghc-tcplugins-extra, presburger, reflection @@ -67712,8 +67873,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.2.0"; - sha256 = "23485cfcab2af0bc010991183ac57fe1a922010581aa51dd70261241b241f87a"; + version = "0.3.5.0"; + sha256 = "8a410a6b65ad7753cc6fc4dba17258a0e818451aa42130b29e335bb6989495fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75015,6 +75176,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.1"; + sha256 = "d584d2bfec3eb94088452bb0611a4f8aea255bba4b3bf861ff3aeb888b5d4d03"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -75671,6 +75851,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hamsql" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, file-embed + , filepath, frontmatter, groom, network-uri, optparse-applicative + , pandoc, postgresql-simple, semigroups, text, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "hamsql"; + version = "0.7.0.0"; + sha256 = "bde760cd857cd601b8f9cd737752cd172f7cdf360b5cbed13c0acba18c80433d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory file-embed filepath frontmatter + groom network-uri optparse-applicative pandoc postgresql-simple + semigroups text transformers unordered-containers yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + jailbreak = true; + homepage = "https://git.hemio.de/hemio/hamsql"; + description = "HamSql"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hamtmap" = callPackage ({ mkDerivation, array, base, deepseq, hashable }: mkDerivation { @@ -80448,29 +80653,27 @@ self: { }) {}; "haxl" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, filepath, hashable, HUnit, pretty, text - , time, unordered-containers, vector + ({ mkDerivation, aeson, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, hashable + , HUnit, pretty, test-framework, test-framework-hunit, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "haxl"; - version = "0.3.1.0"; - sha256 = "fba961b0f3a9a9b6f7cf6ac24689d48fb8404d79ec86a36c2784f3f45d06669a"; - revision = "2"; - editedCabalFile = "f3a1523824d97b8e261e17491fb91230fc77c903444211f8303d89eacb2065d1"; + version = "0.4.0.0"; + sha256 = "fb63805d17f920efc59f16452f4b4a6e501880123505d73fa5d17c1b1554d7b6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath hashable HUnit pretty text time unordered-containers - vector + aeson base binary bytestring containers deepseq directory + exceptions filepath ghc-prim hashable HUnit pretty text time + transformers unordered-containers vector ]; executableHaskellDepends = [ base hashable time ]; testHaskellDepends = [ - aeson base bytestring containers hashable HUnit text - unordered-containers + aeson base binary bytestring containers deepseq filepath hashable + HUnit test-framework test-framework-hunit text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; @@ -90089,8 +90292,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.2.8"; - sha256 = "fa843d3ed104a61c2750d333e851048e6677e0f0713c74117c2fb8def8eaa3fe"; + version = "0.2.9"; + sha256 = "283e50db41018e115147f533024d874cb878f42b466f59e1f97ce3735bfd13f0"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -93613,6 +93816,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-diagnostics_0_0_0_4" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "hw-diagnostics"; + version = "0.0.0.4"; + sha256 = "63c07c2c6b5e8d6bda8b50070594b0f31549ed7758384c122ae74016ca984c17"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, errors, hspec @@ -93650,8 +93870,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }: mkDerivation { pname = "hw-mquery"; - version = "0.1.0.0"; - sha256 = "7353d749e489c8cff4d5a9a923f3901453979642fcaa76e13617c67177149c83"; + version = "0.1.0.1"; + sha256 = "724aa5b0490b57a89fb71b7042a3770f7978a4c975aa3d1b671576b0e83e113d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base dlist ]; @@ -93659,7 +93879,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; homepage = "http://github.com/haskell-works/hw-mquery#readme"; description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "hw-parser" = callPackage @@ -93698,14 +93918,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_3_0_1" = callPackage + "hw-prim_0_3_0_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck , random, vector }: mkDerivation { pname = "hw-prim"; - version = "0.3.0.1"; - sha256 = "ce87b75687e5b03e4a115ec577a3f03f905767644c7a3cf5b9b39f69f03c7107"; + version = "0.3.0.3"; + sha256 = "7abc9b3a3125dce061c89f9948302ed13c6c0eab3b64236157ae81d33ed09372"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq random vector ]; @@ -93716,7 +93936,7 @@ self: { jailbreak = true; homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -93740,6 +93960,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-string-parse" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: + mkDerivation { + pname = "hw-string-parse"; + version = "0.0.0.2"; + sha256 = "2b915afcc3ef29a61b17e7a37c047059bf87eb0d22d0f970892292b959ed562e"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; + homepage = "http://github.com/haskell-works/hw-string-parse#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.mit; + }) {}; + "hw-succinct" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit, containers , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect @@ -96391,6 +96624,24 @@ self: { license = "GPL"; }) {}; + "incremental-parser_0_2_5" = callPackage + ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.2.5"; + sha256 = "7d0fd208e86d383ec00ceabc6c229d66ae35726862b003820df06e855ea87ac1"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -97648,6 +97899,47 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "introduction" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl + , path, path-io, safe, stm, string-conv, text, transformers + , transformers-base, validity, validity-containers + }: + mkDerivation { + pname = "introduction"; + version = "0.0.1.0"; + sha256 = "4a061e4d863526c583d95907b9be1e11e6fd1ccb757d360c4bd3c3fe0214cd3c"; + libraryHaskellDepends = [ + async base bytestring containers deepseq exceptions filepath + ghc-prim lifted-base monad-control mtl path path-io safe stm + string-conv text transformers transformers-base validity + validity-containers + ]; + homepage = "https://github.com/NorfairKing/introduction"; + description = "A prelude for safe new projects"; + license = stdenv.lib.licenses.mit; + }) {}; + + "introduction-test" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , genvalidity, genvalidity-containers, genvalidity-hspec + , genvalidity-text, hspec, introduction, path, path-io, QuickCheck + , time + }: + mkDerivation { + pname = "introduction-test"; + version = "0.0.1.0"; + sha256 = "398191ff93488b86d4f58fb675403ccfe84c5eb50a06a16d8eec8033eb3f31bb"; + libraryHaskellDepends = [ + base bytestring containers filepath genvalidity + genvalidity-containers genvalidity-hspec genvalidity-text hspec + introduction path path-io QuickCheck time + ]; + homepage = "https://github.com/NorfairKing/introduction"; + description = "A prelude for the tests of safe new projects"; + license = stdenv.lib.licenses.mit; + }) {}; + "intset" = callPackage ({ mkDerivation, base, bits-extras, bytestring, deepseq }: mkDerivation { @@ -106916,15 +107208,17 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.1.0.0"; - sha256 = "965294deb7e4e15d11126e84ee7a5f158312f15d07c8e3adc0514b9143e3173f"; + version = "0.1.0.1"; + sha256 = "ff237dba6477c1ef1328c36785563422fbf3aae1acd31cf5aca139d8a0b4adbd"; + revision = "1"; + editedCabalFile = "c917ace1221a02587e65c9224c1b39fd6999b9c6f712138312def89981bcd3d4"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear semigroups vector vector-space ]; jailbreak = true; homepage = "https://github.com/leftaroundabout/linearmap-family"; - description = "Native, complete, matrix-free linear algebra"; + description = "Native, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -107043,8 +107337,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "linked-list-with-iterator"; - version = "0.1.0.0"; - sha256 = "fc61ca669aaacf7401db5261e956f922db210cf02bbb540a6efd753060153853"; + version = "0.1.1.0"; + sha256 = "c6ae37cc9d123afcb92f28fef9c5dae6d3713489bdf7f73ac9af420bb3f11b89"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/CindyLinz/Haskell-linked-list-with-iterator#readme"; @@ -111038,20 +111332,20 @@ self: { "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, hmatrix, MemoTrie, microlens, microlens-th, semigroups - , tagged, transformers, trivial-constraint, vector, vector-space - , void + , deepseq, free-vector-spaces, linear, linearmap-category, MemoTrie + , microlens, microlens-th, semigroups, tagged, transformers + , trivial-constraint, vector, vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.2.3.0"; - sha256 = "ae9bcf5eb972acee8eaec5f4180fb634466e6bc76849edd83d3c28cf20fdfa3e"; + version = "0.3.0.0"; + sha256 = "011ee59126ab31c49ec4fab8cfe1a77ca76b170f74ecae75f4458e25593616ab"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq hmatrix - MemoTrie microlens microlens-th semigroups tagged transformers - trivial-constraint vector vector-space void + base comonad constrained-categories containers deepseq + free-vector-spaces linear linearmap-category MemoTrie microlens + microlens-th semigroups tagged transformers trivial-constraint + vector vector-space void ]; - jailbreak = true; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; @@ -113328,8 +113622,8 @@ self: { }: mkDerivation { pname = "mikrokosmos"; - version = "0.1.0"; - sha256 = "49547246b9a22a9d2037424d99017d09823a2f321a9d0f6cec3309b85c5880a4"; + version = "0.2.0"; + sha256 = "853b4e3c3f2299f550f18bb0692bc194a2720b57fbcb5bf2aba70713586375b2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114058,15 +114352,13 @@ self: { }) {}; "modbus-tcp" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, cereal - , network - }: + ({ mkDerivation, base, bytestring, cereal, network, transformers }: mkDerivation { pname = "modbus-tcp"; - version = "0.1"; - sha256 = "996aa62fc7d5ac0112d128fc3209c4bf1c9a55bc0bd5c636f8cdefbc0d9b0fc8"; + version = "0.2"; + sha256 = "85bc2678704b0e573a4c4bc1672f76cdca1c9febd50dc9a40ffa6aa097361aeb"; libraryHaskellDepends = [ - base base-unicode-symbols bytestring cereal network + base bytestring cereal network transformers ]; jailbreak = true; homepage = "https://github.com/roelvandijk/modbus-tcp"; @@ -119785,16 +120077,16 @@ self: { "network-msgpack-rpc" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring , conduit, conduit-extra, data-default-class, data-msgpack - , exceptions, hspec, monad-control, mtl, network, tagged + , exceptions, hspec, MissingH, monad-control, mtl, network, tagged }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.2"; - sha256 = "6938c9952006b7cd2796d493c295f96324523308cc5c2c9748d4707f58012f7c"; + version = "0.0.3"; + sha256 = "74bf9cd029126e26a0ebf0b02cbc12bc5410e85404ba36f3d8ba001523c3200b"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra - data-default-class data-msgpack exceptions monad-control mtl - network tagged + data-default-class data-msgpack exceptions MissingH monad-control + mtl network tagged ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; homepage = "http://msgpack.org/"; @@ -124843,8 +125135,8 @@ self: { }: mkDerivation { pname = "pandoc-vimhl"; - version = "0.1.0.0"; - sha256 = "b6241c77d659f8c4d75025e6a89c9c22d594a52eee5a36380aa056b3e53ff633"; + version = "0.1.1.0"; + sha256 = "ceab0f2df428c0e15bcbf3cf24cdead4cc0907252dbc0f705ce9edb2c6ef6775"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125298,22 +125590,23 @@ self: { ({ mkDerivation, abstract-par, accelerate, array, async, base , binary, bytestring, containers, deepseq, directory , distributed-process, distributed-process-simplelocalnet - , distributed-static, filepath, HTTP, monad-par, network + , distributed-static, filepath, http-conduit, monad-par, network , network-uri, normaldistribution, parallel, random, repa, stm , template-haskell, time, transformers, utf8-string, vector, xml }: mkDerivation { pname = "parconc-examples"; - version = "0.4.3"; - sha256 = "22770bec32f6dcfcd68a55c49473932ba09eb21e5f72631fec17e0be40599f8e"; + version = "0.4.4"; + sha256 = "bc05ccd125a23c4698904186b9ce9082f93ce689b533c1dc1627013a348393c8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ abstract-par accelerate array async base binary bytestring containers deepseq directory distributed-process - distributed-process-simplelocalnet distributed-static filepath HTTP - monad-par network network-uri normaldistribution parallel random - repa stm template-haskell time transformers utf8-string vector xml + distributed-process-simplelocalnet distributed-static filepath + http-conduit monad-par network network-uri normaldistribution + parallel random repa stm template-haskell time transformers + utf8-string vector xml ]; jailbreak = true; homepage = "http://github.com/simonmar/parconc-examples"; @@ -131565,8 +131858,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "pqueue"; - version = "1.3.1.1"; - sha256 = "a40a5eaa1b74b34f774c09613ac92955ae381000a5007a67b500a794516063a2"; + version = "1.3.2"; + sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1"; libraryHaskellDepends = [ base deepseq ]; description = "Reliable, persistent, fast priority queues"; license = stdenv.lib.licenses.bsd3; @@ -134566,26 +134859,28 @@ self: { }) {}; "pushme" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , hslogger, io-storage, lens, old-locale, optparse-applicative - , parallel-io, pointless-fun, regex-posix, shelly, system-fileio - , system-filepath, text, text-format, time, unix - , unordered-containers, yaml + ({ mkDerivation, aeson, base, bytestring, containers, foldl + , io-storage, lens, logging, monad-logger, old-locale + , optparse-applicative, parallel-io, pipes, pipes-group, pipes-safe + , pipes-text, regex-posix, safe, shelly, system-fileio + , system-filepath, temporary, text, text-format, time, transformers + , unix, unordered-containers, yaml }: mkDerivation { pname = "pushme"; - version = "1.5.0"; - sha256 = "8d44eb63f4bee35e9474851816085317316008152ca16203338b9b0d2e28c332"; + version = "2.0.2"; + sha256 = "fc9b7ab521dee1ccc66912b08ab6d54715cc3fe9334ece6a6f6a54bd5c18ed89"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring containers deepseq hslogger io-storage lens - old-locale optparse-applicative parallel-io pointless-fun - regex-posix shelly system-fileio system-filepath text text-format - time unix unordered-containers yaml + aeson base bytestring containers foldl io-storage lens logging + monad-logger old-locale optparse-applicative parallel-io pipes + pipes-group pipes-safe pipes-text regex-posix safe shelly + system-fileio system-filepath temporary text text-format time + transformers unix unordered-containers yaml ]; homepage = "https://github.com/jwiegley/pushme"; - description = "Tool to synchronize multiple directories with rsync, zfs or git-annex"; + description = "Tool to synchronize directories with rsync, zfs or git-annex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -140619,6 +140914,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "rethinkdb_2_2_0_7" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , containers, data-default, doctest, mtl, network, scientific, text + , time, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "rethinkdb"; + version = "2.2.0.7"; + sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring containers + data-default mtl network scientific text time unordered-containers + utf8-string vector + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/atnnn/haskell-rethinkdb"; + description = "A driver for RethinkDB 2.2"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , hashable, hspec, hspec-smallcheck, mtl, network, old-locale @@ -154081,74 +154397,6 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base - , base-compat, base16-bytestring, base64-bytestring, binary - , binary-tagged, blaze-builder, byteable, bytestring, Cabal - , conduit, conduit-extra, containers, cryptohash - , cryptohash-conduit, deepseq, directory, edit-distance, either - , enclosed-exceptions, errors, exceptions, extra, fast-logger - , filelock, filepath, fsnotify, generic-deriving, gitrev, hashable - , hastache, hit, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-base, microlens, monad-control - , monad-logger, monad-unlift, mtl, open-browser - , optparse-applicative, optparse-simple, path, path-io, persistent - , persistent-sqlite, persistent-template, pretty, process - , project-template, QuickCheck, regex-applicative-text, resourcet - , retry, safe, semigroups, split, stm, streaming-commons, tar - , template-haskell, temporary, text, text-binary, time, tls - , transformers, transformers-base, unix, unix-compat - , unordered-containers, vector, vector-binary-instances, yaml - , zip-archive, zlib - }: - mkDerivation { - pname = "stack"; - version = "1.1.2"; - sha256 = "fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625"; - revision = "8"; - editedCabalFile = "0eb7cd69c79c481cd463ccd8e33cc8e03bc79169f084c8f9bf3ef006da7c3a12"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async attoparsec base base-compat - base16-bytestring base64-bytestring binary binary-tagged - blaze-builder byteable bytestring Cabal conduit conduit-extra - containers cryptohash cryptohash-conduit deepseq directory - edit-distance either enclosed-exceptions errors exceptions extra - fast-logger filelock filepath fsnotify generic-deriving hashable - hastache hit hpack hpc http-client http-client-tls http-conduit - http-types lifted-base microlens monad-control monad-logger - monad-unlift mtl open-browser optparse-applicative path path-io - persistent persistent-sqlite persistent-template pretty process - project-template regex-applicative-text resourcet retry safe - semigroups split stm streaming-commons tar template-haskell - temporary text text-binary time tls transformers transformers-base - unix unix-compat unordered-containers vector - vector-binary-instances yaml zip-archive zlib - ]; - executableHaskellDepends = [ - base bytestring Cabal containers directory filelock filepath gitrev - http-client lifted-base microlens monad-control monad-logger mtl - optparse-applicative optparse-simple path path-io text transformers - ]; - testHaskellDepends = [ - attoparsec base Cabal conduit conduit-extra containers cryptohash - directory exceptions hspec http-conduit monad-logger path path-io - QuickCheck resourcet retry temporary text transformers - ]; - doCheck = false; - preCheck = "export HOME=$TMPDIR"; - postInstall = '' - exe=$out/bin/stack - mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack - ''; - homepage = "http://haskellstack.org"; - description = "The Haskell Tool Stack"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "stack_1_2_0" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async , attoparsec, base, base-compat, base16-bytestring , base64-bytestring, binary, binary-tagged, blaze-builder, byteable @@ -154218,7 +154466,6 @@ self: { homepage = "http://haskellstack.org"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -160218,6 +160465,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; + "tcp-streams_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , HsOpenSSL, HsOpenSSL-x509-system, HUnit, io-streams, network + , openssl, pem, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, tls, x509, x509-store, x509-system + }: + mkDerivation { + pname = "tcp-streams"; + version = "0.5.0.0"; + sha256 = "a963c6ad88b4feb4012c39bb6ebe1237b3e6263a3b1b0b14fb3b10f729df3be0"; + libraryHaskellDepends = [ + base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system + io-streams network pem tls x509 x509-store x509-system + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "One stop solution for tcp client and server with tls support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "tdd-util" = callPackage ({ mkDerivation, base, bytestring, HUnit, lens , MonadCatchIO-transformers, parallel-io, process, QuickCheck @@ -161584,6 +161855,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-binary_0_2_1_1" = callPackage + ({ mkDerivation, base, binary, text }: + mkDerivation { + pname = "text-binary"; + version = "0.2.1.1"; + sha256 = "b697b2bd09080643d4686705c779122129638904870df5c1d41c8fc72f08f4a1"; + libraryHaskellDepends = [ base binary text ]; + homepage = "https://github.com/kawu/text-binary"; + description = "Binary instances for text types"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-conversions" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, errors, hspec, hspec-discover, text @@ -170562,8 +170846,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.0.2"; - sha256 = "c1d7a91bbcb4c06ebad9149e11f02a1e10bc3617f3835b441d0340230d4d1fef"; + version = "0.3.0.4"; + sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -170574,14 +170858,26 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.1.0.0"; - sha256 = "58d5a5b068ec6f53718d73a6fdc7e76f15cad27fe6f1deff2132bb577e25e6f5"; + version = "0.1.0.1"; + sha256 = "ae626d963b2caca9f385cf65eb793fb41441ec93a4d8e937c24dc44a64a88829"; libraryHaskellDepends = [ base containers validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; }) {}; + "validity-text" = callPackage + ({ mkDerivation, base, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.1.0.1"; + sha256 = "ab92980b7e900db8cf8e11cf986a5a952d2306cbb4735e8bc810acf8ca5e2189"; + libraryHaskellDepends = [ base text validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -176515,8 +176811,8 @@ self: { }: mkDerivation { pname = "x86-64bit"; - version = "0.4"; - sha256 = "af347a79288e5bdca0cab284ec82eae6efddd18881c7aa077ddd5765437df660"; + version = "0.4.1"; + sha256 = "c980fccd28989467703dee57477d0b4c8916cc52a81e8aa8d3aa5c206726bbaf"; libraryHaskellDepends = [ base deepseq monads-tf QuickCheck tardis vector ]; @@ -179617,8 +179913,8 @@ self: { }: mkDerivation { pname = "yesod-csp"; - version = "0.2.0.0"; - sha256 = "3804bdbc7b2f40a707c0af2bd6c2586abdc49c0f2eada5b24c488ed126e37280"; + version = "0.2.1.0"; + sha256 = "068357f7a3f6f6e6593730a556d84a5c1643e37b492d5486f4387dd111494e95"; libraryHaskellDepends = [ attoparsec base mono-traversable network-uri semigroups syb template-haskell text uniplate yesod yesod-core @@ -180834,6 +181130,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi_0_13_0_1" = callPackage + ({ mkDerivation, base, yi-core }: + mkDerivation { + pname = "yi"; + version = "0.13.0.1"; + sha256 = "c689370d1121626e0d2d17dce9aeaad65c6191b3215a26c37014b1900dd23a15"; + configureFlags = [ "-fpango" "-fvty" ]; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base yi-core ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-contrib" = callPackage ({ mkDerivation, base, containers, directory, filepath, lens, mtl , old-locale, oo-prototypes, split, text, time, transformers-base @@ -180855,6 +181167,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-core" = callPackage + ({ mkDerivation, array, attoparsec, base, binary, bytestring + , containers, data-default, directory, dlist, dynamic-state, dyre + , exceptions, filepath, hashable, Hclip, ListLike + , microlens-platform, mtl, old-locale, oo-prototypes, parsec + , pointedlist, process, process-extras, safe, semigroups, split + , tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time + , transformers-base, unix, unix-compat, unordered-containers + , word-trie, xdg-basedir, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-core"; + version = "0.13.0.1"; + sha256 = "59d1032027339aed25d8ba0e294d83d5f12416becf8d36ab22e03f30085fc3f3"; + libraryHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state dyre exceptions filepath hashable + Hclip ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras safe semigroups split + text text-icu time transformers-base unix unix-compat + unordered-containers word-trie xdg-basedir yi-language yi-rope + ]; + testHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state dyre exceptions filepath hashable + Hclip ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras safe semigroups split + tasty tasty-hunit tasty-quickcheck text text-icu time + transformers-base unix unix-compat unordered-containers word-trie + xdg-basedir yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor core library"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "yi-emacs-colours" = callPackage ({ mkDerivation, base, containers, split, yi-language }: mkDerivation { @@ -180867,6 +181215,43 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-frontend-pango" = callPackage + ({ mkDerivation, base, containers, filepath, glib, gtk + , microlens-platform, mtl, oo-prototypes, pango, pointedlist, text + , transformers-base, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-frontend-pango"; + version = "0.13.0.1"; + sha256 = "f0526c0014fc888ab0d1d9b6240b88fd6eae7554053818d8fff9725c0a8cd8be"; + libraryHaskellDepends = [ + base containers filepath glib gtk microlens-platform mtl + oo-prototypes pango pointedlist text transformers-base yi-core + yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Pango frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-frontend-vty" = callPackage + ({ mkDerivation, base, containers, data-default, dlist + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language + }: + mkDerivation { + pname = "yi-frontend-vty"; + version = "0.13.0.1"; + sha256 = "68f94ba76109463a7c544c529635c8fc5652cdd424cdab9e55da1077e569477b"; + libraryHaskellDepends = [ + base containers data-default dlist microlens-platform pointedlist + stm text vty yi-core yi-language + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vty frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi, yi-language @@ -180897,6 +181282,86 @@ self: { license = "GPL"; }) {}; + "yi-ireader" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-ireader"; + version = "0.13.0.1"; + sha256 = "abd842857424d10e13643ea9dd118cb8b9a77452fca17e6e1c274ed7c3203d70"; + libraryHaskellDepends = [ + base binary bytestring containers data-default microlens-platform + text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor incremental reader"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-cua" = callPackage + ({ mkDerivation, base, microlens-platform, text, yi-core + , yi-keymap-emacs, yi-rope + }: + mkDerivation { + pname = "yi-keymap-cua"; + version = "0.13.0.1"; + sha256 = "130b7a1583ce80edbbc7227463dbaf5e1330b9927b6f512ed1b066ea1b8c6692"; + libraryHaskellDepends = [ + base microlens-platform text yi-core yi-keymap-emacs yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Cua keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-emacs" = callPackage + ({ mkDerivation, base, containers, filepath, Hclip + , microlens-platform, mtl, oo-prototypes, semigroups, text + , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope + }: + mkDerivation { + pname = "yi-keymap-emacs"; + version = "0.13.0.1"; + sha256 = "495db9fa6efe1d628b078d384547deb2fd537f36db0daa5ebc9c149ed9fd7a9f"; + libraryHaskellDepends = [ + base containers filepath Hclip microlens-platform mtl oo-prototypes + semigroups text transformers-base yi-core yi-language yi-misc-modes + yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Emacs keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-vim" = callPackage + ({ mkDerivation, attoparsec, base, binary, containers, data-default + , directory, filepath, Hclip, microlens-platform, mtl + , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers-base + , unordered-containers, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-keymap-vim"; + version = "0.13.0.1"; + sha256 = "a3f2360e2a5f17a71448cc2ab7d669f9d17553a97fb97bddcc731528b441a3b1"; + libraryHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist safe + semigroups text transformers-base unordered-containers yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck + safe semigroups tasty tasty-hunit tasty-quickcheck text + transformers-base unordered-containers yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vim keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, filepath, hashable, hspec, microlens-platform @@ -180923,6 +181388,96 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-language_0_13_0_1" = callPackage + ({ mkDerivation, alex, array, base, binary, containers + , data-default, hashable, microlens-platform, oo-prototypes + , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "yi-language"; + version = "0.13.0.1"; + sha256 = "1fee232d0e3cd9565d6d504b1c70b465aacfe2b3460f86560c8d19ba9ae81c9c"; + libraryHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + template-haskell transformers-base unordered-containers + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + tasty tasty-hspec tasty-quickcheck template-haskell + transformers-base unordered-containers + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Collection of language-related Yi libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-misc-modes" = callPackage + ({ mkDerivation, array, base, binary, data-default, filepath + , microlens-platform, semigroups, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-misc-modes"; + version = "0.13.0.1"; + sha256 = "fea111c983d93f6bdd66bede3846e17d4e9d88eecf21118cb60827454ba4c323"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform + semigroups text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor miscellaneous modes"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-mode-haskell" = callPackage + ({ mkDerivation, array, base, binary, containers, data-default + , filepath, hashable, hspec, microlens-platform, pointedlist + , QuickCheck, regex-base, regex-tdfa, template-haskell, text + , transformers-base, unordered-containers, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-mode-haskell"; + version = "0.13.0.1"; + sha256 = "4727944e57b89a988ab7af57dff0ed2bbd926105b5035ceb9343c8dd2be84f8e"; + libraryHaskellDepends = [ + array base binary data-default microlens-platform text yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + array base binary containers data-default filepath hashable hspec + microlens-platform pointedlist QuickCheck regex-base regex-tdfa + template-haskell text transformers-base unordered-containers + yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor haskell mode"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-mode-javascript" = callPackage + ({ mkDerivation, array, base, binary, data-default, dlist, filepath + , microlens-platform, mtl, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-mode-javascript"; + version = "0.13.0.1"; + sha256 = "b952219ba83d27b4fe292fe6bcbc8b0a14b95c849f35fd1b74ff1c81a464ae8c"; + libraryHaskellDepends = [ + array base binary data-default dlist filepath microlens-platform + mtl text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor javascript mode"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "yi-monokai" = callPackage ({ mkDerivation, base, yi }: mkDerivation { diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix new file mode 100644 index 000000000000..11afd4ebe76d --- /dev/null +++ b/pkgs/development/idris-modules/lightyear.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, effects +, lib +, idris +}: + +let + date = "2016-08-01"; +in +build-idris-package { + name = "lightyear-${date}"; + + src = fetchFromGitHub { + owner = "ziman"; + repo = "lightyear"; + rev = "9420f9e892e23a7016dea1a61d8ce43a6d4ecf15"; + sha256 = "0xbjwq7sk4x78mi2zcqxbx7wziijlr1ayxihb1vml33lqmsgl1dn"; + }; + + propagatedBuildInputs = [ prelude base effects ]; + + meta = { + description = "Parser combinators for Idris"; + homepage = https://github.com/ziman/lightyear; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.siddharthist ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 02f9d1f98e81..ed30fe1522bf 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ] - ++ optional stdenv.isDarwin [ Carbon Cocoa ]; + ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ] + ++ optional odbcSupport unixODBC + ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index ab34f64dfbfc..96b53e1ad630 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; buildInputs = [ pkgconfig gfortran texinfo ] - ++ optional (boost != null) [ boost.out ]; + ++ optional (boost != null) boost; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/libraries/clutter/1.26.nix b/pkgs/development/libraries/clutter/1.26.nix deleted file mode 100644 index 07f63e1e603c..000000000000 --- a/pkgs/development/libraries/clutter/1.26.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.26"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index f101e3c18801..fc80b0ec2b29 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection, gtk3 +gobjectIntrospection }: let - ver_maj = "1.16"; - ver_min = "2"; + ver_maj = "1.26"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "clutter-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc"; + sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection gtk3 + atk json_glib gobjectIntrospection ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix deleted file mode 100644 index 88bb67077490..000000000000 --- a/pkgs/development/libraries/cogl/1.22.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.22"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e45702090665..88bb67077490 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -3,7 +3,7 @@ , gstreamerSupport ? true, gst_all_1 }: let - ver_maj = "1.16"; + ver_maj = "1.22"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -11,17 +11,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm"; + sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; }; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-introspection" - "--enable-gles1" - "--enable-gles2" "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index c477b4b1f39f..5b824e3c5753 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" - "-DCMAKE_BUILD_TYPE=RELEASE" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch b/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch new file mode 100644 index 000000000000..5a6cb3bcafb4 --- /dev/null +++ b/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch @@ -0,0 +1,15 @@ +diff --git a/GNUmakefile b/GNUmakefile +index 4de9d10..ff4789a 100755 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -271,8 +271,8 @@ endif # OpenMP + endif # IS_LINUX + + ifneq ($(IS_DARWIN),0) +-AR = libtool +-ARFLAGS = -static -o ++AR = ar ++ARFLAGS = cru + CXX ?= c++ + ifeq ($(IS_GCC_29),1) + CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables diff --git a/pkgs/development/libraries/crypto++/GNUmakefile.patch b/pkgs/development/libraries/crypto++/GNUmakefile.patch deleted file mode 100644 index 48fdfe420482..000000000000 --- a/pkgs/development/libraries/crypto++/GNUmakefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500 -+++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500 -@@ -87,8 +87,8 @@ - endif - - ifeq ($(UNAME),Darwin) --AR = libtool --ARFLAGS = -static -o -+AR = ar -+ARFLAGS = cru - CXX = c++ - IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) - ifeq ($(IS_GCC2),1) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 6fbd9451c564..d1476df2b601 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,16 +1,18 @@ { fetchurl, stdenv, unzip }: stdenv.mkDerivation rec { - name = "crypto++-5.6.2"; + name = "crypto++-${version}"; + majorVersion = "5.6"; + version = "${majorVersion}.4"; src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp562.zip"; - sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; + url = "mirror://sourceforge/cryptopp/cryptopp564.zip"; + sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy"; }; patches = with stdenv; lib.optional (system != "i686-cygwin") ./dll.patch - ++ lib.optional isDarwin ./GNUmakefile.patch; + ++ lib.optional isDarwin ./GNUmakefile-darwin.patch; buildInputs = [ unzip ]; @@ -30,14 +32,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; - buildFlags = "libcryptopp.so"; + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "libcryptopp.so" ]; + installFlags = [ "LDCONF=true" ]; doCheck = true; checkPhase = "LD_LIBRARY_PATH=`pwd` make test"; # prefer -fPIC and .so to .a; cryptotest.exe seems superfluous - postInstall = ''rm "$out"/lib/*.a -r "$out/bin" ''; + postInstall = '' + rm "$out"/lib/*.a -r "$out/bin" + ln -sf "$out"/lib/libcryptopp.so.${version} "$out"/lib/libcryptopp.so.${majorVersion} + ''; meta = with stdenv.lib; { description = "Crypto++, a free C++ class library of cryptographic schemes"; @@ -45,8 +51,5 @@ stdenv.mkDerivation rec { license = licenses.boost; platforms = platforms.all; maintainers = [ ]; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; }; } diff --git a/pkgs/development/libraries/crypto++/dll.patch b/pkgs/development/libraries/crypto++/dll.patch index 36a814e67c86..12df1fb9e9e9 100644 --- a/pkgs/development/libraries/crypto++/dll.patch +++ b/pkgs/development/libraries/crypto++/dll.patch @@ -1,19 +1,10 @@ Get rid of Windows-specific stuff. ---- crypto++/dll.cpp 2009-03-01 19:44:02.000000000 +0100 -+++ crypto++/dll.cpp 2009-08-11 00:49:34.000000000 +0200 -@@ -39,7 +39,7 @@ NAMESPACE_END - - #endif - --#ifdef CRYPTOPP_EXPORTS -+#if defined CRYPTOPP_EXPORTS && defined _MSC_VER - - USING_NAMESPACE(CryptoPP) - ---- crypto++/GNUmakefile 2009-03-15 02:48:02.000000000 +0100 -+++ crypto++/GNUmakefile 2009-08-11 01:23:09.000000000 +0200 -@@ -136,7 +136,7 @@ nolib: $(OBJS) # makes it faster to tes +diff --git a/GNUmakefile b/GNUmakefile +index 4de9d10..ff4789a 100755 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -656,7 +656,7 @@ nolib: $(OBJS) dll: cryptest.import.exe dlltest.exe cryptopp.dll: $(DLLOBJS) @@ -22,3 +13,16 @@ Get rid of Windows-specific stuff. libcryptopp.import.a: $(LIBIMPORTOBJS) $(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS) +diff --git a/dll.cpp b/dll.cpp +index 72dade9..b5097ab 100644 +--- a/dll.cpp ++++ b/dll.cpp +@@ -48,7 +48,7 @@ NAMESPACE_END + + #endif + +-#ifdef CRYPTOPP_EXPORTS ++#if defined CRYPTOPP_EXPORTS && defined _MSC_VER + + USING_NAMESPACE(CryptoPP) + diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index bcf8933f0725..361acf632fa6 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -44,7 +44,11 @@ self = stdenv.mkDerivation { "--localstatedir=/var" "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" + "--with-system-pid-file=/run/dbus/pid" + "--with-system-socket=/run/dbus/system_bus_socket" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--enable-user-session" # this package installs nothing into those dirs and they create a dependency "--datadir=/run/current-system/sw/share" "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper @@ -81,4 +85,3 @@ self = stdenv.mkDerivation { }; }; in self - diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index d0fba6ed821a..136f18b06143 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: +{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: stdenv.mkDerivation rec { name = "freenect-${version}"; - version = "0.5.2"; + version = "0.5.5"; - src = fetchzip { - url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz"; - sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9"; + src = fetchFromGitHub { + owner = "OpenKinect"; + repo = "libfreenect"; + rev = "v${version}"; + sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx"; }; buildInputs = [ libusb freeglut mesa libXi libXmu ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index f8a75c251226..af6e3be401b0 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gstreamer gst_plugins_base ] - ++ lib.optional stdenv.isLinux [ libpulseaudio ] + ++ lib.optional stdenv.isLinux libpulseaudio ++ libintlOrEmpty ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index c4b5c56c341f..91778f6c80c6 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] - ++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix new file mode 100644 index 000000000000..1c9e8eca0d57 --- /dev/null +++ b/pkgs/development/libraries/libagar/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc +, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, mesa +, libsndfile, portaudio, mysql, fontconfig +}: + +let srcs = import ./srcs.nix { inherit fetchurl; }; in +stdenv.mkDerivation rec { + name = "libagar-${version}"; + inherit (srcs) version src; + + preConfigure = '' + substituteInPlace configure.in \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + cat configure.in | ${bsdbuild}/bin/mkconfigure > configure + ''; + + configureFlags = [ + "--with-libtool=${libtool}/bin/libtool" + "--enable-nls=yes" + "--with-gettext=${gettext}" + "--with-jpeg=${libjpeg.dev}" + "--with-gl=${mesa}" + "--with-mysql=yes" + "--with-manpages=yes" + ]; + + outputs = [ "out" "devdoc" ]; + + nativeBuildInputs = [ pkgconfig libtool gettext ]; + buildInputs = [ + bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.client mandoc + freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile + ]; + + meta = with stdenv.lib; { + description = "Cross-platform GUI toolkit"; + homepage = http://libagar.org/index.html; + license = with licenses; bsd3; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix new file mode 100644 index 000000000000..dea102774d09 --- /dev/null +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: + +let srcs = import ./srcs.nix { inherit fetchurl; }; in +stdenv.mkDerivation rec { + name = "libagar-test-${version}"; + inherit (srcs) version src; + + sourceRoot = "agar-1.5.0/tests"; + + preConfigure = '' + substituteInPlace configure.in \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + cat configure.in | ${bsdbuild}/bin/mkconfigure > configure + ''; + + configureFlags = "--with-agar=${libagar}"; + + buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; + + meta = with stdenv.lib; { + description = "Tests for libagar"; + homepage = http://libagar.org/index.html; + license = with licenses; bsd3; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libagar/srcs.nix b/pkgs/development/libraries/libagar/srcs.nix new file mode 100644 index 000000000000..53c6a5b89dad --- /dev/null +++ b/pkgs/development/libraries/libagar/srcs.nix @@ -0,0 +1,10 @@ +{ fetchurl }: +rec { + version = "1.5.0"; + + src = fetchurl { + url = "http://stable.hypertriton.com/agar/agar-${version}.tar.gz"; + sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42"; + }; + +} diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index bda5143208ec..15d141990417 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchurl, glib, db, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, glib, db, pkgconfig }: -stdenv.mkDerivation { - name = "libpinyin-1.3.0"; +let + modelData = fetchurl { + url = "mirror://sourceforge/libpinyin/models/model12.text.tar.gz"; + sha256 = "1fijhhnjgj8bj1xr5pp7c4qxf11cqybgfqg7v36l3x780d84hfnd"; + }; +in + +stdenv.mkDerivation rec { + name = "libpinyin-${version}"; + version = "1.6.0"; + + nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + + postUnpack = '' + tar -xzf ${modelData} -C $sourceRoot/data + ''; + + src = fetchFromGitHub { + owner = "libpinyin"; + repo = "libpinyin"; + rev = version; + sha256 = "0k40a7wfp8zj9d426afv0am5sr3m2i2p309fq0vf8qrb050hj17f"; + }; meta = with stdenv.lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; homepage = https://sourceforge.net/projects/libpinyin; license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; - - buildInputs = [ glib db pkgconfig ]; - - src = fetchurl { - url = "mirror://sourceforge/project/libpinyin/libpinyin/libpinyin-1.3.0.tar.gz"; - sha256 = "e105c443b01cd67b9db2a5236435d5441cf514b997b891215fa65f16030cf1f2"; - }; } diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 96e6dca965dc..2b8fc1fcc8f7 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cryptix ]; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index d5df00a7e9ba..409307fb52b0 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] - ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; + ++ stdenv.lib.optional enableIntrospection gobjectIntrospection; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 4a466ad133ac..c17c224415db 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio - ++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; NIX_LDFLAGS = [] ++ optional alsaSupport "-lasound" diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 3f3218a550f8..4d3e9e9a04eb 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - meta = { description = "Open Source Biometric Recognition"; homepage = http://openbiometrics.org/; diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix index 80026af7be04..dd30b18e97c7 100644 --- a/pkgs/development/libraries/openjpeg/2.0.nix +++ b/pkgs/development/libraries/openjpeg/2.0.nix @@ -4,5 +4,5 @@ callPackage ./generic.nix (args // rec { version = "2.0.1"; branch = "2"; revision = "version.2.0.1"; - sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw"; + sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv"; }) diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index baebce8e4b11..6ca4734a4f7d 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; buildInputs = [ ] - ++ stdenv.lib.optional docSupport [ doxygen ]; + ++ stdenv.lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 9fb25aa36e0a..2244803f4d32 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" - "-DCMAKE_BUILD_TYPE=Release" (mkFlag parallel "USE_GNU_PARALLEL") ]; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index a115c93c90e3..76912f19ab5f 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; + # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; + buildInputs = [ pkgconfig libusb ]; propagatedBuildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 20e2213e3e7c..e91d5b8d3979 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt -, qtLib ? null }: +, qtLib ? null +# Darwin support +, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT +, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }: with stdenv.lib; @@ -17,8 +20,14 @@ stdenv.mkDerivation rec { sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; }; - buildInputs = [ cmake mesa libX11 xproto libXt ] - ++ optional (qtLib != null) qtLib; + buildInputs = + if !stdenv.isDarwin + then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private + CFNetwork Security ApplicationServices CoreText IOSurface ImageIO + GLUT ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; + preBuild = '' export LD_LIBRARY_PATH="$(pwd)/lib"; @@ -30,7 +39,18 @@ stdenv.mkDerivation rec { # At least, we use -fPIC for other packages to be able to use this in shared # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] - ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]; + ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] + ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" + "-DCMAKE_OSX_SYSROOT=" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; + + doCheck = !stdenv.isDarwin; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; enableParallelBuilding = true; @@ -39,6 +59,6 @@ stdenv.mkDerivation rec { homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c388a3f3065c..e644b5728ed1 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,11 +8,11 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1c0d5ivy9n44hykvw2ggrvqrnn7naw3wg11vbvgwzgi8g5gr4h4m"; + sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"; }; configureFlags = "--with-scanner --disable-documentation"; diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index d98359053370..0cfdd2b62ef6 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -319,22 +319,22 @@ let sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; - "os-homedir-1.0.1" = { + "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"; - sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-tmpdir-1.0.1" = { + "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; "isexe-1.1.2" = { @@ -391,13 +391,13 @@ let sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; - "azure-common-0.9.17" = { + "azure-common-0.9.18" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.17.tgz"; - sha1 = "8f8df41ccb4a026b670645f223e41e1a7f42f33f"; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; }; }; "azure-arm-authorization-2.0.0" = { @@ -481,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.16.0" = { + "azure-arm-network-0.17.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.16.0.tgz"; - sha1 = "df1bd296fb52742af7596db025cbdd1491391f3d"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; + sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -562,13 +562,13 @@ let sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "azure-graph-1.0.1" = { + "azure-graph-1.1.1" = { name = "azure-graph"; packageName = "azure-graph"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.0.1.tgz"; - sha1 = "a2eda330ccd336832b190da0caba9735a73aee97"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; + sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -706,13 +706,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-1.1.0" = { + "azure-storage-1.3.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.1.0.tgz"; - sha1 = "45de61074dbddf44f9245ad287c929541ae971ab"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; + sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; }; }; "azure-arm-batch-0.2.0" = { @@ -724,13 +724,22 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.5.0" = { + "azure-batch-0.5.2" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.0.tgz"; - sha1 = "1fbc1ab0f976ad3f16c5879ba95d4751e9d5bf56"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; + sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + }; + }; + "azure-servicefabric-0.1.4" = { + name = "azure-servicefabric"; + packageName = "azure-servicefabric"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; + sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; }; }; "applicationinsights-0.15.12" = { @@ -832,6 +841,15 @@ let sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; }; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + }; + }; "jsrsasign-4.8.2" = { name = "jsrsasign"; packageName = "jsrsasign"; @@ -850,13 +868,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.15.0" = { + "moment-2.15.1" = { name = "moment"; packageName = "moment"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; - sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz"; + sha1 = "e979c2a29e22888e60f396f2220a6118f85cd94c"; }; }; "ms-rest-1.15.0" = { @@ -1282,22 +1300,22 @@ let sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; }; }; - "is-finite-1.0.1" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "number-is-nan-1.0.0" = { + "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1345,15 +1363,6 @@ let sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }; }; - "request-2.72.0" = { - name = "request"; - packageName = "request"; - version = "2.72.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; - sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; - }; - }; "validator-3.22.2" = { name = "validator"; packageName = "validator"; @@ -1390,591 +1399,6 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "aws4-1.4.1" = { - name = "aws4"; - packageName = "aws4"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; - sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; - }; - }; - "bl-1.1.2" = { - name = "bl"; - packageName = "bl"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; - sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; - }; - }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "extend-3.0.0" = { - name = "extend"; - packageName = "extend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-1.0.1" = { - name = "form-data"; - packageName = "form-data"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; - sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; - }; - }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "mime-types-2.1.11" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; - sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "qs-6.1.0" = { - name = "qs"; - packageName = "qs"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; - sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "tough-cookie-2.2.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; - sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; - }; - }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; - }; - }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "async-2.0.1" = { - name = "async"; - packageName = "async"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; - sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; - }; - }; - "lodash-4.15.0" = { - name = "lodash"; - packageName = "lodash"; - version = "4.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; - sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "is-my-json-valid-2.13.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-2.0.0" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; - sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "jsprim-1.3.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; - }; - }; - "sshpk-1.10.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; - sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; - }; - }; - "extsprintf-1.0.2" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "verror-1.3.6" = { - name = "verror"; - packageName = "verror"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "dashdash-1.14.0" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; - sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; - }; - }; - "getpass-0.1.6" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; - sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; - }; - }; - "jsbn-0.1.0" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; - }; - }; - "tweetnacl-0.13.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; - }; - }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "bcrypt-pbkdf-1.0.0" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; - }; - }; - "tweetnacl-0.14.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; - }; - }; - "mime-db-1.23.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; - sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; - }; - }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -2020,13 +1444,13 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; - "request-2.69.0" = { - name = "request"; - packageName = "request"; - version = "2.69.0"; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; "jsonparse-1.2.0" = { @@ -2038,22 +1462,31 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "qs-6.0.2" = { - name = "qs"; - packageName = "qs"; - version = "6.0.2"; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; "stack-trace-0.0.9" = { @@ -2272,13 +1705,13 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "glob-7.0.6" = { + "glob-7.1.0" = { name = "glob"; packageName = "glob"; - version = "7.0.6"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz"; + sha1 = "36add856d746d0d99e4cc2797bba1ae2c67272fd"; }; }; "fs.realpath-1.0.0" = { @@ -2317,13 +1750,13 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "path-is-absolute-1.0.0" = { + "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; "wrappy-1.0.2" = { @@ -2380,6 +1813,15 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -2389,6 +1831,141 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "aws4-1.4.1" = { + name = "aws4"; + packageName = "aws4"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; + sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; + }; + }; + "bl-1.1.2" = { + name = "bl"; + packageName = "bl"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + }; + }; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + }; + }; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-types-2.1.12" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; + sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; "qs-6.2.1" = { name = "qs"; packageName = "qs"; @@ -2398,6 +1975,15 @@ let sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; }; }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; "tough-cookie-2.3.1" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -2407,6 +1993,375 @@ let sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; }; }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "async-2.0.1" = { + name = "async"; + packageName = "async"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; + sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + }; + }; + "lodash-4.16.2" = { + name = "lodash"; + packageName = "lodash"; + version = "4.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz"; + sha1 = "3e626db827048a699281a8a125226326cfc0e652"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "is-my-json-valid-2.14.0" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz"; + sha1 = "47bf808609b2df5d48c969c74becd09fbca02725"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; + sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "generate-function-2.0.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + }; + "generate-object-property-1.2.0" = { + name = "generate-object-property"; + packageName = "generate-object-property"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + }; + "jsonpointer-2.0.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; + sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "jsprim-1.3.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + }; + }; + "sshpk-1.10.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; + sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; + }; + }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "dashdash-1.14.0" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; + sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + }; + }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; + "jsbn-0.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + }; + "tweetnacl-0.14.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + }; + }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.0" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; + sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + }; + }; + "mime-db-1.24.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; + sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + }; + }; "asn1-0.1.11" = { name = "asn1"; packageName = "asn1"; @@ -2497,13 +2452,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "asap-2.0.4" = { + "asap-2.0.5" = { name = "asap"; packageName = "asap"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz"; - sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; + sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; "async-1.0.0" = { @@ -2965,13 +2920,13 @@ let sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; - "array-find-index-1.0.1" = { + "array-find-index-1.0.2" = { name = "array-find-index"; packageName = "array-find-index"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; - sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; "hosted-git-info-2.1.5" = { @@ -3082,13 +3037,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; + sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; }; }; "parse-json-2.2.0" = { @@ -3199,13 +3154,13 @@ let sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; }; }; - "jsonfile-2.3.1" = { + "jsonfile-2.4.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz"; - sha1 = "28bcb29c596b5b7aafd34e662a329ba62cd842fc"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; "klaw-1.3.0" = { @@ -3253,13 +3208,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.1.4" = { + "JSONStream-1.2.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.1.4"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; }; }; "assert-1.3.0" = { @@ -3685,13 +3640,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.1.2" = { + "base64-js-1.2.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; "ieee754-1.1.6" = { @@ -3766,13 +3721,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.6" = { + "pbkdf2-3.0.8" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.6.tgz"; - sha1 = "943d289ccd92b3dec55cc77dd696d44d6087e8bd"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz"; + sha1 = "2f8abf16ebecc82277945d748aba1d78761f61e2"; }; }; "public-encrypt-4.0.0" = { @@ -3874,13 +3829,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.1" = { + "elliptic-6.3.2" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz"; - sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; + sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; }; }; "parse-asn1-5.0.0" = { @@ -3910,13 +3865,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.0" = { + "asn1.js-4.8.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz"; - sha1 = "e0e04e9923319163be46aed9e5378973b161ef13"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; + sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; }; }; "ripemd160-1.0.1" = { @@ -4657,6 +4612,15 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4765,13 +4729,13 @@ let sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; }; }; - "simple-get-2.2.2" = { + "simple-get-2.2.3" = { name = "simple-get"; packageName = "simple-get"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.2.tgz"; - sha1 = "e4d0ff30af7dddf8ef9b5221c32658e7f1438515"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.3.tgz"; + sha1 = "cc4b653891601977db17ff3bcbb01474997f9fdb"; }; }; "thirty-two-1.0.2" = { @@ -4810,13 +4774,13 @@ let sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; }; }; - "rusha-0.8.3" = { + "rusha-0.8.4" = { name = "rusha"; packageName = "rusha"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.3.tgz"; - sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; + sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; }; }; "unzip-response-1.0.1" = { @@ -5134,13 +5098,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "buffer-equals-1.0.3" = { + "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.3.tgz"; - sha1 = "9e9b8c160a5ceaf68f12ee5a8d2f4ba91c5453e0"; + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; "k-bucket-0.6.0" = { @@ -6844,13 +6808,22 @@ let sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa"; }; }; - "lockfile-1.0.1" = { + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "lockfile-1.0.2" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"; - sha1 = "9d353ecfe3f54d150bb57f89d51746935a39c4f5"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; + sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; }; }; "lru-cache-4.0.1" = { @@ -7564,13 +7537,13 @@ let sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; }; }; - "uuid-2.0.2" = { + "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; - sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; "write-file-atomic-1.2.0" = { @@ -7699,6 +7672,15 @@ let sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; "ansi-escapes-1.4.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -7771,13 +7753,13 @@ let sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "code-point-at-1.0.0" = { + "code-point-at-1.0.1" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; - sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; + sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -7825,6 +7807,33 @@ let sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; }; }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "parserlib-1.0.0" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; + sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + }; + }; "bluebird-2.9.9" = { name = "bluebird"; packageName = "bluebird"; @@ -8531,13 +8540,13 @@ let sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; - "level-sublevel-6.5.4" = { + "level-sublevel-6.6.0" = { name = "level-sublevel"; packageName = "level-sublevel"; - version = "6.5.4"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.5.4.tgz"; - sha1 = "92e6534e7ac3fa35c8bdb121b8a8094a8d1c0826"; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.0.tgz"; + sha1 = "675f2f6a3d437b10700e840069bcb331a5c8362f"; }; }; "leveldown-0.10.6" = { @@ -8873,6 +8882,15 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; + "JSONStream-1.1.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; + sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + }; + }; "got-6.5.0" = { name = "got"; packageName = "got"; @@ -8945,13 +8963,13 @@ let sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; - "node-status-codes-2.0.0" = { + "node-status-codes-2.0.1" = { name = "node-status-codes"; packageName = "node-status-codes"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz"; - sha1 = "f2d469d8927f088aff28a956d2b93e3e2d14fb8d"; + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; + sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; }; }; "unzip-response-2.0.1" = { @@ -8999,13 +9017,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.1.7" = { + "espree-3.3.2" = { name = "espree"; packageName = "espree"; - version = "3.1.7"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz"; - sha1 = "fd5deec76a97a5120a9cd3a7cb1177a0923b11d2"; + url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; + sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; }; }; "estraverse-4.2.0" = { @@ -9107,13 +9125,13 @@ let sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "optionator-0.8.1" = { + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; - sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "pluralize-1.2.1" = { @@ -9152,13 +9170,13 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "table-3.7.8" = { + "table-3.8.0" = { name = "table"; packageName = "table"; - version = "3.7.8"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.7.8.tgz"; - sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; + url = "https://registry.npmjs.org/table/-/table-3.8.0.tgz"; + sha1 = "252166c7f3286684a9d561b0f3a8929caf3a997b"; }; }; "es6-map-0.1.4" = { @@ -9215,13 +9233,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-3.3.0" = { + "acorn-4.0.3" = { name = "acorn"; packageName = "acorn"; - version = "3.3.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; + sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; }; }; "acorn-jsx-3.0.1" = { @@ -9233,6 +9251,15 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; "flat-cache-1.2.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -9359,13 +9386,13 @@ let sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453"; }; }; - "argparse-1.0.7" = { + "argparse-1.0.9" = { name = "argparse"; packageName = "argparse"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"; - sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; "esprima-2.7.3" = { @@ -9413,13 +9440,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "fast-levenshtein-1.1.4" = { + "fast-levenshtein-2.0.5" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "1.1.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; - sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; + sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; }; }; "caller-path-0.1.0" = { @@ -9449,13 +9476,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "bluebird-3.4.6" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.4.6"; + "ajv-4.7.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; - sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.7.5.tgz"; + sha1 = "f44172aec18514e6ba6350cc5fae0ee9b142e68c"; + }; + }; + "ajv-keywords-1.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; + sha1 = "02550bc605a3e576041565628af972e06c549d50"; }; }; "slice-ansi-0.0.4" = { @@ -9467,22 +9503,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "tv4-1.2.7" = { - name = "tv4"; - packageName = "tv4"; - version = "1.2.7"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"; - sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120"; - }; - }; - "xregexp-3.1.1" = { - name = "xregexp"; - packageName = "xregexp"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz"; - sha1 = "8ee18d75ef5c7cb3f9967f8d29414a6ca5b1a184"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; "glob-3.2.11" = { @@ -10188,13 +10215,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.10.0" = { + "coffee-script-1.11.0" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; }; "jade-1.11.0" = { @@ -10233,13 +10260,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.19" = { + "clean-css-3.4.20" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.19"; + version = "3.4.20"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.19.tgz"; - sha1 = "c32a8a13ca3b824609b14306a5da76d8793c7874"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; + sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; }; }; "commander-2.6.0" = { @@ -11223,85 +11250,58 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-2.0.0" = { + "eventemitter3-2.0.2" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.0.tgz"; - sha1 = "605f34e75ea702681fcd06b2f4ee2e7b4e019006"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; + sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; }; }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; }; }; - "handlebars-4.0.5" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.5"; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; - "supports-color-3.1.2" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; - }; - }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; - }; - }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; + "xml-1.0.0" = { + name = "xml"; + packageName = "xml"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; + sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; - "when-3.4.6" = { - name = "when"; - packageName = "when"; - version = "3.4.6"; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; - sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; }; }; - "cli-1.0.0" = { + "cli-0.6.6" = { name = "cli"; packageName = "cli"; - version = "1.0.0"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; - sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; }; }; "exit-0.1.2" = { @@ -11394,6 +11394,87 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "handlebars-4.0.5" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; + sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "when-3.4.6" = { + name = "when"; + packageName = "when"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + }; + }; + "cli-1.0.0" = { + name = "cli"; + packageName = "cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; + sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + }; + }; + "bluebird-3.4.6" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; + sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + }; + }; "body-parser-1.15.2" = { name = "body-parser"; packageName = "body-parser"; @@ -13347,13 +13428,13 @@ let sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; }; }; - "node-red-node-twitter-0.1.6" = { + "node-red-node-twitter-0.1.7" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.6.tgz"; - sha1 = "ee1c65767db0325f316987bf155543864995e618"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; + sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; }; }; "node-red-node-rbe-0.1.5" = { @@ -13653,6 +13734,15 @@ let sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; "qs-5.2.1" = { name = "qs"; packageName = "qs"; @@ -13662,6 +13752,15 @@ let sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; }; }; + "tough-cookie-2.2.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -13698,13 +13797,13 @@ let sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; }; }; - "imap-0.8.17" = { + "imap-0.8.18" = { name = "imap"; packageName = "imap"; - version = "0.8.17"; + version = "0.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.17.tgz"; - sha1 = "e70ff1d1def0456af8bf1d96164d36176662172a"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; + sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; }; }; "libmime-1.2.0" = { @@ -13842,13 +13941,13 @@ let sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; }; }; - "utf7-1.0.0" = { + "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz"; - sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc"; + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; }; }; "twitter-ng-0.6.2" = { @@ -13860,15 +13959,6 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "request-2.67.0" = { - name = "request"; - packageName = "request"; - version = "2.67.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; - sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; - }; - }; "serialport-2.1.2" = { name = "serialport"; packageName = "serialport"; @@ -14517,6 +14607,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -14526,40 +14625,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.4.1" = { + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; - }; - }; - "lodash.union-4.5.0" = { - name = "lodash.union"; - packageName = "lodash.union"; version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.uniq-4.4.0" = { + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.3.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "npm-install-checks-3.0.0" = { @@ -14598,15 +14697,6 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "retry-0.9.0" = { - name = "retry"; - packageName = "retry"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; - }; - }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14922,51 +15012,6 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "fstream-npm-1.2.0" = { - name = "fstream-npm"; - packageName = "fstream-npm"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; - sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - }; - "lodash.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - }; - "lodash.without-4.4.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; - sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; - }; - }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -15066,13 +15111,13 @@ let sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; }; }; - "buffer-indexof-1.0.2" = { + "buffer-indexof-1.1.0" = { name = "buffer-indexof"; packageName = "buffer-indexof"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.0.2.tgz"; - sha1 = "7fff11985ce51fe9ff07c40121ad301781587cdf"; + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; + sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; }; }; "next-line-1.1.0" = { @@ -15714,6 +15759,15 @@ let sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -16030,13 +16084,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.4" = { + "openid-2.0.6" = { name = "openid"; packageName = "openid"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.4.tgz"; - sha1 = "73486f2862b080cc1a582cfd5d4df61d0274ef60"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; "node-swt-0.1.1" = { @@ -16219,6 +16273,15 @@ let sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; }; }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; "path-to-regexp-0.1.6" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -17398,6 +17461,24 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "request-2.72.0" = { + name = "request"; + packageName = "request"; + version = "2.72.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; + sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; + }; + }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "lodash._baseclone-4.5.7" = { name = "lodash._baseclone"; packageName = "lodash._baseclone"; @@ -17425,6 +17506,15 @@ let sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; }; }; + "qs-6.1.0" = { + name = "qs"; + packageName = "qs"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; + sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17587,6 +17677,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.29" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -17838,8 +17937,8 @@ in sources."ini-1.3.4" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."which-1.2.11" // { @@ -17887,10 +17986,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.4"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.4.tgz"; - sha1 = "0f5e9a8a529ac30f0fc8e754513ace91df6b5dae"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.5.tgz"; + sha1 = "7e7490d92521818ab57c561f48e5d6058d9f1583"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17926,9 +18025,9 @@ in sources."get-stdin-4.0.1" (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -17959,7 +18058,7 @@ in ]; }) sources."async-1.4.2" - (sources."azure-common-0.9.17" // { + (sources."azure-common-0.9.18" // { dependencies = [ (sources."xml2js-0.2.7" // { dependencies = [ @@ -17967,137 +18066,6 @@ in ]; }) sources."dateformat-1.0.2-1.2.3" - (sources."request-2.72.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.13.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."oauth-sign-0.8.2" - sources."qs-6.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."tunnel-agent-0.4.3" - ]; - }) sources."validator-3.22.2" sources."envconf-0.0.4" sources."duplexer-0.1.1" @@ -18112,7 +18080,7 @@ in sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-0.1.1" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.16.0" + sources."azure-arm-network-0.17.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" @@ -18121,7 +18089,7 @@ in sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" - sources."azure-graph-1.0.1" + sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" @@ -18145,7 +18113,7 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-1.1.0" // { + (sources."azure-storage-1.3.0" // { dependencies = [ sources."extend-1.2.1" sources."browserify-mime-1.2.9" @@ -18165,123 +18133,6 @@ in sources."util-deprecate-1.0.2" ]; }) - (sources."request-2.69.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - sources."bl-1.0.3" - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.13.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."qs-6.0.2" - sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."tunnel-agent-0.4.3" - ]; - }) sources."validator-3.22.2" (sources."xml2js-0.2.7" // { dependencies = [ @@ -18291,7 +18142,8 @@ in ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.5.0" + sources."azure-batch-0.5.2" + sources."azure-servicefabric-0.1.4" sources."applicationinsights-0.15.12" (sources."caller-id-0.1.0" // { dependencies = [ @@ -18336,6 +18188,7 @@ in sources."JSV-4.0.2" ]; }) + sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" (sources."kuduscript-1.0.8" // { dependencies = [ @@ -18347,7 +18200,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.15.0" + sources."moment-2.15.1" (sources."ms-rest-1.15.0" // { dependencies = [ sources."duplexer-0.1.1" @@ -18387,7 +18240,7 @@ in sources."ncp-0.4.2" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -18411,7 +18264,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -18468,7 +18321,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -18497,7 +18350,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -18534,21 +18387,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -18556,9 +18405,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -18611,7 +18460,7 @@ in sources."http-basic-2.5.1" (sources."promise-7.1.1" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."qs-6.2.1" @@ -18624,7 +18473,7 @@ in sources."underscore-1.4.4" (sources."user-home-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) sources."validator-5.2.0" @@ -18681,7 +18530,7 @@ in version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; - sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; + sha1 = "77cc8f966a3595686f5d6fae30ad9bd2cc20bfe3"; }; dependencies = [ (sources."argparse-1.0.4" // { @@ -18769,7 +18618,7 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) sources."signal-exit-3.0.1" @@ -18814,7 +18663,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -18839,7 +18688,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -18858,9 +18707,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -18899,13 +18748,13 @@ in sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -18954,7 +18803,7 @@ in sources."semver-5.3.0" (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -18981,7 +18830,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -19002,7 +18851,7 @@ in sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; }; dependencies = [ - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.2.1" // { dependencies = [ sources."jsonparse-1.2.0" sources."through-2.3.8" @@ -19030,7 +18879,7 @@ in }) (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."isarray-1.0.0" ]; @@ -19081,7 +18930,7 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ sources."brorand-1.0.6" sources."hash.js-1.0.3" @@ -19089,7 +18938,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19108,7 +18957,7 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ sources."brorand-1.0.6" sources."hash.js-1.0.3" @@ -19134,14 +18983,14 @@ in }) ]; }) - sources."pbkdf2-3.0.6" + sources."pbkdf2-3.0.8" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19187,7 +19036,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."has-1.0.1" // { @@ -19437,7 +19286,7 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) sources."signal-exit-3.0.1" @@ -19482,7 +19331,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -19507,7 +19356,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -19526,9 +19375,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -19619,13 +19468,13 @@ in sources."bencode-0.10.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -19710,7 +19559,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -19748,7 +19597,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -19772,7 +19621,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -19782,7 +19631,7 @@ in (sources."bittorrent-dht-6.4.2" // { dependencies = [ sources."bencode-0.7.0" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" (sources."k-bucket-0.6.0" // { dependencies = [ sources."buffer-equal-0.0.1" @@ -19823,7 +19672,7 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ sources."unzip-response-1.0.1" ]; @@ -19929,7 +19778,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -20007,7 +19856,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -20025,10 +19874,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; buildInputs = globalBuildInputs; meta = { @@ -20074,7 +19923,7 @@ in sources."q-1.4.1" (sources."shelljs-0.7.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -20098,7 +19947,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."interpret-1.0.1" @@ -20115,7 +19964,7 @@ in dependencies = [ (sources."browserify-10.1.3" // { dependencies = [ - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.2.1" // { dependencies = [ sources."jsonparse-1.2.0" sources."through-2.3.8" @@ -20209,7 +20058,7 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ sources."brorand-1.0.6" sources."hash.js-1.0.3" @@ -20217,7 +20066,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20236,7 +20085,7 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ sources."brorand-1.0.6" sources."hash.js-1.0.3" @@ -20262,14 +20111,14 @@ in }) ]; }) - sources."pbkdf2-3.0.6" + sources."pbkdf2-3.0.8" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20484,9 +20333,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -20495,7 +20344,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.8" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) (sources."debug-2.2.0" // { @@ -20511,9 +20360,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -20575,9 +20424,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -20622,7 +20471,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."init-package-json-1.9.4" // { @@ -20650,7 +20499,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."npm-package-arg-4.2.0" // { @@ -20682,7 +20531,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."validate-npm-package-license-3.0.1" // { @@ -20740,7 +20589,7 @@ in }) (sources."dezalgo-1.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."editor-1.0.0" @@ -20761,15 +20610,15 @@ in (sources."glob-7.0.6" // { dependencies = [ sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."hosted-git-info-2.1.5" sources."inflight-1.0.5" sources."inherits-2.0.3" sources."ini-1.3.4" - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lru-cache-4.0.1" // { dependencies = [ sources."pseudomap-1.0.2" @@ -20870,8 +20719,8 @@ in sources."once-1.4.0" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) sources."path-is-inside-1.0.2" @@ -20891,7 +20740,7 @@ in dependencies = [ (sources."glob-6.0.4" // { dependencies = [ - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -20941,7 +20790,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -20961,7 +20810,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -20998,21 +20847,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -21020,9 +20865,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -21141,7 +20986,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21149,7 +20994,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -21172,7 +21017,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -21229,7 +21074,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."minimatch-3.0.3" // { @@ -21244,8 +21089,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."plist-1.2.0" // { @@ -21295,20 +21140,20 @@ in }) (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."object-assign-4.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -21317,7 +21162,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -21406,9 +21251,9 @@ in }) (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -21451,19 +21296,19 @@ in }) (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -21472,7 +21317,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -21500,14 +21345,14 @@ in sources."lodash-3.10.1" (sources."readline2-1.0.1" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) sources."mute-stream-0.0.5" @@ -21548,7 +21393,7 @@ in }) ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -21574,13 +21419,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -21590,7 +21431,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -21627,21 +21468,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -21649,9 +21486,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."oauth-sign-0.8.2" @@ -21671,6 +21508,26 @@ in }; production = true; }; + csslint = nodeEnv.buildNodePackage { + name = "csslint"; + packageName = "csslint"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.3.tgz"; + sha1 = "5dc024f13a1ff91c0dd08d01186ae1f6f9e92862"; + }; + dependencies = [ + sources."clone-1.0.2" + sources."parserlib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CSSLint"; + homepage = http://csslint.net/; + license = "MIT"; + }; + production = true; + }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; packageName = "dnschain"; @@ -21697,9 +21554,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -21998,7 +21855,7 @@ in sources."level-packager-0.18.0" ]; }) - (sources."level-sublevel-6.5.4" // { + (sources."level-sublevel-6.6.0" // { dependencies = [ (sources."pull-stream-2.21.0" // { dependencies = [ @@ -22233,7 +22090,7 @@ in }) (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."aws4-1.4.1" @@ -22243,7 +22100,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" (sources."bl-1.1.2" // { @@ -22268,7 +22125,11 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + (sources."form-data-2.0.0" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -22293,7 +22154,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22330,21 +22191,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -22352,9 +22209,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -22417,7 +22274,7 @@ in sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" - sources."node-status-codes-2.0.0" + sources."node-status-codes-2.0.1" sources."timed-out-2.0.0" sources."unzip-response-2.0.1" (sources."url-parse-lax-1.0.0" // { @@ -22461,7 +22318,7 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) sources."signal-exit-3.0.1" @@ -22507,7 +22364,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -22532,7 +22389,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -22551,9 +22408,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -22582,10 +22439,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.5.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.5.0.tgz"; - sha1 = "22fc9f780ea5bca1306fab2b6d3336b0fa62c754"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.7.0.tgz"; + sha1 = "27499b403de70f8832815c3550330bad67292a57"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -22658,10 +22515,14 @@ in }) ]; }) - (sources."espree-3.1.7" // { + (sources."espree-3.3.2" // { dependencies = [ - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-4.0.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) ]; }) sources."estraverse-4.2.0" @@ -22698,14 +22559,14 @@ in sources."rimraf-2.5.4" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."write-0.2.1" ]; }) sources."object-assign-4.1.0" ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -22729,7 +22590,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."globals-9.10.0" @@ -22758,14 +22619,14 @@ in }) (sources."readline2-1.0.1" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) sources."mute-stream-0.0.5" @@ -22783,14 +22644,14 @@ in sources."rx-lite-3.1.2" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -22799,7 +22660,7 @@ in sources."through-2.3.8" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22818,7 +22679,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -22837,20 +22698,20 @@ in sources."type-check-0.3.2" ]; }) - sources."lodash-4.15.0" + sources."lodash-4.16.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."natural-compare-1.4.0" - (sources."optionator-0.8.1" // { + (sources."optionator-0.8.2" // { dependencies = [ sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."type-check-0.3.2" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" ]; }) sources."path-is-inside-1.0.2" @@ -22869,37 +22730,40 @@ in sources."shelljs-0.6.1" sources."strip-bom-3.0.0" sources."strip-json-comments-1.0.4" - (sources."table-3.7.8" // { + (sources."table-3.8.0" // { dependencies = [ - sources."bluebird-3.4.6" + (sources."ajv-4.7.5" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."ajv-keywords-1.1.1" sources."slice-ansi-0.0.4" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" ]; }) ]; }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."tv4-1.2.7" - sources."xregexp-3.1.1" ]; }) sources."text-table-0.2.0" (sources."user-home-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -22911,6 +22775,21 @@ in }; production = true; }; + emojione = nodeEnv.buildNodePackage { + name = "emojione"; + packageName = "emojione"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; + sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images."; + homepage = http://www.emojione.com/; + }; + production = true; + }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; packageName = "fetch-bower"; @@ -23111,7 +22990,7 @@ in }) (sources."readdirp-2.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23177,14 +23056,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -23208,7 +23087,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -23233,13 +23112,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -23266,7 +23141,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -23303,21 +23178,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -23325,9 +23196,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -23340,7 +23211,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -23373,7 +23244,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) ]; @@ -23387,7 +23258,7 @@ in }) (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."fstream-ignore-1.0.5" // { @@ -23478,7 +23349,7 @@ in sources."minimist-0.0.10" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."prettyjson-1.1.3" // { dependencies = [ sources."colors-1.1.2" @@ -23518,7 +23389,7 @@ in sources."ncp-0.4.2" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -23625,7 +23496,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -23656,11 +23527,11 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" - (sources."clean-css-3.4.19" // { + (sources."clean-css-3.4.20" // { dependencies = [ (sources."commander-2.8.1" // { dependencies = [ @@ -23789,7 +23660,7 @@ in }) (sources."q-2.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" ]; @@ -23799,7 +23670,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -23865,7 +23736,7 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) sources."signal-exit-3.0.1" @@ -23909,7 +23780,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -23934,7 +23805,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -23953,9 +23824,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -24147,7 +24018,7 @@ in dependencies = [ (sources."expand-tilde-1.2.2" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) (sources."global-modules-0.2.3" // { @@ -24157,8 +24028,8 @@ in sources."ini-1.3.4" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."which-1.2.11" // { @@ -24179,7 +24050,7 @@ in dependencies = [ (sources."expand-tilde-1.2.2" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) sources."lodash.assignwith-4.2.0" @@ -24240,7 +24111,7 @@ in sources."semver-4.3.6" (sources."tildify-1.2.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) (sources."v8flags-2.0.11" // { @@ -24373,7 +24244,7 @@ in dependencies = [ (sources."http-proxy-1.0.2" // { dependencies = [ - sources."eventemitter3-2.0.0" + sources."eventemitter3-2.0.2" ]; }) sources."redis-0.10.3" @@ -24388,6 +24259,134 @@ in }; production = true; }; + htmlhint = nodeEnv.buildNodePackage { + name = "htmlhint"; + packageName = "htmlhint"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; + sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + }; + dependencies = [ + sources."async-1.4.2" + sources."colors-1.0.3" + sources."commander-2.6.0" + (sources."csslint-0.10.0" // { + dependencies = [ + sources."parserlib-0.2.5" + ]; + }) + (sources."glob-5.0.15" // { + dependencies = [ + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + (sources."jshint-2.8.0" // { + dependencies = [ + (sources."cli-0.6.6" // { + dependencies = [ + (sources."glob-3.2.11" // { + dependencies = [ + sources."inherits-2.0.3" + (sources."minimatch-0.3.0" // { + dependencies = [ + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."console-browserify-1.1.0" // { + dependencies = [ + sources."date-now-0.1.4" + ]; + }) + sources."exit-0.1.2" + (sources."htmlparser2-3.8.3" // { + dependencies = [ + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { + dependencies = [ + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + ]; + }) + sources."domelementtype-1.3.0" + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + ]; + }) + sources."entities-1.0.0" + ]; + }) + (sources."minimatch-2.0.10" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + sources."shelljs-0.3.0" + sources."lodash-3.7.0" + ]; + }) + (sources."parse-glob-3.0.4" // { + dependencies = [ + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) + sources."is-dotfile-1.0.2" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."strip-json-comments-1.0.4" + sources."xml-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Static Code Analysis Tool for HTML"; + homepage = "https://github.com/yaniswang/HTMLHint#readme"; + license = "MIT"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -24403,13 +24402,13 @@ in dependencies = [ sources."estraverse-1.9.3" sources."esutils-2.0.2" - (sources."optionator-0.8.1" // { + (sources."optionator-0.8.2" // { dependencies = [ sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" ]; }) (sources."source-map-0.2.0" // { @@ -24438,7 +24437,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."handlebars-4.0.5" // { @@ -24508,7 +24507,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -24577,7 +24576,7 @@ in dependencies = [ (sources."cli-1.0.0" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -24591,7 +24590,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -24688,7 +24687,7 @@ in sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; }; dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -24745,9 +24744,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -24842,7 +24841,7 @@ in sources."is-extglob-1.0.0" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ (sources."readable-stream-2.1.5" // { @@ -24900,14 +24899,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -24931,7 +24930,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -24956,13 +24955,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -24989,7 +24984,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -25026,21 +25021,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -25048,9 +25039,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -25104,7 +25095,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) (sources."connect-3.5.0" // { @@ -25156,7 +25147,7 @@ in }) ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -25170,10 +25161,10 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."http-proxy-1.15.1" // { dependencies = [ sources."eventemitter3-1.2.0" @@ -25354,7 +25345,7 @@ in sources."source-map-0.5.6" (sources."tmp-0.0.28" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; }) (sources."useragent-2.1.9" // { @@ -25410,9 +25401,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -25420,7 +25411,7 @@ in }) (sources."compressible-2.0.8" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -25450,9 +25441,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -25532,9 +25523,9 @@ in }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -25561,9 +25552,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -25660,7 +25651,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -25747,7 +25738,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."glob-parent-3.0.0" // { @@ -25870,7 +25861,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."gulp-sourcemaps-1.6.0" // { dependencies = [ sources."convert-source-map-1.3.0" @@ -26020,7 +26011,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -26057,7 +26048,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -26083,13 +26074,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -26116,7 +26103,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -26153,21 +26140,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -26175,9 +26158,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -26191,7 +26174,7 @@ in sources."retry-0.8.0" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -26210,7 +26193,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -26244,14 +26227,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26295,8 +26278,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) sources."semver-4.3.6" @@ -26308,7 +26291,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -26316,7 +26299,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -26339,7 +26322,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -26351,7 +26334,7 @@ in }) (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -26401,7 +26384,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -26415,10 +26398,10 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26467,14 +26450,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26492,8 +26475,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."path-array-1.0.1" // { @@ -26519,7 +26502,7 @@ in }) ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -26545,13 +26528,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -26578,7 +26557,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -26615,21 +26594,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -26637,9 +26612,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -26695,8 +26670,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."plist-1.2.0" // { @@ -26744,7 +26719,7 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) sources."signal-exit-3.0.1" @@ -26788,7 +26763,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -26813,7 +26788,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -26832,9 +26807,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26853,7 +26828,7 @@ in }) (sources."untildify-2.1.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -26871,9 +26846,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -26930,9 +26905,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -26966,7 +26941,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."deep-extend-0.4.1" @@ -27032,14 +27007,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -27055,7 +27030,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -27081,13 +27056,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -27114,7 +27085,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27151,21 +27122,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -27173,9 +27140,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -27188,7 +27155,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -27222,7 +27189,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."inherits-2.0.3" @@ -27232,7 +27199,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."inherits-2.0.3" ]; }) @@ -27317,14 +27284,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -27340,7 +27307,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -27366,13 +27333,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -27399,7 +27362,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27436,21 +27399,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -27458,9 +27417,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -27473,7 +27432,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -27507,7 +27466,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."inherits-2.0.3" @@ -27517,7 +27476,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."inherits-2.0.3" ]; }) @@ -27595,14 +27554,14 @@ in }) (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { @@ -27671,14 +27630,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -27702,7 +27661,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -27728,13 +27687,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -27761,7 +27716,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27798,21 +27753,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -27820,9 +27771,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -27835,7 +27786,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -27859,7 +27810,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -27870,7 +27821,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."inherits-2.0.3" @@ -27885,7 +27836,7 @@ in }) (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."inherits-2.0.3" ]; }) @@ -28029,10 +27980,10 @@ in sources."is-extglob-1.0.0" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -28088,14 +28039,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -28119,7 +28070,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -28144,13 +28095,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -28177,7 +28124,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -28214,21 +28161,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -28236,9 +28179,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -28251,7 +28194,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -28274,7 +28217,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) ]; @@ -28283,7 +28226,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."fstream-ignore-1.0.5" @@ -28401,20 +28344,20 @@ in }) (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."object-assign-4.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -28423,7 +28366,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -28512,9 +28455,9 @@ in }) (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -28581,9 +28524,9 @@ in sources."qs-6.2.0" (sources."type-is-1.6.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -28645,7 +28588,7 @@ in dependencies = [ (sources."moment-timezone-0.3.1" // { dependencies = [ - sources."moment-2.15.0" + sources."moment-2.15.1" ]; }) ]; @@ -28654,9 +28597,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -28717,9 +28660,9 @@ in sources."serve-static-1.11.1" (sources."type-is-1.6.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -28740,13 +28683,13 @@ in }) (sources."fs-extra-0.30.0" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -29050,7 +28993,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -29095,15 +29038,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -29158,7 +29101,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29266,9 +29209,9 @@ in }) ]; }) - (sources."imap-0.8.17" // { + (sources."imap-0.8.18" // { dependencies = [ - sources."utf7-1.0.0" + sources."utf7-1.0.2" (sources."readable-stream-1.1.14" // { dependencies = [ sources."core-util-is-1.0.2" @@ -29281,13 +29224,15 @@ in }) ]; }) - (sources."node-red-node-twitter-0.1.6" // { + (sources."node-red-node-twitter-0.1.7" // { dependencies = [ sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - (sources."request-2.67.0" // { + (sources."request-2.75.0" // { dependencies = [ - (sources."bl-1.0.3" // { + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { dependencies = [ @@ -29302,74 +29247,18 @@ in ]; }) sources."caseless-0.11.0" - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."qs-5.2.1" - sources."tunnel-agent-0.4.3" - sources."tough-cookie-2.2.2" - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."oauth-sign-0.8.2" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - sources."aws-sign2-0.6.0" - sources."stringstream-0.0.5" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" ]; }) - sources."isstream-0.1.2" - sources."is-typedarray-1.0.0" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-2.0.0" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -29394,7 +29283,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29413,6 +29302,53 @@ in }) ]; }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.12" // { + dependencies = [ + sources."mime-db-1.24.0" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.1" + sources."tunnel-agent-0.4.3" ]; }) ]; @@ -29465,14 +29401,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -29496,7 +29432,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -29522,13 +29458,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -29555,7 +29487,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29592,21 +29524,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -29614,9 +29542,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -29629,7 +29557,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -29653,7 +29581,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -29663,7 +29591,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."inherits-2.0.3" @@ -29673,7 +29601,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."inherits-2.0.3" ]; }) @@ -29831,7 +29759,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -29957,10 +29885,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; dependencies = [ sources."abbrev-1.0.9" @@ -29968,7 +29896,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -29994,7 +29922,7 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - (sources."fstream-npm-1.1.1" // { + (sources."fstream-npm-1.2.0" // { dependencies = [ (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -30025,10 +29953,10 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -30049,23 +29977,23 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" ]; }) - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30083,6 +30011,39 @@ in }) ]; }) + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) (sources."path-array-1.0.1" // { dependencies = [ (sources."array-index-1.0.0" // { @@ -30122,7 +30083,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -30138,11 +30099,43 @@ in }) ]; }) - sources."retry-0.8.0" + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.0" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -30157,14 +30150,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -30175,12 +30168,12 @@ in sources."set-blocking-2.0.0" ]; }) - sources."once-1.3.3" + sources."once-1.4.0" sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) sources."path-is-inside-1.0.2" @@ -30209,7 +30202,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -30260,7 +30253,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -30280,7 +30273,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30317,21 +30310,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -30339,9 +30328,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -30352,9 +30341,9 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" + sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" @@ -30384,7 +30373,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -30433,7 +30422,7 @@ in }) (sources."npm-registry-client-0.2.27" // { dependencies = [ - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -30459,13 +30448,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -30492,7 +30477,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30529,21 +30514,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -30551,9 +30532,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -30571,7 +30552,7 @@ in sources."mkdirp-0.3.5" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -30595,7 +30576,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -30630,14 +30611,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -30699,7 +30680,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -30722,7 +30703,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -30759,7 +30740,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -30826,7 +30807,7 @@ in sources."lodash-3.10.1" (sources."node-alias-1.0.4" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) (sources."npm-3.10.8" // { @@ -30836,7 +30817,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -30893,10 +30874,10 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -30917,13 +30898,13 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" @@ -30966,14 +30947,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31054,14 +31035,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31090,14 +31071,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31112,8 +31093,8 @@ in sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) sources."path-is-inside-1.0.2" @@ -31142,7 +31123,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -31188,14 +31169,14 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) (sources."har-validator-2.0.6" // { dependencies = [ - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -31232,21 +31213,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -31254,9 +31231,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -31334,20 +31311,20 @@ in dependencies = [ (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."object-assign-4.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -31356,7 +31333,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -31445,9 +31422,9 @@ in }) (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31529,7 +31506,7 @@ in dependencies = [ (sources."consume-until-1.0.0" // { dependencies = [ - sources."buffer-indexof-1.0.2" + sources."buffer-indexof-1.1.0" ]; }) (sources."http-headers-3.0.1" // { @@ -31571,14 +31548,14 @@ in dependencies = [ (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { @@ -31599,7 +31576,7 @@ in sources."dns-equal-1.0.0" (sources."dns-txt-2.0.2" // { dependencies = [ - sources."buffer-indexof-1.0.2" + sources."buffer-indexof-1.1.0" ]; }) (sources."multicast-dns-6.1.0" // { @@ -31629,7 +31606,7 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) sources."signal-exit-3.0.1" @@ -31674,7 +31651,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -31699,7 +31676,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -31718,9 +31695,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31808,13 +31785,13 @@ in sources."bencode-0.10.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -31900,7 +31877,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -31938,7 +31915,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -31962,7 +31939,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -31972,7 +31949,7 @@ in (sources."bittorrent-dht-6.4.2" // { dependencies = [ sources."bencode-0.7.0" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" (sources."k-bucket-0.6.0" // { dependencies = [ sources."buffer-equal-0.0.1" @@ -32014,7 +31991,7 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ sources."unzip-response-1.0.1" ]; @@ -32270,7 +32247,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -32456,7 +32433,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -32490,7 +32467,7 @@ in sources."random-access-file-0.3.2" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -32514,7 +32491,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -32526,7 +32503,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) (sources."which-1.2.11" // { @@ -32590,13 +32567,13 @@ in }) (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -32661,15 +32638,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -32686,21 +32663,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -32747,7 +32720,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -32832,10 +32805,10 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."iconv-lite-0.4.13" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -32969,9 +32942,9 @@ in sources."fresh-0.1.0" ]; }) - (sources."openid-2.0.4" // { + (sources."openid-2.0.6" // { dependencies = [ - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -32997,13 +32970,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -33030,7 +32999,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -33067,21 +33036,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -33089,9 +33054,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -33109,7 +33074,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -33161,9 +33126,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -33248,9 +33213,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -33294,9 +33259,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -33307,9 +33272,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -33318,7 +33283,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.8" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) (sources."debug-2.2.0" // { @@ -33337,7 +33302,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -33351,7 +33316,7 @@ in sources."keygrip-1.0.1" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -33377,13 +33342,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -33405,7 +33366,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -33442,21 +33403,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -33464,9 +33421,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -33521,7 +33478,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -33529,7 +33486,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.15.0" + sources."moment-2.15.1" ]; }) (sources."handlebars-2.0.0" // { @@ -33557,7 +33514,7 @@ in dependencies = [ (sources."markdown-it-4.4.0" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -33604,7 +33561,7 @@ in ]; }) sources."jju-1.3.0" - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.2.1" // { dependencies = [ sources."jsonparse-1.2.0" sources."through-2.3.8" @@ -33675,7 +33632,7 @@ in }) (sources."readdirp-2.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33825,7 +33782,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -33972,7 +33929,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."source-map-0.1.43" // { @@ -33992,10 +33949,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.0.tgz"; - sha1 = "51a95c5f7aaa98824f92857ac14c2cdbe81537aa"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; + sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; }; dependencies = [ sources."sax-1.2.1" @@ -34006,7 +33963,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -34059,10 +34016,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.9.tgz"; - sha1 = "113f5f986b5e39e92db0d5d0ba5b2b1f237504e7"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; + sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; }; dependencies = [ sources."async-1.4.2" @@ -34122,15 +34079,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."qs-4.0.0" @@ -34185,7 +34142,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34247,15 +34204,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -34311,7 +34268,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34331,7 +34288,7 @@ in sources."sprintf-0.1.5" (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -34359,10 +34316,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "1.8.10"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; - sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz"; + sha1 = "33dec9eae86b8eee327dd419ca050c853cabd514"; }; buildInputs = globalBuildInputs; meta = { @@ -34480,9 +34437,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -34516,9 +34473,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -34576,9 +34533,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -34775,7 +34732,7 @@ in }) (sources."dezalgo-1.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."editor-1.0.0" @@ -34813,10 +34770,10 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -34837,13 +34794,13 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" @@ -34955,7 +34912,7 @@ in sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; }) sources."path-is-inside-1.0.2" @@ -34984,7 +34941,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -35047,7 +35004,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -35084,21 +35041,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -35106,9 +35059,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -35190,7 +35143,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."normalize-package-data-2.3.5" // { dependencies = [ sources."hosted-git-info-2.1.5" @@ -35221,7 +35174,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -35247,7 +35200,11 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + (sources."form-data-2.0.0" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -35272,7 +35229,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -35309,21 +35266,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -35331,9 +35284,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -35374,14 +35327,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -35401,7 +35354,7 @@ in }) sources."octicons-3.5.0" sources."open-0.0.5" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" (sources."passport-0.3.2" // { dependencies = [ sources."passport-strategy-1.0.0" @@ -35431,7 +35384,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -35455,7 +35408,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -35669,7 +35622,7 @@ in }) (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -35722,7 +35675,7 @@ in }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -35765,7 +35718,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -35810,7 +35763,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -35827,14 +35780,14 @@ in sources."set-blocking-1.0.0" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { @@ -35932,13 +35885,13 @@ in }) (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -36003,15 +35956,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -36028,21 +35981,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -36089,7 +36038,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -36122,9 +36071,9 @@ in }) ]; }) - (sources."tmp-0.0.28" // { + (sources."tmp-0.0.29" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; }) (sources."follow-redirects-0.0.3" // { @@ -36155,7 +36104,7 @@ in (sources."enhanced-resolve-0.9.1" // { dependencies = [ sources."memory-fs-0.2.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."acorn-3.3.0" @@ -36203,7 +36152,7 @@ in }) (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."isarray-1.0.0" ]; @@ -36421,7 +36370,7 @@ in sources."is-extglob-1.0.0" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ (sources."minimatch-3.0.3" // { @@ -36484,14 +36433,14 @@ in sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -36515,7 +36464,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -36540,13 +36489,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -36573,7 +36518,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -36610,21 +36555,17 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -36632,9 +36573,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -36647,7 +36588,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -36727,7 +36668,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."webpack-core-0.6.8" // { @@ -36765,4 +36706,4 @@ in }; production = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index 3431273d7c73..fe1eb1769eac 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -319,22 +319,22 @@ let sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; - "os-homedir-1.0.1" = { + "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"; - sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-tmpdir-1.0.1" = { + "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; "isexe-1.1.2" = { @@ -391,13 +391,13 @@ let sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; - "azure-common-0.9.17" = { + "azure-common-0.9.18" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.17.tgz"; - sha1 = "8f8df41ccb4a026b670645f223e41e1a7f42f33f"; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; }; }; "azure-arm-authorization-2.0.0" = { @@ -481,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.16.0" = { + "azure-arm-network-0.17.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.16.0.tgz"; - sha1 = "df1bd296fb52742af7596db025cbdd1491391f3d"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; + sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -562,13 +562,13 @@ let sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "azure-graph-1.0.1" = { + "azure-graph-1.1.1" = { name = "azure-graph"; packageName = "azure-graph"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.0.1.tgz"; - sha1 = "a2eda330ccd336832b190da0caba9735a73aee97"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; + sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -706,13 +706,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-1.1.0" = { + "azure-storage-1.3.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.1.0.tgz"; - sha1 = "45de61074dbddf44f9245ad287c929541ae971ab"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; + sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; }; }; "azure-arm-batch-0.2.0" = { @@ -724,13 +724,22 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.5.0" = { + "azure-batch-0.5.2" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.0.tgz"; - sha1 = "1fbc1ab0f976ad3f16c5879ba95d4751e9d5bf56"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; + sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + }; + }; + "azure-servicefabric-0.1.4" = { + name = "azure-servicefabric"; + packageName = "azure-servicefabric"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; + sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; }; }; "applicationinsights-0.15.12" = { @@ -832,6 +841,15 @@ let sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; }; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + }; + }; "jsrsasign-4.8.2" = { name = "jsrsasign"; packageName = "jsrsasign"; @@ -850,13 +868,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.15.0" = { + "moment-2.15.1" = { name = "moment"; packageName = "moment"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; - sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz"; + sha1 = "e979c2a29e22888e60f396f2220a6118f85cd94c"; }; }; "ms-rest-1.15.0" = { @@ -1282,22 +1300,22 @@ let sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; }; }; - "is-finite-1.0.1" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "number-is-nan-1.0.0" = { + "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1345,15 +1363,6 @@ let sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }; }; - "request-2.72.0" = { - name = "request"; - packageName = "request"; - version = "2.72.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; - sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; - }; - }; "validator-3.22.2" = { name = "validator"; packageName = "validator"; @@ -1390,591 +1399,6 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "aws4-1.4.1" = { - name = "aws4"; - packageName = "aws4"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; - sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; - }; - }; - "bl-1.1.2" = { - name = "bl"; - packageName = "bl"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; - sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; - }; - }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "extend-3.0.0" = { - name = "extend"; - packageName = "extend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-1.0.1" = { - name = "form-data"; - packageName = "form-data"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; - sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; - }; - }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "mime-types-2.1.11" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; - sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "qs-6.1.0" = { - name = "qs"; - packageName = "qs"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; - sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "tough-cookie-2.2.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; - sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; - }; - }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; - }; - }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "async-2.0.1" = { - name = "async"; - packageName = "async"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; - sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; - }; - }; - "lodash-4.15.0" = { - name = "lodash"; - packageName = "lodash"; - version = "4.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; - sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "is-my-json-valid-2.13.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-2.0.0" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; - sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "jsprim-1.3.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; - }; - }; - "sshpk-1.10.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; - sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; - }; - }; - "extsprintf-1.0.2" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "verror-1.3.6" = { - name = "verror"; - packageName = "verror"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "dashdash-1.14.0" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; - sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; - }; - }; - "getpass-0.1.6" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; - sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; - }; - }; - "jsbn-0.1.0" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; - }; - }; - "tweetnacl-0.13.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; - }; - }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "bcrypt-pbkdf-1.0.0" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; - }; - }; - "tweetnacl-0.14.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; - }; - }; - "mime-db-1.23.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; - sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; - }; - }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -2020,13 +1444,13 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; - "request-2.69.0" = { - name = "request"; - packageName = "request"; - version = "2.69.0"; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; "jsonparse-1.2.0" = { @@ -2038,22 +1462,31 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "qs-6.0.2" = { - name = "qs"; - packageName = "qs"; - version = "6.0.2"; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; "stack-trace-0.0.9" = { @@ -2272,13 +1705,13 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "glob-7.0.6" = { + "glob-7.1.0" = { name = "glob"; packageName = "glob"; - version = "7.0.6"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz"; + sha1 = "36add856d746d0d99e4cc2797bba1ae2c67272fd"; }; }; "fs.realpath-1.0.0" = { @@ -2317,13 +1750,13 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "path-is-absolute-1.0.0" = { + "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; "wrappy-1.0.2" = { @@ -2380,6 +1813,15 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -2389,6 +1831,141 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "aws4-1.4.1" = { + name = "aws4"; + packageName = "aws4"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; + sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; + }; + }; + "bl-1.1.2" = { + name = "bl"; + packageName = "bl"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + }; + }; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + }; + }; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-types-2.1.12" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; + sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; "qs-6.2.1" = { name = "qs"; packageName = "qs"; @@ -2398,6 +1975,15 @@ let sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; }; }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; "tough-cookie-2.3.1" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -2407,6 +1993,375 @@ let sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; }; }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "async-2.0.1" = { + name = "async"; + packageName = "async"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; + sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + }; + }; + "lodash-4.16.2" = { + name = "lodash"; + packageName = "lodash"; + version = "4.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz"; + sha1 = "3e626db827048a699281a8a125226326cfc0e652"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "is-my-json-valid-2.14.0" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz"; + sha1 = "47bf808609b2df5d48c969c74becd09fbca02725"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; + sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "generate-function-2.0.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + }; + "generate-object-property-1.2.0" = { + name = "generate-object-property"; + packageName = "generate-object-property"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + }; + "jsonpointer-2.0.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; + sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "jsprim-1.3.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + }; + }; + "sshpk-1.10.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; + sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; + }; + }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "dashdash-1.14.0" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; + sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + }; + }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; + "jsbn-0.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + }; + "tweetnacl-0.14.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + }; + }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.0" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; + sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + }; + }; + "mime-db-1.24.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; + sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + }; + }; "asn1-0.1.11" = { name = "asn1"; packageName = "asn1"; @@ -2488,13 +2443,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "asap-2.0.4" = { + "asap-2.0.5" = { name = "asap"; packageName = "asap"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz"; - sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; + sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; "async-1.0.0" = { @@ -2947,13 +2902,13 @@ let sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; - "array-find-index-1.0.1" = { + "array-find-index-1.0.2" = { name = "array-find-index"; packageName = "array-find-index"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; - sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; "hosted-git-info-2.1.5" = { @@ -3064,13 +3019,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; + sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; }; }; "parse-json-2.2.0" = { @@ -3181,13 +3136,13 @@ let sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; }; }; - "jsonfile-2.3.1" = { + "jsonfile-2.4.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz"; - sha1 = "28bcb29c596b5b7aafd34e662a329ba62cd842fc"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; "klaw-1.3.0" = { @@ -3235,13 +3190,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.1.4" = { + "JSONStream-1.2.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.1.4"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; }; }; "assert-1.3.0" = { @@ -3676,13 +3631,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.1.2" = { + "base64-js-1.2.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; "ieee754-1.1.6" = { @@ -3757,13 +3712,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.6" = { + "pbkdf2-3.0.8" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.6.tgz"; - sha1 = "943d289ccd92b3dec55cc77dd696d44d6087e8bd"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz"; + sha1 = "2f8abf16ebecc82277945d748aba1d78761f61e2"; }; }; "public-encrypt-4.0.0" = { @@ -3865,13 +3820,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.1" = { + "elliptic-6.3.2" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz"; - sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; + sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; }; }; "parse-asn1-5.0.0" = { @@ -3901,13 +3856,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.0" = { + "asn1.js-4.8.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz"; - sha1 = "e0e04e9923319163be46aed9e5378973b161ef13"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; + sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; }; }; "ripemd160-1.0.1" = { @@ -4648,6 +4603,15 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4756,13 +4720,13 @@ let sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; }; }; - "simple-get-2.2.2" = { + "simple-get-2.2.3" = { name = "simple-get"; packageName = "simple-get"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.2.tgz"; - sha1 = "e4d0ff30af7dddf8ef9b5221c32658e7f1438515"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.3.tgz"; + sha1 = "cc4b653891601977db17ff3bcbb01474997f9fdb"; }; }; "thirty-two-1.0.2" = { @@ -4801,13 +4765,13 @@ let sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; }; }; - "rusha-0.8.3" = { + "rusha-0.8.4" = { name = "rusha"; packageName = "rusha"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.3.tgz"; - sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; + sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; }; }; "unzip-response-1.0.1" = { @@ -5125,13 +5089,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "buffer-equals-1.0.3" = { + "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.3.tgz"; - sha1 = "9e9b8c160a5ceaf68f12ee5a8d2f4ba91c5453e0"; + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; "k-bucket-0.6.0" = { @@ -6844,13 +6808,22 @@ let sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa"; }; }; - "lockfile-1.0.1" = { + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "lockfile-1.0.2" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"; - sha1 = "9d353ecfe3f54d150bb57f89d51746935a39c4f5"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; + sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; }; }; "lru-cache-4.0.1" = { @@ -7177,6 +7150,33 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7555,13 +7555,13 @@ let sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; }; }; - "uuid-2.0.2" = { + "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; - sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; "xdg-basedir-2.0.0" = { @@ -7753,13 +7753,13 @@ let sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "code-point-at-1.0.0" = { + "code-point-at-1.0.1" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; - sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; + sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -7807,6 +7807,15 @@ let sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; }; }; + "parserlib-1.0.0" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; + sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + }; + }; "bluebird-2.9.9" = { name = "bluebird"; packageName = "bluebird"; @@ -8513,13 +8522,13 @@ let sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; - "level-sublevel-6.5.4" = { + "level-sublevel-6.6.0" = { name = "level-sublevel"; packageName = "level-sublevel"; - version = "6.5.4"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.5.4.tgz"; - sha1 = "92e6534e7ac3fa35c8bdb121b8a8094a8d1c0826"; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.0.tgz"; + sha1 = "675f2f6a3d437b10700e840069bcb331a5c8362f"; }; }; "leveldown-0.10.6" = { @@ -8855,6 +8864,15 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; + "JSONStream-1.1.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; + sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + }; + }; "got-6.5.0" = { name = "got"; packageName = "got"; @@ -8927,13 +8945,13 @@ let sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; - "node-status-codes-2.0.0" = { + "node-status-codes-2.0.1" = { name = "node-status-codes"; packageName = "node-status-codes"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz"; - sha1 = "f2d469d8927f088aff28a956d2b93e3e2d14fb8d"; + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; + sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; }; }; "unzip-response-2.0.1" = { @@ -8981,13 +8999,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.1.7" = { + "espree-3.3.2" = { name = "espree"; packageName = "espree"; - version = "3.1.7"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz"; - sha1 = "fd5deec76a97a5120a9cd3a7cb1177a0923b11d2"; + url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; + sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; }; }; "estraverse-4.2.0" = { @@ -9089,13 +9107,13 @@ let sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "optionator-0.8.1" = { + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; - sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "pluralize-1.2.1" = { @@ -9134,13 +9152,13 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "table-3.7.8" = { + "table-3.8.0" = { name = "table"; packageName = "table"; - version = "3.7.8"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.7.8.tgz"; - sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; + url = "https://registry.npmjs.org/table/-/table-3.8.0.tgz"; + sha1 = "252166c7f3286684a9d561b0f3a8929caf3a997b"; }; }; "es6-map-0.1.4" = { @@ -9197,13 +9215,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-3.3.0" = { + "acorn-4.0.3" = { name = "acorn"; packageName = "acorn"; - version = "3.3.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; + sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; }; }; "acorn-jsx-3.0.1" = { @@ -9215,6 +9233,15 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; "flat-cache-1.2.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -9341,13 +9368,13 @@ let sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453"; }; }; - "argparse-1.0.7" = { + "argparse-1.0.9" = { name = "argparse"; packageName = "argparse"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"; - sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; "esprima-2.7.3" = { @@ -9395,13 +9422,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "fast-levenshtein-1.1.4" = { + "fast-levenshtein-2.0.5" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "1.1.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; - sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; + sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; }; }; "caller-path-0.1.0" = { @@ -9431,13 +9458,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "bluebird-3.4.6" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.4.6"; + "ajv-4.7.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; - sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.7.5.tgz"; + sha1 = "f44172aec18514e6ba6350cc5fae0ee9b142e68c"; + }; + }; + "ajv-keywords-1.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; + sha1 = "02550bc605a3e576041565628af972e06c549d50"; }; }; "slice-ansi-0.0.4" = { @@ -9449,22 +9485,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "tv4-1.2.7" = { - name = "tv4"; - packageName = "tv4"; - version = "1.2.7"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"; - sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120"; - }; - }; - "xregexp-3.1.1" = { - name = "xregexp"; - packageName = "xregexp"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz"; - sha1 = "8ee18d75ef5c7cb3f9967f8d29414a6ca5b1a184"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; "glob-3.2.11" = { @@ -10170,13 +10197,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.10.0" = { + "coffee-script-1.11.0" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; }; "jade-1.11.0" = { @@ -10215,13 +10242,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.19" = { + "clean-css-3.4.20" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.19"; + version = "3.4.20"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.19.tgz"; - sha1 = "c32a8a13ca3b824609b14306a5da76d8793c7874"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; + sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; }; }; "commander-2.6.0" = { @@ -11205,85 +11232,58 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-2.0.0" = { + "eventemitter3-2.0.2" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.0.tgz"; - sha1 = "605f34e75ea702681fcd06b2f4ee2e7b4e019006"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; + sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; }; }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; }; }; - "handlebars-4.0.5" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.5"; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; - "supports-color-3.1.2" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; - }; - }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; - }; - }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; + "xml-1.0.0" = { + name = "xml"; + packageName = "xml"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; + sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; - "when-3.4.6" = { - name = "when"; - packageName = "when"; - version = "3.4.6"; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; - sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; }; }; - "cli-1.0.0" = { + "cli-0.6.6" = { name = "cli"; packageName = "cli"; - version = "1.0.0"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; - sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; }; }; "exit-0.1.2" = { @@ -11376,6 +11376,87 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "handlebars-4.0.5" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; + sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "when-3.4.6" = { + name = "when"; + packageName = "when"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + }; + }; + "cli-1.0.0" = { + name = "cli"; + packageName = "cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; + sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + }; + }; + "bluebird-3.4.6" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; + sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + }; + }; "body-parser-1.15.2" = { name = "body-parser"; packageName = "body-parser"; @@ -13338,13 +13419,13 @@ let sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; }; }; - "node-red-node-twitter-0.1.6" = { + "node-red-node-twitter-0.1.7" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.6.tgz"; - sha1 = "ee1c65767db0325f316987bf155543864995e618"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; + sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; }; }; "node-red-node-rbe-0.1.5" = { @@ -13644,6 +13725,15 @@ let sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; "qs-5.2.1" = { name = "qs"; packageName = "qs"; @@ -13653,6 +13743,15 @@ let sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; }; }; + "tough-cookie-2.2.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -13689,13 +13788,13 @@ let sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; }; }; - "imap-0.8.17" = { + "imap-0.8.18" = { name = "imap"; packageName = "imap"; - version = "0.8.17"; + version = "0.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.17.tgz"; - sha1 = "e70ff1d1def0456af8bf1d96164d36176662172a"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; + sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; }; }; "libmime-1.2.0" = { @@ -13833,13 +13932,13 @@ let sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; }; }; - "utf7-1.0.0" = { + "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz"; - sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc"; + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; }; }; "twitter-ng-0.6.2" = { @@ -13851,15 +13950,6 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "request-2.67.0" = { - name = "request"; - packageName = "request"; - version = "2.67.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; - sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; - }; - }; "serialport-2.1.2" = { name = "serialport"; packageName = "serialport"; @@ -14508,6 +14598,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -14517,40 +14616,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.4.1" = { + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; - }; - }; - "lodash.union-4.5.0" = { - name = "lodash.union"; - packageName = "lodash.union"; version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.uniq-4.4.0" = { + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.3.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "npm-install-checks-3.0.0" = { @@ -14589,15 +14688,6 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "retry-0.9.0" = { - name = "retry"; - packageName = "retry"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; - }; - }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14913,51 +15003,6 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "fstream-npm-1.2.0" = { - name = "fstream-npm"; - packageName = "fstream-npm"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; - sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - }; - "lodash.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - }; - "lodash.without-4.4.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; - sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; - }; - }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -15057,13 +15102,13 @@ let sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; }; }; - "buffer-indexof-1.0.2" = { + "buffer-indexof-1.1.0" = { name = "buffer-indexof"; packageName = "buffer-indexof"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.0.2.tgz"; - sha1 = "7fff11985ce51fe9ff07c40121ad301781587cdf"; + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; + sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; }; }; "next-line-1.1.0" = { @@ -15705,6 +15750,15 @@ let sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -16021,13 +16075,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.4" = { + "openid-2.0.6" = { name = "openid"; packageName = "openid"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.4.tgz"; - sha1 = "73486f2862b080cc1a582cfd5d4df61d0274ef60"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; "node-swt-0.1.1" = { @@ -16210,6 +16264,15 @@ let sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; }; }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; "path-to-regexp-0.1.6" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -17389,6 +17452,24 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "request-2.72.0" = { + name = "request"; + packageName = "request"; + version = "2.72.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; + sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; + }; + }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "lodash._baseclone-4.5.7" = { name = "lodash._baseclone"; packageName = "lodash._baseclone"; @@ -17416,6 +17497,15 @@ let sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; }; }; + "qs-6.1.0" = { + name = "qs"; + packageName = "qs"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; + sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17578,6 +17668,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.29" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -17824,8 +17923,8 @@ in sources."ini-1.3.4" sources."osenv-0.1.3" sources."which-1.2.11" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" sources."xml2js-0.2.8" sources."sax-0.5.8" @@ -17842,10 +17941,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.4"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.4.tgz"; - sha1 = "0f5e9a8a529ac30f0fc8e754513ace91df6b5dae"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.5.tgz"; + sha1 = "7e7490d92521818ab57c561f48e5d6058d9f1583"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17854,12 +17953,10 @@ in ]; }) sources."async-1.4.2" - (sources."azure-common-0.9.17" // { + (sources."azure-common-0.9.18" // { dependencies = [ sources."xml2js-0.2.7" - sources."request-2.72.0" sources."validator-3.22.2" - sources."node-uuid-1.4.7" ]; }) sources."azure-arm-authorization-2.0.0" @@ -17871,7 +17968,7 @@ in sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-0.1.1" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.16.0" + sources."azure-arm-network-0.17.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" @@ -17880,7 +17977,7 @@ in sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" - sources."azure-graph-1.0.1" + sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" @@ -17904,25 +18001,18 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-1.1.0" // { + (sources."azure-storage-1.3.0" // { dependencies = [ - sources."extend-1.2.1" sources."node-uuid-1.4.7" sources."readable-stream-2.0.6" - (sources."request-2.69.0" // { - dependencies = [ - sources."extend-3.0.0" - ]; - }) sources."validator-3.22.2" sources."xml2js-0.2.7" sources."isarray-1.0.0" - sources."bl-1.0.3" - sources."qs-6.0.2" ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.5.0" + sources."azure-batch-0.5.2" + sources."azure-servicefabric-0.1.4" sources."applicationinsights-0.15.12" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -17934,6 +18024,7 @@ in sources."fast-json-patch-0.5.6" sources."js2xmlparser-1.0.0" sources."jsonlint-1.6.2" + sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" (sources."kuduscript-1.0.8" // { dependencies = [ @@ -17941,7 +18032,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.15.0" + sources."moment-2.15.1" sources."ms-rest-1.15.0" (sources."ms-rest-azure-1.15.0" // { dependencies = [ @@ -17968,9 +18059,8 @@ in sources."readable-stream-1.0.34" (sources."request-2.74.0" // { dependencies = [ + sources."extend-3.0.0" sources."node-uuid-1.4.7" - sources."qs-6.2.1" - sources."tough-cookie-2.3.1" ]; }) (sources."ssh-key-to-pem-0.11.0" // { @@ -18022,8 +18112,8 @@ in sources."map-obj-1.0.1" sources."get-stdin-4.0.1" sources."repeating-1.1.3" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."buffer-equal-constant-time-1.0.1" sources."ecdsa-sig-formatter-1.0.7" sources."base64-url-1.3.2" @@ -18031,97 +18121,12 @@ in sources."envconf-0.0.4" sources."duplexer-0.1.1" sources."sax-0.5.2" - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" - ]; - }) - sources."caseless-0.11.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) - sources."hawk-3.1.3" - sources."http-signature-1.1.1" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" - sources."oauth-sign-0.8.2" - sources."qs-6.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."tunnel-agent-0.4.3" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.13.1" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.6" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."extend-1.2.1" sources."browserify-mime-1.2.9" sources."json-edm-parser-0.1.2" sources."jsonparse-1.2.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" sources."stack-trace-0.0.9" sources."keypress-0.1.0" sources."from-0.1.3" @@ -18132,13 +18137,13 @@ in (sources."nomnom-1.8.1" // { dependencies = [ sources."underscore-1.6.0" - sources."chalk-0.4.0" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" ]; }) sources."JSV-4.0.2" + sources."chalk-0.4.0" sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" sources."uuid-2.0.1" sources."debug-0.7.4" sources."q-0.9.7" @@ -18158,17 +18163,98 @@ in }) sources."ncp-0.4.2" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" + sources."isstream-0.1.2" + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + sources."async-2.0.1" + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.1" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."lodash-4.16.2" + sources."is-my-json-valid-2.14.0" + sources."pinkie-promise-2.0.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.14" @@ -18178,8 +18264,8 @@ in sources."then-request-2.2.0" sources."http-basic-2.5.1" sources."promise-7.1.1" - sources."asap-2.0.4" - sources."os-homedir-1.0.1" + sources."asap-2.0.5" + sources."os-homedir-1.0.2" sources."mute-stream-0.0.6" ]; buildInputs = globalBuildInputs; @@ -18212,7 +18298,7 @@ in version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; - sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; + sha1 = "77cc8f966a3595686f5d6fae30ad9bd2cc20bfe3"; }; dependencies = [ sources."argparse-1.0.4" @@ -18222,7 +18308,7 @@ in sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."lodash-4.2.1" @@ -18282,7 +18368,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.1" - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -18297,12 +18383,12 @@ in sources."pinkie-2.0.4" (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."parse-json-2.2.0" @@ -18314,18 +18400,22 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."sort-keys-1.1.2" sources."is-plain-obj-1.1.0" sources."natives-1.1.0" - sources."jsonfile-2.3.1" + (sources."jsonfile-2.4.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."fs.realpath-1.0.0" @@ -18342,7 +18432,7 @@ in ]; }) sources."ms-0.7.1" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -18361,7 +18451,7 @@ in sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; }; dependencies = [ - sources."JSONStream-1.1.4" + sources."JSONStream-1.2.1" sources."assert-1.3.0" sources."browser-pack-6.0.1" sources."browser-resolve-1.11.2" @@ -18440,7 +18530,7 @@ in sources."lodash.memoize-3.0.4" sources."source-map-0.5.6" sources."pako-0.2.9" - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."isarray-1.0.0" sources."typedarray-0.0.6" @@ -18454,7 +18544,7 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.6" + sources."pbkdf2-3.0.8" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" @@ -18466,18 +18556,18 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.1" + sources."elliptic-6.3.2" sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.0" + sources."asn1.js-4.8.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" sources."miller-rabin-4.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -18564,7 +18654,7 @@ in (sources."xml2js-0.4.17" // { dependencies = [ sources."xmlbuilder-4.2.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."xtend-4.0.1" @@ -18611,7 +18701,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.1" - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" @@ -18627,7 +18717,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -18637,8 +18727,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."airplay-js-0.2.16" sources."clivas-0.1.4" sources."inquirer-0.8.5" @@ -18703,12 +18793,12 @@ in sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.4" sources."parse-torrent-file-4.0.0" - sources."simple-get-2.2.2" + sources."simple-get-2.2.3" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.10.0" sources."simple-sha1-2.0.8" - sources."rusha-0.8.3" + sources."rusha-0.8.4" sources."once-1.4.0" sources."unzip-response-1.0.1" sources."wrappy-1.0.2" @@ -18762,11 +18852,11 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."cyclist-0.1.1" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -18781,7 +18871,7 @@ in ]; }) sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ @@ -18871,10 +18961,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; buildInputs = globalBuildInputs; meta = { @@ -18914,7 +19004,7 @@ in (sources."insight-0.8.3" // { dependencies = [ sources."async-1.5.2" - sources."request-2.74.0" + sources."request-2.75.0" ]; }) sources."aliasify-1.9.0" @@ -18923,7 +19013,7 @@ in dependencies = [ sources."q-1.4.1" sources."shelljs-0.7.4" - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."cordova-js-4.1.4" @@ -18955,6 +19045,7 @@ in sources."semver-5.1.1" sources."tar-2.2.1" sources."isarray-1.0.0" + sources."form-data-1.0.1" ]; }) sources."opener-1.4.1" @@ -19011,7 +19102,7 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -19023,7 +19114,7 @@ in sources."minimatch-2.0.10" ]; }) - sources."JSONStream-1.1.4" + sources."JSONStream-1.2.1" sources."assert-1.3.0" (sources."browser-pack-4.0.4" // { dependencies = [ @@ -19122,7 +19213,7 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.6" + sources."pbkdf2-3.0.8" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" @@ -19134,11 +19225,11 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.1" + sources."elliptic-6.3.2" sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.0" + sources."asn1.js-4.8.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" sources."miller-rabin-4.0.0" @@ -19179,9 +19270,9 @@ in sources."debug-2.2.0" sources."on-headers-1.0.1" sources."vary-1.1.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.6.1" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -19239,7 +19330,7 @@ in sources."mute-stream-0.0.6" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -19268,7 +19359,7 @@ in sources."github-url-from-git-1.4.0" sources."github-url-from-username-repo-1.0.2" sources."ini-1.3.4" - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lru-cache-4.0.1" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -19277,7 +19368,7 @@ in }) (sources."node-gyp-3.4.0" // { dependencies = [ - sources."glob-7.0.6" + sources."glob-7.1.0" sources."tar-2.2.1" ]; }) @@ -19287,7 +19378,7 @@ in (sources."npm-registry-client-7.2.1" // { dependencies = [ sources."concat-stream-1.5.2" - sources."request-2.74.0" + sources."request-2.75.0" sources."readable-stream-2.0.6" sources."isarray-1.0.0" ]; @@ -19301,7 +19392,7 @@ in sources."retry-0.10.0" (sources."rimraf-2.5.4" // { dependencies = [ - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) (sources."sha-2.0.1" // { @@ -19322,7 +19413,7 @@ in sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."iferr-0.1.5" sources."fstream-ignore-1.0.5" sources."pseudomap-1.0.2" @@ -19347,7 +19438,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -19360,10 +19451,9 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" @@ -19377,7 +19467,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -19397,14 +19487,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."are-we-there-yet-1.1.2" sources."gauge-1.2.7" sources."delegates-1.0.0" @@ -19412,12 +19498,14 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."debuglog-1.0.1" sources."readdir-scoped-modules-1.0.2" sources."util-extend-1.0.3" sources."buffer-shims-1.0.0" + sources."async-2.0.1" + sources."lodash-4.16.2" sources."isexe-1.1.2" (sources."xmlbuilder-4.0.0" // { dependencies = [ @@ -19443,7 +19531,7 @@ in }) sources."string-length-1.0.1" sources."object-assign-4.1.0" - sources."uuid-2.0.2" + sources."uuid-2.0.3" sources."xdg-basedir-2.0.0" sources."package-json-1.2.0" (sources."got-3.3.1" // { @@ -19480,8 +19568,8 @@ in sources."rc-1.1.6" sources."deep-extend-0.4.1" sources."strip-json-comments-1.0.4" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" (sources."inquirer-0.10.1" // { dependencies = [ sources."lodash-3.10.1" @@ -19503,7 +19591,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."lodash._getnative-3.9.1" sources."osx-release-1.1.0" @@ -19520,6 +19608,26 @@ in }; production = true; }; + csslint = nodeEnv.buildNodePackage { + name = "csslint"; + packageName = "csslint"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.3.tgz"; + sha1 = "5dc024f13a1ff91c0dd08d01186ae1f6f9e92862"; + }; + dependencies = [ + sources."clone-1.0.2" + sources."parserlib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CSSLint"; + homepage = http://csslint.net/; + license = "MIT"; + }; + production = true; + }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; packageName = "dnschain"; @@ -19599,9 +19707,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.5.3" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -19678,7 +19786,7 @@ in sources."from2-1.3.0" sources."fs-blob-store-5.2.1" sources."level-0.18.0" - (sources."level-sublevel-6.5.4" // { + (sources."level-sublevel-6.6.0" // { dependencies = [ (sources."levelup-0.19.1" // { dependencies = [ @@ -19810,10 +19918,10 @@ in sources."async-2.0.1" sources."aws4-1.4.1" sources."optimist-0.6.1" - sources."request-2.74.0" + sources."request-2.75.0" sources."jsonparse-1.2.0" sources."through-2.3.8" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" @@ -19822,14 +19930,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -19844,9 +19952,10 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -19867,7 +19976,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -19887,15 +19996,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" ]; buildInputs = globalBuildInputs; meta = { @@ -19933,7 +20038,7 @@ in sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" - sources."node-status-codes-2.0.0" + sources."node-status-codes-2.0.1" sources."timed-out-2.0.0" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" @@ -19959,7 +20064,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.1" - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" @@ -19973,7 +20078,7 @@ in sources."path-exists-2.1.0" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -19983,8 +20088,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" ]; buildInputs = globalBuildInputs; @@ -19998,10 +20103,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.5.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.5.0.tgz"; - sha1 = "22fc9f780ea5bca1306fab2b6d3336b0fa62c754"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.7.0.tgz"; + sha1 = "27499b403de70f8832815c3550330bad67292a57"; }; dependencies = [ sources."chalk-1.1.3" @@ -20009,24 +20114,24 @@ in sources."debug-2.2.0" sources."doctrine-1.4.0" sources."escope-3.6.0" - sources."espree-3.1.7" + sources."espree-3.3.2" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."is-resolvable-1.0.0" sources."js-yaml-3.6.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" - sources."optionator-0.8.1" + sources."optionator-0.8.2" sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" @@ -20034,7 +20139,7 @@ in sources."shelljs-0.6.1" sources."strip-bom-3.0.0" sources."strip-json-comments-1.0.4" - sources."table-3.7.8" + sources."table-3.8.0" sources."text-table-0.2.0" sources."user-home-2.0.0" sources."ansi-styles-2.2.1" @@ -20066,12 +20171,16 @@ in sources."es6-symbol-3.1.0" sources."event-emitter-0.3.4" sources."object-assign-4.1.0" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-4.0.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."flat-cache-1.2.1" sources."circular-json-0.3.1" sources."del-2.2.2" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."write-0.2.1" sources."globby-5.0.0" sources."is-path-cwd-1.0.0" @@ -20088,7 +20197,7 @@ in sources."inflight-1.0.5" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -20105,17 +20214,17 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-2.0.0" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."tryit-1.0.2" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" @@ -20124,15 +20233,15 @@ in sources."minimist-0.0.8" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."bluebird-3.4.6" + sources."ajv-4.7.5" + sources."ajv-keywords-1.1.1" sources."slice-ansi-0.0.4" - sources."tv4-1.2.7" - sources."xregexp-3.1.1" - sources."os-homedir-1.0.1" + sources."co-4.6.0" + sources."os-homedir-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -20142,6 +20251,21 @@ in }; production = true; }; + emojione = nodeEnv.buildNodePackage { + name = "emojione"; + packageName = "emojione"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; + sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images."; + homepage = http://www.emojione.com/; + }; + production = true; + }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; packageName = "fetch-bower"; @@ -20198,7 +20322,7 @@ in sources."nssocket-0.5.3" sources."object-assign-3.0.0" sources."optimist-0.6.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."prettyjson-1.1.3" // { dependencies = [ sources."colors-1.1.2" @@ -20281,7 +20405,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.6.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."readable-stream-2.1.5" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" @@ -20306,7 +20430,7 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" @@ -20332,9 +20456,9 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -20350,18 +20474,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -20369,10 +20489,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -20391,7 +20511,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20411,16 +20531,12 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - (sources."glob-7.0.6" // { + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + (sources."glob-7.1.0" // { dependencies = [ sources."minimatch-3.0.3" ]; @@ -20502,7 +20618,7 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -20527,17 +20643,17 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.19" // { + (sources."clean-css-3.4.20" // { dependencies = [ sources."commander-2.8.1" ]; @@ -20602,7 +20718,7 @@ in sources."weak-map-1.0.5" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."nan-2.4.0" ]; buildInputs = globalBuildInputs; @@ -20687,7 +20803,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.1" - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -20702,7 +20818,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -20712,8 +20828,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."time-stamp-1.0.1" sources."glogg-1.0.0" sources."sparkles-1.0.0" @@ -20795,13 +20911,13 @@ in sources."is-primitive-2.0.0" sources."expand-tilde-1.2.2" sources."global-modules-0.2.3" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" sources."global-prefix-0.1.4" sources."is-windows-0.2.0" sources."ini-1.3.4" sources."osenv-0.1.3" sources."which-1.2.11" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" sources."lodash.isempty-4.4.0" @@ -20883,7 +20999,7 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-2.0.0" + sources."eventemitter3-2.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -20893,6 +21009,80 @@ in }; production = true; }; + htmlhint = nodeEnv.buildNodePackage { + name = "htmlhint"; + packageName = "htmlhint"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; + sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + }; + dependencies = [ + sources."async-1.4.2" + sources."colors-1.0.3" + sources."commander-2.6.0" + sources."csslint-0.10.0" + sources."glob-5.0.15" + (sources."jshint-2.8.0" // { + dependencies = [ + sources."minimatch-2.0.10" + ]; + }) + sources."parse-glob-3.0.4" + sources."strip-json-comments-1.0.4" + sources."xml-1.0.0" + sources."parserlib-0.2.5" + sources."inflight-1.0.5" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + (sources."cli-0.6.6" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-0.3.0" + ]; + }) + sources."console-browserify-1.1.0" + sources."exit-0.1.2" + sources."htmlparser2-3.8.3" + sources."shelljs-0.3.0" + sources."lodash-3.7.0" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + sources."date-now-0.1.4" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + sources."domelementtype-1.3.0" + sources."readable-stream-1.1.14" + sources."entities-1.0.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."glob-parent-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Static Code Analysis Tool for HTML"; + homepage = "https://github.com/yaniswang/HTMLHint#readme"; + license = "MIT"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -20926,18 +21116,18 @@ in sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" - sources."optionator-0.8.1" + sources."optionator-0.8.2" sources."source-map-0.2.0" sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" sources."amdefine-1.0.0" sources."inflight-1.0.5" sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -20972,7 +21162,7 @@ in sources."longest-1.0.1" sources."repeat-string-1.5.4" sources."is-buffer-1.1.4" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."has-flag-1.0.0" sources."isexe-1.1.2" @@ -21021,12 +21211,12 @@ in sources."shelljs-0.3.0" sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."inherits-2.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."date-now-0.1.4" sources."domhandler-2.3.0" @@ -21094,7 +21284,7 @@ in sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; }; dependencies = [ - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" ]; @@ -21121,7 +21311,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."connect-3.5.0" @@ -21136,8 +21326,8 @@ in sources."repeat-string-0.2.2" ]; }) - sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."glob-7.1.0" + sources."graceful-fs-4.1.9" sources."http-proxy-1.15.1" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" @@ -21175,14 +21365,14 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.11" - sources."mime-db-1.23.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.0.14" sources."arrify-1.0.1" @@ -21236,7 +21426,7 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."semver-5.3.0" sources."tar-2.2.1" sources."tar-pack-3.1.4" @@ -21255,9 +21445,9 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -21273,7 +21463,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -21286,14 +21476,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -21312,7 +21498,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21332,14 +21518,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.10" sources."fstream-ignore-1.0.5" @@ -21429,7 +21611,7 @@ in sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."lru-cache-2.2.4" ]; buildInputs = globalBuildInputs; @@ -21546,9 +21728,9 @@ in sources."unpipe-1.0.0" sources."accepts-1.2.13" sources."compressible-2.0.8" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.5.3" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.1" sources."csrf-3.0.3" sources."base64-url-1.2.2" @@ -21580,7 +21762,7 @@ in sources."uid2-0.0.3" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; buildInputs = globalBuildInputs; meta = { @@ -21620,7 +21802,7 @@ in sources."isarray-0.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" @@ -21650,7 +21832,7 @@ in sources."unique-stream-2.2.1" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21806,7 +21988,7 @@ in sources."nijs-0.0.23" sources."chownr-1.0.1" sources."concat-stream-1.5.2" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."mkdirp-0.5.1" sources."normalize-package-data-2.3.5" (sources."npm-package-arg-4.2.0" // { @@ -21815,7 +21997,7 @@ in ]; }) sources."once-1.4.0" - sources."request-2.74.0" + sources."request-2.75.0" sources."retry-0.8.0" sources."rimraf-2.5.4" sources."slide-1.1.6" @@ -21844,14 +22026,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -21859,11 +22041,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -21884,7 +22065,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21904,20 +22085,16 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21933,9 +22110,9 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."config-chain-1.1.10" sources."ini-1.3.4" sources."nopt-3.0.6" @@ -21943,8 +22120,8 @@ in sources."uid-number-0.0.5" sources."proto-list-1.2.4" sources."abbrev-1.0.9" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" (sources."fs-extra-0.6.4" // { @@ -21976,15 +22153,15 @@ in }; dependencies = [ sources."fstream-1.0.10" - sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."glob-7.1.0" + sources."graceful-fs-4.1.9" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-3.1.2" sources."osenv-0.1.3" sources."path-array-1.0.1" - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" @@ -21993,7 +22170,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -22020,12 +22197,12 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -22044,14 +22221,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -22059,11 +22236,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22082,7 +22258,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22102,15 +22278,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."block-stream-0.0.9" sources."isexe-1.1.2" ]; @@ -22136,7 +22308,7 @@ in sources."debug-2.2.0" sources."express-4.14.0" sources."glob-5.0.15" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rc-1.1.6" sources."semver-4.3.6" sources."serve-favicon-2.3.0" @@ -22165,8 +22337,8 @@ in }) sources."uid-0.0.2" sources."rimraf-2.2.8" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."base64-js-0.0.8" (sources."xmlbuilder-4.0.0" // { dependencies = [ @@ -22194,7 +22366,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.1" - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -22209,7 +22381,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -22219,8 +22391,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."ms-0.7.1" sources."accepts-1.3.3" @@ -22248,9 +22420,9 @@ in sources."type-is-1.6.13" sources."utils-merge-1.0.0" sources."vary-1.1.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.6.1" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."statuses-1.3.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -22278,18 +22450,18 @@ in dependencies = [ sources."rimraf-2.5.4" sources."semver-5.3.0" - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."nopt-3.0.6" sources."npmlog-4.0.0" - sources."request-2.74.0" + sources."request-2.75.0" sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ sources."once-1.3.3" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."abbrev-1.0.9" @@ -22310,7 +22482,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.0.0" sources."aws-sign2-0.6.0" @@ -22324,12 +22496,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - sources."lodash-4.15.0" - ]; - }) + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -22342,9 +22509,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -22360,7 +22528,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22380,14 +22548,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -22428,7 +22592,7 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" @@ -22460,9 +22624,9 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -22478,14 +22642,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -22493,11 +22657,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22516,7 +22679,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22536,28 +22699,24 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.10" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."debug-2.2.0" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" @@ -22600,7 +22759,7 @@ in sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.0.14" sources."arrify-1.0.1" @@ -22637,7 +22796,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.6.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."readable-stream-2.1.5" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" @@ -22655,7 +22814,7 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" @@ -22679,9 +22838,9 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -22697,14 +22856,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -22712,11 +22871,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22735,7 +22893,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22755,16 +22913,12 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."once-1.4.0" @@ -22802,12 +22956,12 @@ in sources."repeating-1.1.3" sources."semver-diff-2.1.0" sources."string-length-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."osenv-0.1.3" - sources."uuid-2.0.2" + sources."uuid-2.0.3" sources."write-file-atomic-1.2.0" sources."xdg-basedir-2.0.0" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" sources."package-json-1.2.0" @@ -22832,7 +22986,7 @@ in ]; }) sources."stream-shift-1.0.0" - sources."is-finite-1.0.1" + sources."is-finite-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22891,12 +23045,13 @@ in sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.5" sources."node-red-node-email-0.1.11" - (sources."node-red-node-twitter-0.1.6" // { + (sources."node-red-node-twitter-0.1.7" // { dependencies = [ - sources."request-2.67.0" - sources."bl-1.0.3" - sources."qs-5.2.1" + sources."request-2.75.0" + sources."bl-1.1.2" + sources."form-data-2.0.0" sources."http-signature-1.1.1" + sources."tough-cookie-2.3.1" sources."readable-stream-2.0.6" sources."isarray-1.0.0" sources."assert-plus-0.2.0" @@ -22923,8 +23078,8 @@ in sources."setprototypeof-1.0.1" sources."statuses-1.3.0" sources."ee-first-1.1.1" - sources."mime-types-2.1.11" - sources."mime-db-1.23.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" sources."css-select-1.0.0" sources."entities-1.1.1" (sources."htmlparser2-3.8.3" // { @@ -22953,7 +23108,7 @@ in sources."cookie-signature-1.0.6" sources."vary-1.1.0" sources."moment-timezone-0.3.1" - sources."moment-2.15.0" + sources."moment-2.15.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -22978,12 +23133,12 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."stream-consume-0.1.0" - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" @@ -23093,7 +23248,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) (sources."feedparser-1.1.3" // { @@ -23118,7 +23273,7 @@ in (sources."form-data-1.0.1" // { dependencies = [ sources."async-2.0.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."json-stringify-safe-5.0.1" @@ -23143,7 +23298,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23160,7 +23315,7 @@ in sources."nodemailer-1.11.0" sources."poplib-0.1.7" sources."mailparser-0.6.1" - sources."imap-0.8.17" + sources."imap-0.8.18" sources."libmime-1.2.0" sources."mailcomposer-2.1.0" sources."needle-0.11.0" @@ -23188,12 +23343,14 @@ in }) sources."encoding-0.1.12" sources."uue-3.0.0" - sources."utf7-1.0.0" + sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" + sources."aws4-1.4.1" sources."is-typedarray-1.0.0" + sources."asynckit-0.4.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -23213,14 +23370,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" (sources."serialport-2.1.2" // { dependencies = [ sources."nan-2.2.1" @@ -23258,9 +23411,9 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -23346,7 +23499,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -23410,10 +23563,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; dependencies = [ sources."abbrev-1.0.9" @@ -23421,7 +23574,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -23431,9 +23584,9 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - sources."fstream-npm-1.1.1" + sources."fstream-npm-1.2.0" sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -23445,28 +23598,32 @@ in sources."glob-6.0.4" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" sources."mkdirp-0.5.1" - sources."node-gyp-3.4.0" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-3.1.2" - sources."once-1.3.3" + sources."npmlog-4.0.0" + sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.3" sources."path-is-inside-1.0.2" @@ -23482,9 +23639,9 @@ in sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" sources."request-2.74.0" - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" + sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" @@ -23498,7 +23655,7 @@ in sources."validate-npm-package-name-2.2.2" sources."which-1.2.11" sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -23520,12 +23677,25 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -23546,21 +23716,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.1" - sources."string-width-1.0.2" - sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" @@ -23584,7 +23741,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -23593,10 +23750,10 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."async-2.0.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23615,7 +23772,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23635,15 +23792,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -23697,10 +23850,10 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.74.0" + sources."request-2.75.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -23716,14 +23869,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -23738,11 +23891,10 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23763,7 +23915,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23783,21 +23935,17 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -23814,9 +23962,9 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" (sources."config-chain-1.1.10" // { dependencies = [ sources."ini-1.3.4" @@ -23874,7 +24022,7 @@ in sources."lodash-3.10.1" (sources."node-alias-1.0.4" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."npm-3.10.8" @@ -23905,7 +24053,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -23917,7 +24065,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -23929,7 +24077,7 @@ in sources."glob-6.0.4" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" @@ -24005,7 +24153,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" @@ -24021,9 +24169,9 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -24044,8 +24192,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" sources."util-extend-1.0.3" sources."buffer-shims-1.0.0" @@ -24067,7 +24215,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -24077,10 +24225,10 @@ in sources."delayed-stream-1.0.0" (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-2.0.0" @@ -24092,7 +24240,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24112,15 +24260,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -24134,7 +24278,7 @@ in sources."repeating-1.1.3" sources."semver-diff-2.1.0" sources."string-length-1.0.1" - sources."uuid-2.0.2" + sources."uuid-2.0.3" sources."xdg-basedir-2.0.0" sources."package-json-1.2.0" (sources."got-3.3.1" // { @@ -24165,7 +24309,7 @@ in }) sources."deep-extend-0.4.1" sources."strip-json-comments-1.0.4" - sources."is-finite-1.0.1" + sources."is-finite-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -24259,7 +24403,7 @@ in sources."once-1.4.0" sources."consume-until-1.0.0" sources."http-headers-3.0.1" - sources."buffer-indexof-1.0.2" + sources."buffer-indexof-1.1.0" sources."next-line-1.1.0" sources."wrappy-1.0.2" sources."chalk-1.1.3" @@ -24271,9 +24415,9 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" sources."string-width-1.0.2" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."array-flatten-2.1.0" sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" @@ -24296,7 +24440,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.1" - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" @@ -24312,7 +24456,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -24322,7 +24466,7 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" + sources."is-finite-1.0.2" sources."get-stdin-4.0.1" sources."cli-width-1.1.1" sources."figures-1.7.0" @@ -24339,12 +24483,12 @@ in sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.4" sources."parse-torrent-file-4.0.0" - sources."simple-get-2.2.2" + sources."simple-get-2.2.3" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.10.0" sources."simple-sha1-2.0.8" - sources."rusha-0.8.3" + sources."rusha-0.8.4" sources."unzip-response-1.0.1" (sources."end-of-stream-1.0.0" // { dependencies = [ @@ -24392,11 +24536,11 @@ in sources."speedometer-0.1.4" sources."utp-0.0.7" sources."cyclist-0.1.1" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -24412,7 +24556,7 @@ in }) sources."debug-2.2.0" sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ @@ -24582,7 +24726,7 @@ in sources."flatten-0.0.1" sources."bencode-0.7.0" sources."simple-sha1-2.0.8" - sources."rusha-0.8.3" + sources."rusha-0.8.4" sources."form-data-0.0.10" sources."hawk-0.10.2" sources."node-uuid-1.4.7" @@ -24667,11 +24811,11 @@ in }) sources."fifo-0.1.4" sources."speedometer-0.1.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -24718,12 +24862,12 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" @@ -24741,7 +24885,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -24756,11 +24900,11 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.0.1" - sources."lodash-4.15.0" - sources."mime-db-1.23.0" + sources."lodash-4.16.2" + sources."mime-db-1.24.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24780,14 +24924,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" @@ -24795,7 +24935,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -24838,7 +24978,7 @@ in sources."commander-2.9.0" sources."detective-4.3.1" sources."glob-5.0.15" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."iconv-lite-0.4.13" sources."mkdirp-0.5.1" sources."private-0.1.6" @@ -24851,7 +24991,7 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24940,9 +25080,9 @@ in sources."ms-0.7.1" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" - (sources."openid-2.0.4" // { + (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.74.0" + sources."request-2.75.0" sources."node-uuid-1.4.7" sources."qs-6.2.1" ]; @@ -24963,7 +25103,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ sources."commander-2.9.0" @@ -24974,7 +25114,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.1" @@ -24982,10 +25122,9 @@ in sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -25006,7 +25145,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25026,15 +25165,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."events.node-0.4.9" ]; buildInputs = globalBuildInputs; @@ -25093,7 +25228,7 @@ in sources."depd-1.1.0" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."qs-6.2.1" ]; @@ -25108,7 +25243,7 @@ in sources."lunr-0.7.1" sources."render-readme-1.3.1" sources."jju-1.3.0" - sources."JSONStream-1.1.4" + sources."JSONStream-1.2.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" (sources."http-errors-1.5.0" // { @@ -25169,9 +25304,9 @@ in sources."type-is-1.6.13" sources."vary-1.0.1" sources."utils-merge-1.0.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.5.3" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -25189,7 +25324,7 @@ in sources."compressible-2.0.8" sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."keygrip-1.0.1" @@ -25204,11 +25339,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -25226,9 +25357,9 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -25248,7 +25379,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25268,20 +25399,16 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" sources."dtrace-provider-0.6.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.15.0" + sources."moment-2.15.1" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -25356,7 +25483,7 @@ in sources."readdirp-2.1.0" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."minimatch-3.0.3" sources."readable-stream-2.1.5" sources."set-immediate-shim-1.0.1" @@ -25478,7 +25605,7 @@ in sources."inflight-1.0.5" sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25541,7 +25668,7 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -25559,10 +25686,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.0.tgz"; - sha1 = "51a95c5f7aaa98824f92857ac14c2cdbe81537aa"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; + sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; }; dependencies = [ sources."sax-1.2.1" @@ -25573,7 +25700,7 @@ in sources."mkdirp-0.5.1" sources."csso-2.2.1" sources."q-1.4.1" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" @@ -25598,10 +25725,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.9.tgz"; - sha1 = "113f5f986b5e39e92db0d5d0ba5b2b1f237504e7"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; + sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; }; dependencies = [ sources."async-1.4.2" @@ -25662,7 +25789,7 @@ in ]; }) sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."qs-4.0.0" sources."tunnel-agent-0.4.3" sources."tough-cookie-2.3.1" @@ -25681,8 +25808,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."lodash-4.15.0" - sources."mime-db-1.23.0" + sources."lodash-4.16.2" + sources."mime-db-1.24.0" sources."assert-plus-0.1.5" sources."asn1-0.1.11" sources."ctype-0.5.3" @@ -25694,7 +25821,7 @@ in sources."bluebird-2.11.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -25716,7 +25843,7 @@ in sources."camelcase-1.2.1" sources."decamelize-1.2.0" sources."window-size-0.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" sources."cycle-1.0.3" sources."eyes-0.1.8" @@ -25734,10 +25861,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "1.8.10"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; - sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz"; + sha1 = "33dec9eae86b8eee327dd419ca050c853cabd514"; }; buildInputs = globalBuildInputs; meta = { @@ -25842,11 +25969,11 @@ in }) (sources."npm-registry-client-7.1.2" // { dependencies = [ - sources."request-2.74.0" + sources."request-2.75.0" sources."retry-0.8.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" @@ -25861,7 +25988,7 @@ in }) sources."octicons-3.5.0" sources."open-0.0.5" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" (sources."raven-0.11.0" // { @@ -25929,8 +26056,8 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.11" - sources."mime-db-1.23.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" sources."clone-1.0.2" sources."color-convert-1.5.0" sources."color-string-0.3.0" @@ -26066,7 +26193,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -26077,7 +26204,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.3.2" sources."lodash.union-4.4.0" @@ -26146,7 +26273,7 @@ in sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."proto-list-1.2.4" - sources."asap-2.0.4" + sources."asap-2.0.5" (sources."fstream-ignore-1.0.5" // { dependencies = [ sources."minimatch-3.0.3" @@ -26156,7 +26283,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" @@ -26180,7 +26307,7 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" @@ -26208,7 +26335,7 @@ in sources."tough-cookie-2.2.2" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -26223,7 +26350,7 @@ in sources."pinkie-2.0.4" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26243,14 +26370,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -26264,6 +26387,7 @@ in ]; }) sources."typedarray-0.0.6" + sources."asynckit-0.4.0" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -26373,9 +26497,9 @@ in sources."is-utf8-0.2.1" sources."read-pkg-1.1.0" sources."path-type-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -26403,7 +26527,7 @@ in sources."kew-0.7.0" ]; }) - sources."tmp-0.0.28" + sources."tmp-0.0.29" sources."follow-redirects-0.0.3" (sources."config-chain-1.1.10" // { dependencies = [ @@ -26443,12 +26567,12 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" @@ -26464,7 +26588,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -26479,11 +26603,11 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.0.1" - sources."lodash-4.15.0" - sources."mime-db-1.23.0" + sources."lodash-4.16.2" + sources."mime-db-1.24.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26503,14 +26627,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" @@ -26518,7 +26638,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -26533,7 +26653,7 @@ in sources."is-property-1.0.2" sources."throttleit-1.0.0" sources."isexe-1.1.2" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."underscore-1.8.3" ]; buildInputs = globalBuildInputs; @@ -26589,7 +26709,7 @@ in sources."source-map-0.4.4" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."big.js-3.1.3" sources."emojis-list-2.0.1" sources."json5-0.5.0" @@ -26640,7 +26760,7 @@ in }) sources."vm-browserify-0.0.4" sources."pako-0.2.9" - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."date-now-0.1.4" sources."pbkdf2-compat-2.0.1" @@ -26676,7 +26796,7 @@ in sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.0.14" sources."arrify-1.0.1" @@ -26723,7 +26843,7 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" @@ -26745,9 +26865,9 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -26763,18 +26883,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -26782,14 +26898,14 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" (sources."chalk-1.1.3" // { dependencies = [ sources."supports-color-2.0.0" ]; }) sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -26807,7 +26923,7 @@ in sources."sntp-1.0.9" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26827,16 +26943,12 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."once-1.4.0" @@ -26874,4 +26986,4 @@ in }; production = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index b3924727c01c..1bd4014d35a6 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -7,11 +7,13 @@ , "castnow" , "coffee-script" , "cordova" +, "csslint" , "dnschain" , "docker-registry-server" , "elasticdump" , "emoj" , "eslint" +, "emojione" , "fetch-bower" , "forever" , "git-run" @@ -19,6 +21,7 @@ , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , "gulp" , "hipache" +, "htmlhint" , "istanbul" , "jayschema" , "jshint" diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index eaf5c8c20f6f..7b63b0e166f0 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit, ocaml, camlidl, fuse, findlib }: +{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation rec { - name = "ocamlfuse-2.7-1"; - src = fetchgit { - url = "https://github.com/astrada/ocamlfuse"; - rev = "c436c16dbf458bc69b1166b08baf9ec0d6f9042d"; - sha256 = "0br9x3vsbg87sar5g6yi3xfszn5icy4fv71waarccc2dr79pvakz"; + name = "ocamlfuse-2.7-3"; + src = fetchFromGitHub { + owner = "astrada"; + repo = "ocamlfuse"; + rev = "a085349685758668854499ce6c1fc00c83a5c23b"; + sha256 = "1pyml2ay5wab1blwpzrv1r6lnycm000jk6aar8i9fkdnh15sa6c3"; }; buildInputs = [ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index d711bae0f34b..974779e473ff 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,7 +1,7 @@ { stdenv, ocaml, findlib, fetchurl, curl, ncurses }: stdenv.mkDerivation rec { - name = "ocurl-0.7.5"; + name = "ocurl-0.7.8"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2"; sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr"; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index b450814b8529..788c42ebf15b 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, buildPythonPackage }: buildPythonPackage { - name = "zc.buildout-nix-2.5.0"; + name = "zc.buildout-nix-2.5.3"; src = fetchurl { - url = "mirror://pypi/z/zc.buildout/zc.buildout-2.5.0.tar.gz"; - sha256 = "721bd2231a9f01f2d5c14f3adccb3385f85b093ee05b18d15d0ff2b9f1f1bd02"; + url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-2.5.3.tar.gz"; + sha256 = "3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch new file mode 100644 index 000000000000..d75d8e7bd0ad --- /dev/null +++ b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch @@ -0,0 +1,22 @@ +diff -r ad8325924f04 pytest.ini +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200 +@@ -0,0 +1,4 @@ ++[pytest] ++-norecursedirs = .git .* *.egg* old docs dist build ++-addopts = -rwv ++ +diff -r ad8325924f04 setup.cfg +--- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200 ++++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200 +@@ -12,10 +12,6 @@ + pycodestyle >= 2.0.0, < 2.1.0 + mccabe >= 0.5.0, < 0.6.0 + +-[pytest] +-norecursedirs = .git .* *.egg* old docs dist build +-addopts = -rw +- + [egg_info] + tag_build = + tag_date = 0 diff --git a/pkgs/development/python-modules/pypoppler-0.39.0.patch b/pkgs/development/python-modules/pypoppler-0.39.0.patch new file mode 100644 index 000000000000..b9e02242e003 --- /dev/null +++ b/pkgs/development/python-modules/pypoppler-0.39.0.patch @@ -0,0 +1,23 @@ +diff --git a/poppler.defs b/poppler.defs +index 8b12e03..2b8fc16 100644 +--- a/poppler.defs ++++ b/poppler.defs +@@ -570,18 +570,6 @@ + ) + ) + +-(define-enum Orientation +- (in-module "Poppler") +- (c-name "PopplerOrientation") +- (gtype-id "POPPLER_TYPE_ORIENTATION") +- (values +- '("portrait" "POPPLER_ORIENTATION_PORTRAIT") +- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE") +- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN") +- '("seascape" "POPPLER_ORIENTATION_SEASCAPE") +- ) +-) +- + (define-enum PageTransitionType + (in-module "Poppler") + (c-name "PopplerPageTransitionType") diff --git a/pkgs/development/python-modules/pypoppler-poppler.c.patch b/pkgs/development/python-modules/pypoppler-poppler.c.patch new file mode 100644 index 000000000000..1104097cd3e7 --- /dev/null +++ b/pkgs/development/python-modules/pypoppler-poppler.c.patch @@ -0,0 +1,12 @@ +diff --git a/poppler.c b/poppler.c +index 31b4489..16d0838 100644 +--- a/poppler.c ++++ b/poppler.c +@@ -4501,7 +4501,6 @@ py_poppler_add_constants(PyObject *module, const gchar *strip_prefix) + pyg_enum_add(module, "FormTextType", strip_prefix, POPPLER_TYPE_FORM_TEXT_TYPE); + pyg_enum_add(module, "FormChoiceType", strip_prefix, POPPLER_TYPE_FORM_CHOICE_TYPE); + pyg_enum_add(module, "Error", strip_prefix, POPPLER_TYPE_ERROR); +- pyg_enum_add(module, "Orientation", strip_prefix, POPPLER_TYPE_ORIENTATION); + pyg_enum_add(module, "PageTransitionType", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_TYPE); + pyg_enum_add(module, "PageTransitionAlignment", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT); + pyg_enum_add(module, "PageTransitionDirection", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION); diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 99120a13cd05..5c05973095fd 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -266,6 +266,8 @@ let gmp = [ pkgs.gmp ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; + h5 = [ pkgs.hdf5-cpp pkgs.which ]; + h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; iBMQ = [ pkgs.gsl_1 ]; igraph = [ pkgs.gmp ]; @@ -308,6 +310,7 @@ let rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; + rhdf5 = [ pkgs.zlib ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; Rhtslib = [ pkgs.zlib ]; RJaCGH = [ pkgs.zlib ]; @@ -367,12 +370,12 @@ let bamsignals = [ pkgs.zlib ]; BitSeq = [ pkgs.zlib ]; DiffBind = [ pkgs.zlib ]; - ShortRead = [ pkgs.zlib ]; + ShortRead = [ pkgs.zlib.dev ]; oligo = [ pkgs.zlib ]; gmapR = [ pkgs.zlib ]; Rsubread = [ pkgs.zlib ]; - XVector = [ pkgs.zlib ]; - Rsamtools = [ pkgs.zlib ]; + XVector = [ pkgs.zlib.dev ]; + Rsamtools = [ pkgs.zlib.dev ]; rtracklayer = [ pkgs.zlib ]; affyio = [ pkgs.zlib ]; VariantAnnotation = [ pkgs.zlib ]; @@ -390,7 +393,7 @@ let qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; gmatrix = [ pkgs.cudatoolkit ]; - RCurl = [ pkgs.curl ]; + RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; @@ -1142,7 +1145,6 @@ let "proteoQC" # depends on broken package rTANDEM "PGA" # depends on broken package rTANDEM "MBESS" # depends on broken package OpenMx - "IONiseR" # depends on broken package rhdf5 "DOQTL" # depends on broken package rhdf5 "DmelSGI" # depends on broken package rhdf5 "flowDiv" # depends on broken package ncdfFlow @@ -1292,7 +1294,7 @@ let "DEGraph" # depends on broken package RCytoscape "destiny" # depends on broken package VIM "DiagTest3Grp" # depends on broken package nlopt - "diffHic" # depends on broken package rhdf5 + "diffHic" # depends on broken package edgeR "difR" # depends on broken package nlopt "DirichletMultinomial" # Build Is Broken "DistatisR" # depends on broken package nlopt @@ -1307,6 +1309,7 @@ let "easyanova" # depends on broken package nlopt "ecd" # depends on broken package polynom "edge" # depends on broken package nlopt + "edgeR" # broken url "eeptools" # depends on broken package nlopt "EffectLiteR" # depends on broken package nlopt "effects" # depends on broken package nlopt @@ -1356,7 +1359,6 @@ let "gcmr" # depends on broken package nlopt "GDAtools" # depends on broken package nlopt "gdtools" # broken build - "GENE_E" # depends on broken package rhdf5 "GENESIS" # broken build "genridge" # depends on broken package nlopt "geojsonio" # depends on broken package V8 @@ -1379,8 +1381,6 @@ let "GUIDE" # depends on broken package rpanel "GWAF" # depends on broken package nlopt "GWASTools" # broken build - "h5" # build is broken - "h5vc" # depends on broken package rhdf5 "hbsae" # depends on broken package nlopt "heplots" # depends on broken package nlopt "HiDimMaxStable" # broken build @@ -1407,7 +1407,6 @@ let "inSilicoMerging" # build is broken "INSPEcT" # depends on broken GenomicFeatures "interplot" # depends on broken arm - "IONiseR" # depends on broken rhdf5 "IsingFit" # depends on broken package nlopt "ITEMAN" # depends on broken package car "iteRates" # broken build @@ -1645,7 +1644,6 @@ let "REST" # depends on broken package nlopt "rgbif" # depends on broken package V8 "Rgnuplot" # broken build - "rhdf5" # build is broken "rjade" # depends on broken package V8 "rJPSGCS" # build is broken "rLindo" # build is broken diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 1913278368e5..723c6eb26bb2 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.30.0"; + version = "0.32.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1s6l3570r53qjyqs8ghqqgb51rb0skijwjgm6av43xi7b7knkd35"; + sha256 = "17v2qb9xsjv4lj62x553knnhb7z43y2frzvs0q1hvamw8wyp086h"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 2132d1e19b47..fc817a8e391e 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20150201"; - slang = "Sodium"; + version = "20160501"; + slang = "Aluminium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "0zask160vj8bxgc07dzxj5hqbdp6gz5g00j6za5397961imxhxaq"; + sha256 = "02z4d1lg2cs4hgbjx74crfrabv39dyhdrq5lvhv0q3hx5c8w7p90"; }; why2 = fetchurl { @@ -49,22 +49,7 @@ stdenv.mkDerivation rec { substituteInPlace $file --replace '/usr/bin/' "" done - # find library paths - OCAMLGRAPH_HOME=`ocamlfind query ocamlgraph` - LABLGTK_HOME=`ocamlfind query lablgtk2` - - # patch search paths - # ensure that the tests against the ocamlgraph version succeeds - # filter out the additional search paths from ocamldep - substituteInPlace ./configure \ - --replace '$OCAMLLIB/ocamlgraph' "$OCAMLGRAPH_HOME" \ - --replace '$OCAMLLIB/lablgtk2' "$LABLGTK_HOME" \ - --replace '+ocamlgraph' "$OCAMLGRAPH_HOME" \ - substituteInPlace ./Makefile --replace '+lablgtk2' "$LABLGTK_HOME" \ - --replace '$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES))' \ - '$(patsubst /%,.,$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES)))' - - substituteInPlace ./src/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' + substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' cd ../why* substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c" @@ -82,10 +67,10 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Frama-C is an extensible tool for source-code analysis of C software"; + description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; homepage = http://frama-c.com/; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix new file mode 100644 index 000000000000..e09da0287c76 --- /dev/null +++ b/pkgs/development/tools/clang-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, makeWrapper, writeScript, llvmPackages }: + +let + clang = llvmPackages.clang-unwrapped; + version = stdenv.lib.getVersion clang; +in + +stdenv.mkDerivation { + name = "clang-tools-${version}"; + builder = writeScript "builder" '' + source $stdenv/setup + for tool in \ + clang-apply-replacements \ + clang-check \ + clang-format \ + clang-rename \ + clang-tidy + do + makeWrapper $clang/bin/$tool $out/bin/$tool --argv0 $tool + done + ''; + buildInputs = [ makeWrapper ]; + inherit clang; + meta = clang.meta // { + description = "Standalone command line tools for C++ development"; + maintainers = with stdenv.lib.maintainers; [ aherrmann ]; + }; +} diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 9e458f2aca5a..208f0ebd411b 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -20,6 +20,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://github.com/cpuguy83/go-md2man; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index ad941f80d50e..f5d6e52ee441 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -8,8 +8,8 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; in import ./nodejs.nix (args // rec { - version = "6.6.0"; - sha256 = "0cqswab9idbz5kzj50fnalg1zrircmbn9qga0cr33lvjnv98a134"; + version = "6.7.0"; + sha256 = "1r9vvnczjczqs29ja8gmbqgsfgkg0dph4qkaxb3yh7mb98r2ic6f"; extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index f9ff7a5ae0c2..7091b900b7e6 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -7,10 +7,6 @@ stdenv.mkDerivation rec { sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4"; }; - cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release - ''; - buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index abc19adf72ad..ab2cd1090fb4 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -7,10 +7,6 @@ stdenv.mkDerivation rec { sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; }; - cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release - ''; - buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 143fa21ce2e5..0438b687a1b9 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -23,11 +23,14 @@ stdenv.mkDerivation rec { sed '1i#include ' -i Sources/Draw/SWFeatureLevel.h ''; - nativeBuildInputs = + nativeBuildInputs = [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] ++ lib.optional withOpenal openal; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + "-DOPENSPADES_RESOURCES=NO" + ]; enableParallelBuilding = true; diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix index 7d76573f7345..9e3d4ac5b64c 100644 --- a/pkgs/games/openspades/git.nix +++ b/pkgs/games/openspades/git.nix @@ -16,12 +16,15 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i Sources/Client/{,Client}Player.cpp"; - nativeBuildInputs = + nativeBuildInputs = with stdenv.lib; [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] ++ lib.optional withOpenal openal; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + "-DOPENSPADES_RESOURCES=NO" + ]; #enableParallelBuilding = true; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index c40337d54f52..0c129f8d556f 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ SDL libpng xz zlib freetype fontconfig ] - ++ stdenv.lib.optional withFluidSynth [ fluidsynth soundfont-fluid ]; + ++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; prefixKey = "--prefix-dir="; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 36c40f9bec5e..e96cf5e59322 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optional openglSupport [ mesa ]; + ++ optional openglSupport mesa; - configureFlags="--enable-all-engines"; + configureFlags = [ "--enable-all-engines" ]; meta = { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix deleted file mode 100644 index 1981d3474d11..000000000000 --- a/pkgs/games/super-tux/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer -, curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew -, libiconv }: - -stdenv.mkDerivation rec { - name = "supertux-${version}"; - version = "0.4.0"; - - src = fetchurl { - url = https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2; - sha256 = "10ppmy6w77lxj8bdzjahc9bidgl4qgzr9rimn15rnqay84ydx3fi"; - }; - - buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext - libogg libvorbis mesa openal physfs boost glew libiconv ]; - - postInstall = '' - mkdir $out/bin - ln -s $out/games/supertux2 $out/bin - ''; - - meta = with stdenv.lib; { - description = "Classic 2D jump'n run sidescroller game"; - homepage = http://supertux.github.io/; - license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix new file mode 100644 index 000000000000..043861b6166b --- /dev/null +++ b/pkgs/games/supertux/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl +, libogg, libvorbis, mesa, openal, boost, glew +}: + +stdenv.mkDerivation rec { + name = "supertux-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; + sha256 = "0fx7c7m6mfanqy7kln7yf6abb5l3r68picf32js2yls11jj0vbng"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis mesa openal boost glew ]; + + cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; + + postInstall = '' + mkdir $out/bin + ln -s $out/games/supertux2 $out/bin + ''; + + meta = with stdenv.lib; { + description = "Classic 2D jump'n run sidescroller game"; + homepage = http://supertux.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1b1e877d274d..1ea94a5d2ced 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, -libpng, zlib, bash }: +libpng, zlib, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "torcs-1.3.5"; + name = "torcs-1.3.7"; src = fetchurl { url = "mirror://sourceforge/torcs/${name}.tar.bz2"; - sha256 = "170ff98smkkv1sk4nbz9w0alhmmbr32djmgbc08lcfhf0lj2ni38"; + sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa"; }; patchPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto - libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; + libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; nativeBuildInputs = [ bash ]; @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postInstall = '' + wrapProgram $out/bin/torcs \ + --prefix LD_LIBRARY_PATH : ${mesa}/lib + ''; + meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix new file mode 100644 index 000000000000..be9d4f837092 --- /dev/null +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchzip, cups }: + +let + platform = + if stdenv.system == "x86_64-linux" then "64bit" + else if stdenv.system == "i686-linux" then "32bit" + else abort "Unsupported platform"; + + libPath = lib.makeLibraryPath [ cups ]; +in + +stdenv.mkDerivation rec { + name = "cups-kyocera-${version}"; + version = "1.1203"; + + dontPatchELF = true; + dontStrip = true; + + src = fetchzip { + # this side does not like curl -> override useragent + curlOpts = "-A ''"; + url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; + sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; + }; + + installPhase = '' + tar -xvf ${platform}/Global/English.tar.gz + install -Dm755 English/rastertokpsl $out/lib/cups/filter/rastertokpsl + patchelf \ + --set-rpath ${libPath} \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/lib/cups/filter/rastertokpsl + + mkdir -p $out/share/cups/model/Kyocera + cd English + for i in *.ppd; do + sed -i $i -e \ + "s,/usr/lib/cups/filter/rastertokpsl,$out/lib/cups/filter/rastertokpsl,g" + cp $i $out/share/cups/model/Kyocera + done; + ''; + + meta = with lib; { + description = "CUPS drivers for several Kyocera FS-{1020,1025,1040,1060,1120,1125} printers"; + homepage = "https://www.kyoceradocumentsolutions.ru/index/service_support/download_center.false.driver.FS1040._.EN.html#"; + license = licenses.unfree; + maintainers = [ maintainers.vanzef ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index bbd25f2b3ded..bb5b12038f83 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True ''; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 4d8b8ac0eb60..990870d35d69 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True ''; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index a2599d5ebee8..7aada4711455 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation { buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau libXdmcp xcbutil ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - meta = with stdenv.lib; { description = "Use external locker (such as i3lock) as X screen saver"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index f6b3839c6bce..84f1abcca36d 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "fe585ca285690579db50b1624cec81ae76279ba2"; - sha256 = "1vqya2k8cx5x7jfapl9vmmb002brwbsz4j5xs4417kzv3j2bsms9"; + rev = "daeb2fd43795f0bb9a4861279b6064b35186ff25"; + sha256 = "1apvf1gp5973s4wlzwndxp711yd9pj9zf2ypdssfxv2a3rihly2b"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 37ad34d8b642..66069f7c9824 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ++ optional weatherXoapSupport libxml2 ; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + cmakeFlags = [] ++ optional docsSupport "-DMAINTAINER_MODE=ON" ++ optional curlSupport "-DBUILD_CURL=ON" ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 40af8c8553a1..5385651030bc 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { portaudio udev gsl - ] ++ stdenv.lib.optional pulseaudioSupport [ libpulseaudio ]; + ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = { description = "A simple interface for devices supported by the linux UVC driver"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index bd90ec057dbc..04b759ae0e6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.22"; + version = "4.4.23"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qsdnlcycfy8l4q2578qrvpj3xj1gc3aijb46q4ym9vvihmd7b2"; + sha256 = "1ljvga8c6p3aww3jpi810rvf4m9qr1rjy8ya6s1xq07b08g5hpbk"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index 85be8019dfca..f08d594a3957 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.5"; + version = "4.7.6"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p"; + sha256 = "1lidsc85xc025a46pyjimcr1xcwv7mh59jihmnqihfnwqch6albv"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 85be8019dfca..f08d594a3957 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.5"; + version = "4.7.6"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p"; + sha256 = "1lidsc85xc025a46pyjimcr1xcwv7mh59jihmnqihfnwqch6albv"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d4e9f1e72750..0a577bb4e316 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.5"; - grrev = "201609261522"; - sha256 = "1306lw3byw6cyi0dqh0dcl67l0bi043zmp3582hjpkwj934bahf7"; + { kver = "4.7.6"; + grrev = "201609301918"; + sha256 = "153x97vvd3jl2i7fs6d5ilqnmz2v2iyzsf3pg3frrackv6xaisa5"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index cedb9bca1a0f..baf24b275626 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: +{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: let diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7fdebc5c1e8f..8939f8548706 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "124564dd451349ec12673a7d4836b4a7a2f8fb4e"; - sha256 = "021b7filp1dlhic1iv54b821w7mj5595njvzns939pmn636ry4m5"; + rev = "3b11791d323cf2d0e00a156967021e1ae9119de2"; + sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0"; }; patches = [ diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 63cd71e146b9..6eec9c3b3050 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # cannot find postgresql libs on macos x license = licenses.gpl2; - maintainers = [ maintainers.mic92 ]; + maintainers = [ maintainers.mic92 maintainers.nhooyr ]; }; } diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 50d3f0d53ad4..cbafe16623ed 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -15,6 +15,7 @@ , withRedis ? false , libmysql , withMysql ? false +, json_c , withJson ? false , libyubikey , withYubikey ? false @@ -42,16 +43,16 @@ stdenv.mkDerivation rec { version = "3.0.11"; buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ] - ++ optional withLdap [ openldap ] - ++ optional withSqlite [ sqlite ] - ++ optional withPcap [ libpcap ] - ++ optional withCap [ libcap ] - ++ optional withMemcached [ libmemcached ] - ++ optional withRedis [ hiredis ] - ++ optional withMysql [ libmysql ] - ++ optional withJson [ pkgs."json-c" ] - ++ optional withYubikey [ libyubikey ] - ++ optional withCollectd [ collectd ]; + ++ optional withLdap openldap + ++ optional withSqlite sqlite + ++ optional withPcap libpcap + ++ optional withCap libcap + ++ optional withMemcached libmemcached + ++ optional withRedis hiredis + ++ optional withMysql libmysql + ++ optional withJson json_c + ++ optional withYubikey libyubikey + ++ optional withCollectd collectd; # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ? diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index d55425779e65..2be20323f259 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { "--with-lucene" "--with-icu" ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ++ lib.optional (stdenv.isDarwin) "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; @@ -70,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix new file mode 100644 index 000000000000..7fdf0edb096d --- /dev/null +++ b/pkgs/servers/mail/postgrey/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, perl, perlPackages, lib, runCommand, postfix }: + +let + mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/lib/perl5/site_perl") inputs); + postgrey-flags = mk-perl-flags (with perlPackages; [ + NetServer BerkeleyDB DigestSHA1 NetAddrIP IOMultiplex + ]); + policy-test-flags = mk-perl-flags (with perlPackages; [ + ParseSyslog + ]); + version = "1.36"; + name = "postgrey-${version}"; +in runCommand name { + src = fetchurl { + url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; + sha256 = "09jzb246ki988389r9gryigriv9sravk40q75fih5n0q4p2ghax2"; + }; + meta = with stdenv.lib; { + description = "A postfix policy server to provide greylisting"; + homepage = "https://postgrey.schweikert.ch/"; + platforms = postfix.meta.platforms; + licenses = licenses.gpl2; + }; +} '' + mkdir -p $out/bin + cd $out + tar -xzf $src --strip-components=1 + mv postgrey policy-test bin + sed -i -e "s,#!/usr/bin/perl -T,#!${perl}/bin/perl -T ${postgrey-flags}," \ + -e "s#/etc/postfix#$out#" \ + bin/postgrey + sed -i -e "s,#!/usr/bin/perl,#!${perl}/bin/perl ${policy-test-flags}," \ + bin/policy-test +'' diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix new file mode 100644 index 000000000000..6aaaf95fae16 --- /dev/null +++ b/pkgs/servers/ps3netsrv/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "ps3netsrv-${version}"; + version = "1.1.0"; + + enableParallelBuilding = true; + + src = fetchgit { + url = "https://github.com/dirkvdb/ps3netsrv--"; + fetchSubmodules = true; + rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; + sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa"; + }; + + buildPhase = "make CXX=$CXX"; + installPhase = '' + mkdir -p $out/bin + cp ps3netsrv++ $out/bin + ''; + + meta = { + description = "C++ implementation of the ps3netsrv server"; + homepage = https://github.com/dirkvdb/ps3netsrv--; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index e5cb3fa988ff..a3bb2d44216b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent -, ldb, popt, iniparser, libbsd, libarchive, libiconv, gettext +, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, popt, iniparser, libbsd, libarchive, libiconv, gettext , kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , gnutls, libgcrypt, libgpgerror , ncurses, libunwind, libibverbs, librdmacm, systemd @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline talloc ntdb tdb tevent ldb popt iniparser + docbook_xml_dtd_45 */ readline talloc popt iniparser libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos ] ++ optionals stdenv.isLinux [ libaio pam systemd ] @@ -62,9 +62,6 @@ stdenv.mkDerivation rec { "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" - "--bundled-libraries=NONE" - "--private-libraries=NONE" - "--builtin-libraries=NONE" ] ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index a9f125941884..b45d66fd1415 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.4"; + version = "2.4.0"; name = "elasticsearch-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; - sha256 = "0vphyqhna510y8bcihlmz3awzszgyfpmzrfcy548a2pd9mghq7ip"; + sha256 = "1jglmj1dnh1n2niyds6iyrpf6x6ppqgkivzy6qabkjvvmr013q1s"; }; patches = [ ./es-home-2.x.patch ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index dd6eeff616f0..ac2130d2917c 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -25,6 +25,10 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else path = "plugins/rack"; inputs = [ ruby ]; }) + (lib.nameValuePair "cgi" { + path = "plugins/cgi"; + inputs = [ ]; + }) ]; getPlugin = name: diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index b64b6e4ca0a2..83a73eb388f8 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ]; + ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-dar-static" ]; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 74e7686a3d17..7931df2cc57d 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; - cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"]; - meta = { homepage = http://www.darlinghq.org/; description = "Darling lets you open OS X dmgs on Linux"; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix new file mode 100644 index 000000000000..06190a8f03da --- /dev/null +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -0,0 +1,25 @@ +# This file was generated by go2nix. +{ lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "gcsfuse-${version}"; + version = "v0.19.0"; + rev = "81281027c0093e3f916a6e611a128ec5c3a12ece"; + + goPackagePath = "github.com/googlecloudplatform/gcsfuse"; + + src = fetchgit { + inherit rev; + url = "https://github.com/googlecloudplatform/gcsfuse"; + sha256 = "1lj9czippsgkhr8y3r7vwxgc8i952v76v1shdv10p43gsxwyyi9a"; + }; + + # TODO: add metadata https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes + meta = { + license = lib.licenses.asl20; + maintainers = []; + homepage = https://cloud.google.com/storage/docs/gcs-fuse; + description = + "A user-space file system for interacting with Google Cloud Storage"; + }; +} diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index c4dc72644d9d..3946d6fcef84 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "8.1"; + version = "10.0"; src = fetchurl { url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "0pafqn9ismn4j3fsx8fgf008qwh2c6f8mjfjijah6d5c349rmy3b"; + sha256 = "1mhs0gl285a5y2bw6k04lrnyg1pp2am7dfcsvg0w4vr5h2ag3p7p"; }; + doCheck = true; + meta = { homepage = http://www.snapraid.it/; description = "A backup program for disk arrays"; diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix new file mode 100644 index 000000000000..12fc6934531a --- /dev/null +++ b/pkgs/tools/graphics/convchain/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchFromGitHub, mono}: +stdenv.mkDerivation rec { + name = "convchain-${version}"; + version = "0.0pre20160901"; + src = fetchFromGitHub { + owner = "mxgmn"; + repo = "ConvChain"; + rev = "8abb1e88a496fcae4c0ae31acd4eea55957dab68"; + sha256 = "0lnscljgbw0s90sfcahwvnxakml0f4d8jxi5ikm4ak8qgnvw6rql"; + }; + buildPhase = '' + mcs ConvChain.cs -out:convchain.exe -r:System.Drawing + mcs ConvChainFast.cs -out:convchainfast.exe -r:System.Drawing + grep -m1 -B999 '^[*][/]' ConvChainFast.cs > COPYING.MIT + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/convchain,share/convchain} + cp README.md COPYING.MIT "$out"/share/doc/convchain + cp convchain*.exe "$out"/bin + cp -r [Ss]amples samples.xml "$out/share/convchain" + + echo "#! ${stdenv.shell}" >> "$out/bin/convchain" + echo "chmod u+w ." >> "$out/bin/convchain" + echo "'${mono}/bin/mono' '$out/bin/convchain.exe' \"\$@\"" >> "$out/bin/convchain" + chmod a+x "$out/bin/convchain" + + echo "#! ${stdenv.shell}" >> "$out/bin/convchainfast" + echo "chmod u+w ." >> "$out/bin/convchainfast" + echo "'${mono}/bin/mono' '$out/bin/convchainfast.exe' \"\$@\"" >> "$out/bin/convchainfast" + chmod a+x "$out/bin/convchainfast" + ''; + buildInputs = [mono]; + meta = { + inherit version; + description = ''Bitmap generation from a single example with convolutions and MCMC''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8fa7af3b1f8e..3b537fad91db 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt [ qt ] + ++ lib.optional withQt qt # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix new file mode 100644 index 000000000000..0862293830d5 --- /dev/null +++ b/pkgs/tools/graphics/syntex/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchFromGitHub, mono}: +stdenv.mkDerivation rec { + name = "syntex-${version}"; + version = "0.0pre20160915"; + src = fetchFromGitHub { + owner = "mxgmn"; + repo = "SynTex"; + rev = "f499a7c8112be4a63eb44843ba72957c2c9a04db"; + sha256 = "13fz6frlxsdz8qq94fsvim27cd5klmdsax5109yxm9175vgvpa0a"; + }; + buildPhase = '' + mcs *.cs -out:syntex.exe -r:System.Drawing + grep -m1 -B999 '^[*][/]' SynTex.cs > COPYING.MIT + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/syntex,share/syntex} + cp README.md COPYING.MIT "$out"/share/doc/syntex + cp syntex.exe "$out"/bin + cp -r [Ss]amples samples.xml "$out/share/syntex" + + echo "#! ${stdenv.shell}" >> "$out/bin/syntex" + echo "chmod u+w ." >> "$out/bin/syntex" + echo "'${mono}/bin/mono' '$out/bin/syntex.exe' \"\$@\"" >> "$out/bin/syntex" + chmod a+x "$out/bin/syntex" + ''; + buildInputs = [mono]; + meta = { + inherit version; + description = ''Texture synthesis from examples''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix new file mode 100644 index 000000000000..32c2104c0f9e --- /dev/null +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchFromGitHub, mono}: +stdenv.mkDerivation rec { + name = "wavefunctioncollapse-${version}"; + version = "0.0pre20160930"; + src = fetchFromGitHub { + owner = "mxgmn"; + repo = "WaveFunctionCollapse"; + rev = "333f592b6612da43ec475c988c09325378c662e9"; + sha256 = "1cpwn52ka1zsi2yc7rfg5r9ll2kjgzabx4a5axcp9c4ph5qzsza6"; + }; + buildPhase = '' + mcs *.cs -out:wavefunctioncollapse.exe -r:System.Drawing + grep -m1 -B999 '^[*][/]' Main.cs > COPYING.MIT + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/wavefunctioncollapse,share/wavefunctioncollapse} + cp README.md COPYING.MIT "$out"/share/doc/wavefunctioncollapse + cp wavefunctioncollapse.exe "$out"/bin + cp -r [Ss]amples samples.xml "$out/share/wavefunctioncollapse" + + echo "#! ${stdenv.shell}" >> "$out/bin/wavefunctioncollapse" + echo "chmod u+w ." >> "$out/bin/wavefunctioncollapse" + echo "'${mono}/bin/mono' '$out/bin/wavefunctioncollapse.exe' \"\$@\"" >> "$out/bin/wavefunctioncollapse" + chmod a+x "$out/bin/wavefunctioncollapse" + ''; + buildInputs = [mono]; + meta = { + inherit version; + description = ''A generator of bitmaps that are locally similar to the input bitmap''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 1cb849fa09b1..799d66aac9b2 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchurl, intltool, pkgconfig, sqlite, libpinyin, db +{ stdenv, fetchFromGitHub, autoreconfHook +, intltool, pkgconfig, sqlite, libpinyin, db , ibus, glib, gtk3, python3, pygobject3 }: stdenv.mkDerivation rec { name = "ibus-libpinyin-${version}"; - version = "1.7.4"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "libpinyin"; + repo = "ibus-libpinyin"; + rev = version; + sha256 = "1d85kzlhav0ay798i88yqyrjbkv3y7w2aiadpmcjgscyd5ccsnnz"; + }; + + buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + + postAutoreconf = '' + intltoolize + ''; meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; - homepage = https://github.com/libpinyin/ibus-libpinyin; license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; - - #configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; - - buildInputs = [ - ibus glib sqlite libpinyin python3 gtk3 db - ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - src = fetchurl { - url = "mirror://sourceforge/project/libpinyin/ibus-libpinyin/ibus-libpinyin-${version}.tar.gz"; - sha256 = "c2085992f76ca669ebe4b7e7c0170433bbfb61f764f8336b3b17490b9fb1c334"; - }; } diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 8720674d3aff..58afb638b470 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, makeWrapper , intltool, isocodes, pkgconfig , python3, pygobject3 -, gtk2, gtk3, atk, dconf, glib +, gtk2, gtk3, atk, dconf, glib, json_glib , dbus, libnotify, gobjectIntrospection, wayland +, nodePackages }: stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.13"; + version = "1.5.14"; src = fetchurl { url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "1wd5azlsgdih8qw6gi15rv130s6d90846n3r1ccwmp6z882xhwzd"; + sha256 = "0g4x02d7j5w1lfn4zvmzsq93h17lajgn9d7hlvr6pws28vz40ax4"; }; postPatch = '' @@ -29,12 +30,14 @@ stdenv.mkDerivation rec { "--disable-memconf" "--enable-ui" "--enable-python-library" + "--with-emoji-json-file=${nodePackages.emojione}/lib/node_modules/emojione/emoji.json" ]; buildInputs = [ python3 pygobject3 intltool isocodes pkgconfig gtk2 gtk3 dconf + json_glib dbus libnotify gobjectIntrospection wayland ]; @@ -64,6 +67,9 @@ stdenv.mkDerivation rec { done ''; + doInstallCheck = true; + installCheckPhase = "$out/bin/ibus version"; + meta = with stdenv.lib; { homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 88992c8e4e30..b089240bcc69 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { glib gtk2 gst_all_1.gstreamer - gst_plugins gnome2.GConf gnome2.gnome_icon_theme libnotify @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { libunique intltool wrapGAppsHook - ]; + ] ++ gst_plugins; propagatedUserEnvPkgs = [ gnome2.GConf.out ]; diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 318de542bb2d..66f02bcc7bcc 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fzy-${version}"; - version = "0.4"; + version = "0.7"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "fzy"; rev = version; - sha256 = "1sbwy4v5kz0fcl7kzf414phxv9cppvjvfq9jqkcda4bkzqh2xgia"; + sha256 = "11sc92j9fx23byxv5y4rq0jxp55vc9mrn5hx9lb162vdrl8a4222"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/misc/kalibrate-hackrf/default.nix b/pkgs/tools/misc/kalibrate-hackrf/default.nix new file mode 100644 index 000000000000..0bd6f573ead0 --- /dev/null +++ b/pkgs/tools/misc/kalibrate-hackrf/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: + +stdenv.mkDerivation rec { + name = "kalibrate-hackrf-unstable-20160827"; + + # There are no tags/releases, so use the latest commit from git master. + # Currently, the latest commit is from 2016-07-03. + src = fetchFromGitHub { + owner = "scateu"; + repo = "kalibrate-hackrf"; + rev = "2492c20822ca6a49dce97967caf394b1d4b2c43e"; + sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ fftw hackrf libusb1 ]; + + postInstall = '' + mv $out/bin/kal $out/bin/kal-hackrf + ''; + + meta = with stdenv.lib; { + description = "Calculate local oscillator frequency offset in hackrf devices"; + longDescription = '' + Kalibrate, or kal, can scan for GSM base stations in a given frequency + band and can use those GSM base stations to calculate the local + oscillator frequency offset. + + This package is for hackrf devices. + ''; + homepage = https://github.com/scateu/kalibrate-hackrf; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.mog ]; + }; +} diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index e8f3ccf747d6..cb3b021bd33d 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.3.4"; + version = "2.4.0"; name = "logstash-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz"; + sha256 = "1k27hb6q1r26rp3y9pb2ry92kicw83mi352dzl2y4h0gbif46b32"; }; dontBuild = true; @@ -14,10 +14,20 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchShebangs = true; + buildInputs = [ + makeWrapper jre + ]; + installPhase = '' mkdir -p $out cp -r {Gemfile*,vendor,lib,bin} $out mv $out/bin/plugin $out/bin/logstash-plugin + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/rspec \ + --set JAVA_HOME "${jre}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index ccecd819948a..9052c5ce6d53 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "04k9yxjp357sdw6365z6qx87vmwygl3v3wpvd78pp63ky5hzbbay"; + sha256 = "14c6iw0p3adz7w8jm42w9f3s1zph9is10cbwdjgh5bvifrhxrary"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 750443ace3ac..1233cb09c78d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.09.19"; + version = "2016.09.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "276637e83525778a83d0457f6b9fbc29d6109bc8366d43125432ce835d28545e"; + sha256 = "dfae0d25cb515d17e7145b7ab0edf0c85f77ef4975aefe46719fdef0a5d4a879"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix new file mode 100644 index 000000000000..6f7e4ba4b695 --- /dev/null +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, jre }: + +let + version = "1.7.06"; + jar = fetchurl { + name = "burpsuite.jar"; + url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; + sha256 = "13x3x0la2jmm7zr66mvczzlmsy1parfibnl9s4iwi1nls4ikv7kl"; + }; + launcher = '' + #!${stdenv.shell} + exec ${jre}/bin/java -jar ${jar} "$@" + ''; +in stdenv.mkDerivation { + name = "burpsuite-${version}"; + buildCommand = '' + mkdir -p $out/bin + echo "${launcher}" > $out/bin/burpsuite + chmod +x $out/bin/burpsuite + ''; + + meta = { + description = "An integrated platform for performing security testing of web applications"; + longDescription = '' + Burp Suite is an integrated platform for performing security testing of web applications. + Its various tools work seamlessly together to support the entire testing process, from + initial mapping and analysis of an application's attack surface, through to finding and + exploiting security vulnerabilities. + ''; + homepage = "https://portswigger.net/burp/"; + downloadPage = "https://portswigger.net/burp/freedownload"; + license = [ stdenv.lib.licenses.unfree ]; + preferLocalBuild = true; + platforms = jre.meta.platforms; + hydraPlatforms = []; + maintainers = [ stdenv.lib.maintainers.bennofs ]; + }; +} diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 9f933cc97090..0e12c50d1546 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { python unzip makeWrapper + pythonPackages.requests2 pythonPackages.psycopg2 pythonPackages.psutil pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml - pythonPackages.requests pythonPackages.pymongo pythonPackages.docker ]; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 2eea08b92383..732051d8ec78 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,8 +1,10 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub }: +with lib; + buildGoPackage rec { name = "flannel-${version}"; - version = "0.5.5"; + version = "0.6.2"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,6 +15,14 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw"; + sha256 = "03l0zyv9ajda70zw7jgwlmilw26h849jbb9f4slbycphhvbmpvb9"; + }; + + meta = { + description = "Network fabric for containers, designed for Kubernetes"; + license = licenses.asl20; + homepage = https://github.com/coreos/flannel; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a6e4b7c4c209..0c19822d37c9 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] - ++ optional withKerberos [ kerberos ]; + ++ optional withKerberos kerberos; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 851af6f24f6f..5b7f8f114df3 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] - ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; + ++ stdenv.lib.optionals doCheck [ HTTPServerSimple Parent ]; configurePhase = '' for i in swec tests/{runTests,testServer} diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 4f2cf551816b..b581d8007947 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"; }; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ patchelf ]; - # For some reason (probably a build system bug), the binary isn't # properly linked to $out/lib to find libfuzzy.so postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index bb44fe044e81..835cacf0098c 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = with pkgs; [ unzip ] - ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; patches = [ ./casts.patch ]; setSourceRoot = "sourceRoot=${product}-source-${version}"; buildPhase = "bash build"; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 71b1b43f6535..1ab0a9ae2738 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [ libdv libjpeg libpng pkgconfig ] - ++ lib.optional (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; + ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1625a6d1212..3440fe243f8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -507,6 +507,8 @@ in SDL = SDL_sixel; }; + gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -666,6 +668,8 @@ in btfs = callPackage ../os-specific/linux/btfs { }; + burpsuite = callPackage ../tools/networking/burpsuite {}; + cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { isLibrary = false; enableSharedExecutables = false; @@ -2242,6 +2246,8 @@ in kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; + kalibrate-hackrf = callPackage ../tools/misc/kalibrate-hackrf { }; + kakoune = callPackage ../applications/editors/kakoune { }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -3262,6 +3268,8 @@ in progress = callPackage ../tools/misc/progress { }; + ps3netsrv = callPackage ../servers/ps3netsrv { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -3620,6 +3628,8 @@ in storebrowse = callPackage ../tools/system/storebrowse { }; + syntex = callPackage ../tools/graphics/syntex {}; + fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; sl = callPackage ../tools/misc/sl { }; @@ -3985,6 +3995,8 @@ in watchman = callPackage ../development/tools/watchman { }; + wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; + wbox = callPackage ../tools/networking/wbox {}; welkin = callPackage ../tools/graphics/welkin {}; @@ -4434,6 +4446,8 @@ in clang_35 = wrapCC llvmPackages_35.clang; clang_34 = wrapCC llvmPackages_34.clang; + clang-tools = callPackage ../development/tools/clang-tools { }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; }; @@ -4871,28 +4885,18 @@ in oraclejdk = pkgs.jdkdistro true false; - oraclejdk7 = pkgs.oraclejdk7distro true false; - - oraclejdk7psu = pkgs.oraclejdk7psu_distro true false; - oraclejdk8 = pkgs.oraclejdk8distro true false; oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; oraclejre = lowPrio (pkgs.jdkdistro false false); - oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); - - oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false); - oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); jrePlugin = jre8Plugin; - jre7Plugin = lowPrio (pkgs.oraclejdk7distro false true); - jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); supportsJDK = @@ -4901,16 +4905,6 @@ in jdkdistro = oraclejdk8distro; - oraclejdk7distro = installjdk: pluginSupport: - assert supportsJDK; - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); - - oraclejdk7psu_distro = installjdk: pluginSupport: - assert supportsJDK; - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk7psu-linux.nix { inherit installjdk; }); - oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) @@ -5362,6 +5356,7 @@ in lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); + luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); luaPackages = lua52Packages; @@ -6581,17 +6576,10 @@ in clutter = callPackage ../development/libraries/clutter { }; - clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix { - cogl = cogl_1_22; - }; - clutter-gst = callPackage ../development/libraries/clutter-gst { - inherit (gnome3) cogl clutter; }; - clutter_gtk = callPackage ../development/libraries/clutter-gtk { - inherit (gnome3) clutter; - }; + clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; cminpack = callPackage ../development/libraries/cminpack { }; @@ -6599,8 +6587,6 @@ in cogl = callPackage ../development/libraries/cogl { }; - cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { }; - coin3d = callPackage ../development/libraries/coin3d { }; CoinMP = callPackage ../development/libraries/CoinMP { }; @@ -7385,6 +7371,9 @@ in libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; + libagar = callPackage ../development/libraries/libagar { }; + libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; + libao = callPackage ../development/libraries/libao { usePulseAudio = config.pulseaudio or true; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; @@ -7989,6 +7978,8 @@ in libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libosmocore = callPackage ../applications/misc/libosmocore { }; + libosmpbf = callPackage ../development/libraries/libosmpbf {}; libotr = callPackage ../development/libraries/libotr { }; @@ -9275,7 +9266,13 @@ in vsqlite = callPackage ../development/libraries/vsqlite { }; - vtk = callPackage ../development/libraries/vtk { }; + vtk = callPackage ../development/libraries/vtk { + inherit (darwin) cf-private libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO GLUT; + }; vtkWithQt4 = vtk.override { qtLib = qt4; }; @@ -9990,6 +9987,8 @@ in pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; + postgrey = callPackage ../servers/mail/postgrey { }; + pshs = callPackage ../servers/http/pshs { }; libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; @@ -11605,6 +11604,8 @@ in # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } ); + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; + marathi-cursive = callPackage ../data/fonts/marathi-cursive { }; man-pages = callPackage ../data/documentation/man-pages { }; @@ -12172,6 +12173,8 @@ in containerd = callPackage ../applications/virtualization/containerd { }; + convchain = callPackage ../tools/graphics/convchain {}; + cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { withOpenCL = true; @@ -12649,11 +12652,17 @@ in }; gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { - extraPackages = [ gnuradio-nacl gnuradio-osmosdr ]; + extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; }; gnuradio-nacl = callPackage ../applications/misc/gnuradio-nacl { }; + gnuradio-gsm = callPackage ../applications/misc/gnuradio-gsm { }; + + gnuradio-ais = callPackage ../applications/misc/gnuradio-ais { }; + + gnuradio-rds = callPackage ../applications/misc/gnuradio-rds { }; + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; goldendict = qt55.callPackage ../applications/misc/goldendict { }; @@ -12791,14 +12800,14 @@ in xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; - freerdp = callPackage ../applications/networking/remote/freerdp { + freerdpStable = callPackage ../applications/networking/remote/freerdp { ffmpeg = ffmpeg_1; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { ffmpeg = ffmpeg_2; cmake = cmake_2_8; }; + freerdp = freerdpUnstable; # freerdpStable is marked broken, please switch back to it once fixed freicoin = callPackage ../applications/misc/freicoin { boost = boost155; @@ -14258,6 +14267,8 @@ in ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + tecoc = callPackage ../applications/editors/tecoc { }; + viber = callPackage ../applications/networking/instant-messengers/viber { }; sonic-pi = callPackage ../applications/audio/sonic-pi { @@ -15605,7 +15616,7 @@ in }; }; - superTux = callPackage ../games/super-tux { }; + superTux = callPackage ../games/supertux { }; superTuxKart = callPackage ../games/super-tux-kart { }; @@ -16597,6 +16608,8 @@ in cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; + cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + crashplan = callPackage ../applications/backup/crashplan { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b742138b9b86..d7b0108ce69a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -32,7 +32,7 @@ let self = _self // overrides; _self = with self; { }; outputs = ["out" "doc"]; # use gnused so that the preCheck command passes - buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin gnused; propagatedBuildInputs = [ FileNext ]; meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; @@ -138,6 +138,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ AnyEvent ]; + doCheck = false; # does an DNS lookup meta = { homepage = http://github.com/potyl/perl-AnyEvent-CacheDNS; description = "Simple DNS resolver with caching"; @@ -6608,6 +6609,14 @@ let self = _self // overrides; _self = with self; { }; }; + IOMultiplex = buildPerlPackage { + name = "IO-Multiplex-1.16"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz; + sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; + }; + }; + IOPager = buildPerlPackage { name = "IO-Pager-0.06"; src = fetchurl { @@ -10000,6 +10009,14 @@ let self = _self // overrides; _self = with self; { }; }; + ParseSyslog = buildPerlPackage { + name = "Parse-Syslog-1.10"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz; + sha256 = "659a2145441ef36d9835decaf83da308fcd03f49138cb3d90928e8bfc9f139d9"; + }; + }; + PathClass = buildPerlPackage { name = "Path-Class-0.33"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31be94fd0226..d88af031135a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2016,7 +2016,7 @@ in modules // { }; propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ] - ++ optional visualizationSupport [ pyqtgraph ]; + ++ optional visualizationSupport pyqtgraph; meta = with stdenv.lib; { homepage = "http://binwalk.org"; @@ -8286,6 +8286,37 @@ in modules // { inherit pythonOlder; }; + pypoppler = buildPythonPackage rec { + name = "pypoppler-${version}"; + version = "0.12.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pypoppler/${name}.tar.gz"; + sha256 = "47e6ac99e5b114b9abf2d1dd1bca06f22c028d025432512989f659142470810f"; + }; + + NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; + buildInputs = [ pkgs.pkgconfig pkgs.poppler.dev ]; + propagatedBuildInputs = with self; [ pycairo pygobject2 ]; + + patches = [ + ../development/python-modules/pypoppler-0.39.0.patch + ../development/python-modules/pypoppler-poppler.c.patch + ]; + + # Not supported. + disabled = isPy3k; + + # No tests in archive + doCheck = false; + + meta = { + homepage = https://code.launchpad.net/~mriedesel/poppler-python/main; + description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies"; + license = licenses.gpl2; + }; + }; + python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; version = "0.1.7"; @@ -9407,12 +9438,12 @@ in modules // { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.9"; + version = "1.9.10"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "136ypwacj4av6xqmbfp6lhlr0171ws2knv74h0r59ssaaffznh73"; + sha256 = "007w2pshbk1s6gfgp8717fwz01l8mcmd2lkxdgqqgd11bag7qfjv"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) @@ -9431,12 +9462,12 @@ in modules // { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.14"; + version = "1.8.15"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "0ka6slangri68qaf91gl10l9m14f6waj4ncz543rbcpvj25w90jj"; + sha256 = "1kga849ixd6sz6svhv8dysyjr03wphqgl4wjw2yczmc5r4x58gl6"; }; # too complicated to setup @@ -10489,6 +10520,23 @@ in modules // { }; }; + pycodestyle = buildPythonPackage rec { + name = "pycodestyle-${version}"; + version = "2.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pycodestyle/${name}.tar.gz"; + sha256 = "1rz2v8506mdjdyxcnv9ygiw6v0d4dqx8z5sjyjm0w2v32h5l5w1p"; + }; + + meta = { + description = "Python style guide checker (formerly called pep8)"; + homepage = https://pycodestyle.readthedocs.io; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; + }; + flake8 = buildPythonPackage rec { name = "flake8-${version}"; version = "2.5.4"; @@ -10509,6 +10557,35 @@ in modules // { }; }; + flake8_3 = buildPythonPackage rec { + name = "flake8-${version}"; + version = "3.0.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/f/flake8/${name}.tar.gz"; + sha256 = "03cpdrjxh0fyi2qpdxbbrmxw7whiq3xr3p958gr6yzghk34i1hml"; + }; + + buildInputs = with self; [ nose mock pytestrunner pytest ]; + propagatedBuildInputs = with self; [ pyflakes mccabe enum34 configparser pycodestyle ]; + + patches = [ + ../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch + ]; + + # Tests fail due to missing ini file. + preCheck = '' + touch tox.ini + ''; + + meta = { + description = "Code checking using pep8 and pyflakes"; + homepage = http://pypi.python.org/pypi/flake8; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; + }; + flaky = buildPythonPackage rec { name = "flaky-${version}"; version = "3.1.0"; @@ -13395,22 +13472,13 @@ in modules // { mccabe = buildPythonPackage (rec { - name = "mccabe-0.4.0"; + name = "mccabe-0.5.2"; src = pkgs.fetchurl { url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws"; + sha256 = "1zss8c5cn8wvxsbjzv70dxymybh3cjzrjl19vxfbnyvmidng0wrl"; }; - # See https://github.com/flintwork/mccabe/issues/31 - postPatch = '' - cp "${pkgs.fetchurl { - url = "https://raw.githubusercontent.com/flintwork/mccabe/" - + "e8aea16d28e92bd3c62601275762fc9c16808f6c/test_mccabe.py"; - sha256 = "0xhjxpnaxvbpi4myj9byrban7a5nrw931br9sgvfk42ayg4sn6lm"; - }}" test_mccabe.py - ''; - buildInputs = with self; [ pytestrunner pytest ]; meta = { @@ -20325,16 +20393,25 @@ in modules // { pyopenssl = buildPythonPackage rec { name = "pyopenssl-${version}"; - version = "16.0.0"; + version = "16.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "0zfijaxlq4vgi6jz0d4i5xq9ygqnyps6br7lmigjhqnh8gp10g9n"; + sha256 = "88f7ada2a71daf2c78a4f139b19d57551b4c8be01f53a1cb5c86c2f3bf01355f"; }; - # 12 tests failing, 26 error out - doCheck = false; + preCheck = '' + sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py + ''; + checkPhase = '' + runHook preCheck + export LANG="en_US.UTF-8"; + py.test; + runHook postCheck + ''; + + buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales ]; propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ]; }; @@ -22506,6 +22583,24 @@ in modules // { }; }; + sqlmap = buildPythonPackage { + name = "sqlmap-1.0.9.post5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sqlmap/sqlmap-1.0.9.post5.tar.gz"; + sha256 = "0g8sjky8anrmcisc697b5qndp88qmay35kng9sz9x46wd3agm9pa"; + }; + + propagatedBuildInputs = with self; [ modules.sqlite3 ]; + + meta = with pkgs.stdenv.lib; { + homepage = "http://sqlmap.org"; + license = licenses.gpl2; + description = "Automatic SQL injection and database takeover tool"; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + }; + }; + pgpdump = self.buildPythonPackage rec { name = "pgpdump-1.5";